[SM-Commit] GIT changes to master grimoire by Eric Sandall (e5fdaa7c9067c7eead39d0997fde6346a0142cc1)

Eric Sandall scm at sourcemage.org
Wed May 19 15:59:19 EDT 2010


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 audio-soft/easytag/DEPENDS         |    2 -
 audio-soft/easytag/HISTORY         |    6 ++++
 audio-soft/easytag/PRE_BUILD       |    3 ++
 audio-soft/easytag/mp4v2-1.9.patch |   52 +++++++++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 1 deletion(-)

New commits:
commit e5fdaa7c9067c7eead39d0997fde6346a0142cc1
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    easytag: May use either provider of MP4V2 (Bug #15683)
    Added patch from http://www.mail-archive.com/arch-commits@archlinux.org/msg14295.html
    (cherry picked from commit bb9f0b4cfd3dadecc7345307a08454329f176dd7)

diff --git a/audio-soft/easytag/DEPENDS b/audio-soft/easytag/DEPENDS
index 0a1d347..fb0b768 100755
--- a/audio-soft/easytag/DEPENDS
+++ b/audio-soft/easytag/DEPENDS
@@ -28,7 +28,7 @@ optional_depends  faad2                           \
                   "--enable-mp4"                  \
                   ""                              \
                   "Enable Mp4 container support"  &&
-optional_depends  libmp4v2                        \
+optional_depends  MP4V2                           \
                   "--enable-mp4"                  \
                   ""                              \
                   "Use libmp4v2 for Mp4 support"  &&
diff --git a/audio-soft/easytag/HISTORY b/audio-soft/easytag/HISTORY
index 8974b61..0f2acf2 100644
--- a/audio-soft/easytag/HISTORY
+++ b/audio-soft/easytag/HISTORY
@@ -1,3 +1,9 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: May use either provider of MP4V2 (Bug #15683)
+	* PRE_BUILD: Apply mp4v2-1.9.patch
+	* mp4v2-1.9.patch: Added from 
+	  http://www.mail-archive.com/arch-commits@archlinux.org/msg14295.html
+
 2008-09-28 Arjan Bouter <abouter at sourcemage.org>
 	* BUILD: disable test for gtk
 	* DEPENDS: added missing optional_depends on speex
diff --git a/audio-soft/easytag/PRE_BUILD b/audio-soft/easytag/PRE_BUILD
new file mode 100755
index 0000000..5d24985
--- /dev/null
+++ b/audio-soft/easytag/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/mp4v2-1.9.patch
diff --git a/audio-soft/easytag/mp4v2-1.9.patch b/audio-soft/easytag/mp4v2-1.9.patch
new file mode 100644
index 0000000..f4e4461
--- /dev/null
+++ b/audio-soft/easytag/mp4v2-1.9.patch
@@ -0,0 +1,52 @@
+# http://www.mail-archive.com/arch-commits@archlinux.org/msg14295.html
+diff -ur easytag-2.1.6.orig/configure easytag-2.1.6/configure
+--- easytag-2.1.6.orig/configure       2008-07-12 17:57:44.000000000 +0300
++++ easytag-2.1.6/configure    2009-07-10 16:44:39.000000000 +0300
+@@ -22418,12 +22418,12 @@
+ /* end confdefs.h.  */
+ 
+                 #include <stdio.h>
+-                #include <mpeg4ip_config.h>
++                #include <mp4v2/mp4v2.h>
+                 int main (void)
+                 {
+                     FILE *output;
+                     output=fopen("conftest.mp4v2","w");
+-                    fprintf(output,"LIBMP4V2_NAME=%s\nLIBMP4V2_VERSION=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
++                    fprintf(output,"MP4V2_PROJECT_name=%s\nMP4V2_PROJECT_version=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
+                     fclose(output);
+                     exit(0);
+                 }
+@@ -22471,7 +22471,7 @@
+ 
+                 cat >conftest.$ac_ext <<_ACEOF
+ 
+-           #include <mp4.h>
++           #include <mp4v2/mp4v2.h>
+            main () {
+            MP4FileHandle hFile;
+            MP4GetMetadataCoverArt(hFile, NULL, NULL,0); }
+diff -ur easytag-2.1.6.orig/src/mp4_header.c easytag-2.1.6/src/mp4_header.c
+--- easytag-2.1.6.orig/src/mp4_header.c        2007-11-28 10:54:35.000000000 
+0200
++++ easytag-2.1.6/src/mp4_header.c     2009-07-10 16:44:54.000000000 +0300
+@@ -44,7 +44,7 @@
+ #undef PACKAGE_STRING
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ 
+ 
+ /****************
+diff -ur easytag-2.1.6.orig/src/mp4_tag.c easytag-2.1.6/src/mp4_tag.c
+--- easytag-2.1.6.orig/src/mp4_tag.c   2007-12-11 00:08:11.000000000 +0200
++++ easytag-2.1.6/src/mp4_tag.c        2009-07-10 16:45:08.000000000 +0300
+@@ -50,7 +50,7 @@
+ #undef PACKAGE_STRING
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ 
+ 



More information about the SM-Commit mailing list