Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

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

 audio-libs/libtunepimp/DEPENDS         |    1 +
 audio-libs/libtunepimp/HISTORY         |    7 +++++++
 audio-libs/libtunepimp/PRE_BUILD       |   10 +++++++++-
 audio-libs/libtunepimp/mp4v2-1.9.patch |   33 
+++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

New commits:
commit 1ab8d894bd74c0df1fad2d74321f2ee42540bfd7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    libtunepimp: Print messages describing what we're patching

commit 52647620eb6d05749b3ade4b7878493e9ab14c1b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    libtunepimp: Optionally depends on any provider of MP4V2 (Bug #15687)
    Apply mp4v2-1.9.patch if mp4v2 is providing MP4V2 (Bug #15687)
    mp4v2-1.9.patch modified from 
http://repos.archlinux.org/wsvn/packages/tunepimp/trunk/mp4v2-1.9.patch

diff --git a/audio-libs/libtunepimp/DEPENDS b/audio-libs/libtunepimp/DEPENDS
index c9bcca1..030abcb 100755
--- a/audio-libs/libtunepimp/DEPENDS
+++ b/audio-libs/libtunepimp/DEPENDS
@@ -3,6 +3,7 @@ if [[ "${LIBTUNEPIMP_PYTHON}" == "y" ]]
 then depends python
 fi                     &&
 depends libofa         &&
+optional_depends MP4V2 "" "" "for MPEG4 support" &&
 optional_depends libmad "" "" "mp3 support?" &&
 optional_depends libvorbis "" "" "ogg support?" &&
 optional_depends flac "" "" "FLAC support?" &&
diff --git a/audio-libs/libtunepimp/HISTORY b/audio-libs/libtunepimp/HISTORY
index 9667e51..4618c08 100644
--- a/audio-libs/libtunepimp/HISTORY
+++ b/audio-libs/libtunepimp/HISTORY
@@ -1,3 +1,10 @@
+2010-04-25 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Optionally depends on any provider of MP4V2 (Bug #15687)
+       * PRE_BUILD: Apply mp4v2-1.9.patch if mp4v2 is providing MP4V2 (Bug 
#15687)
+         Print messages describing what we're patching
+       * mp4v2-1.9.patch: Modified from
+         
http://repos.archlinux.org/wsvn/packages/tunepimp/trunk/mp4v2-1.9.patch
+
 2010-04-20 Eric Sandall <sandalle AT sourcemage.org>
        * PRE_BUILD: Apply gcc44.patch (Bug #15641 and
          http://bugs.musicbrainz.org/ticket/5722)
diff --git a/audio-libs/libtunepimp/PRE_BUILD 
b/audio-libs/libtunepimp/PRE_BUILD
index df5554d..d345568 100755
--- a/audio-libs/libtunepimp/PRE_BUILD
+++ b/audio-libs/libtunepimp/PRE_BUILD
@@ -1,5 +1,13 @@
 default_pre_build                               &&
 cd $SOURCE_DIRECTORY                            &&
+message "${MESSAGE_COLOR}Patching for GCC 4.3...${DEFAULT_COLOR}" &&
 zcat $SCRIPT_DIRECTORY/gcc43.patch | patch -p1  &&
+message "${MESSAGE_COLOR}Patching for GCC 4.4...${DEFAULT_COLOR}" &&
 patch $SOURCE_DIRECTORY/lib/fileio.cpp \
-      $SCRIPT_DIRECTORY/gcc44.patch
+      $SCRIPT_DIRECTORY/gcc44.patch &&
+
+if [[ "$(get_spell_provider $SPELL MP4V2)" == "mp4v2" ]]; then
+  message "${MESSAGE_COLOR}Patching for mp4v2...${DEFAULT_COLOR}" &&
+  patch $SOURCE_DIRECTORY/plugins/mp4/mp4.cpp \
+        $SCRIPT_DIRECTORY/mp4v2-1.9.patch
+fi
diff --git a/audio-libs/libtunepimp/mp4v2-1.9.patch 
b/audio-libs/libtunepimp/mp4v2-1.9.patch
new file mode 100644
index 0000000..1390918
--- /dev/null
+++ b/audio-libs/libtunepimp/mp4v2-1.9.patch
@@ -0,0 +1,33 @@
+#
+# Modified from 
http://repos.archlinux.org/wsvn/packages/tunepimp/trunk/mp4v2-1.9.patch
+#
+diff -Naur libtunepimp-0.5.3.orig/plugins/mp4/mp4.cpp 
libtunepimp-0.5.3/plugins/mp4/mp4.cpp
+--- libtunepimp-0.5.3.orig/plugins/mp4/mp4.cpp 2010-04-25 11:37:06.008834579 
-0700
++++ libtunepimp-0.5.3/plugins/mp4/mp4.cpp      2010-04-25 11:38:10.811115622 
-0700
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <cstdlib>
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ #include "metadata.h"
+ #include "plugin.h"
+ #ifndef WIN32
+@@ -232,7 +232,7 @@
+   
+   strcpy(mdata->fileFormat, fileName + strlen(fileName) - 3); 
+   
+-  if (!MP4Close(mp4file))
++  MP4Close(mp4file);
+     return 0;
+   
+   return 1;
+@@ -316,7 +316,7 @@
+   sprintf(temp, "%d", mdata->nonAlbum);  
+   MP4SetMetadataFreeForm(mp4file, "MusicBrainz Non-Album", (u_int8_t 
*)temp, strlen(temp) + 1);
+   
+-  if (!MP4Close(mp4file))
++  MP4Close(mp4file);
+     return 0;
+ 
+ #ifndef WIN32