libraries/libtunepimp: Miscellaneous cleanups and patches.

  Clean up build and add patches for gcc4.4 and libmp4v2.

3 files changed, 61 insertions, 2 deletions

diff --git a/libraries/libtunepimp/libtunepimp-0.5.3-gcc44.patch b/libraries/libtunepimp/libtunepimp-0.5.3-gcc44.patch
new file mode 100644
index 000000000000..2c5e4f9dbf2d
--- /dev/null
+++ b/libraries/libtunepimp/libtunepimp-0.5.3-gcc44.patch
@@ -0,0 +1,13 @@
+diff -ruN libtunepimp-0.5.3.orig/lib/fileio.cpp libtunepimp-0.5.3/lib/fileio.cpp
+--- libtunepimp-0.5.3.orig/lib/fileio.cpp	2009-05-28 11:49:43.000000000 -0700
++++ libtunepimp-0.5.3/lib/fileio.cpp	2009-05-28 11:59:05.000000000 -0700
+@@ -124,7 +124,8 @@
+ 
+ void tmktempname(const char *path, char *newPath, int newPathLen)
+ {
+-    char *ptr, *temp;
++    const char *ptr;
++    char *temp;
+ 
+     temp = (char *)malloc(strlen(path) + 32);
+     ptr = strrchr(path, dirSepChar);
diff --git a/libraries/libtunepimp/libtunepimp-0.5.3-libmp4v2.patch b/libraries/libtunepimp/libtunepimp-0.5.3-libmp4v2.patch
new file mode 100644
index 000000000000..ec3ec72612e3
--- /dev/null
+++ b/libraries/libtunepimp/libtunepimp-0.5.3-libmp4v2.patch
@@ -0,0 +1,30 @@
+diff -ur 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	2009-07-10 15:50:20.000000000 +0300
++++ libtunepimp-0.5.3/plugins/mp4/mp4.cpp	2009-07-10 15:51:18.000000000 +0300
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#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
diff --git a/libraries/libtunepimp/libtunepimp.SlackBuild b/libraries/libtunepimp/libtunepimp.SlackBuild
index 329b1eab810a..41478cc67732 100644
--- a/libraries/libtunepimp/libtunepimp.SlackBuild
+++ b/libraries/libtunepimp/libtunepimp.SlackBuild
@@ -4,10 +4,20 @@
 
 PRGNAM=libtunepimp
 VERSION=${VERSION:-0.5.3}
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}	
 PKG=$TMP/package-$PRGNAM
@@ -22,6 +32,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -39,8 +52,11 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Add some needed includes for gcc-4.3
+# Add some needed includes for gcc-4.3 and a gcc4.4 fix.
 patch -p1 < $CWD/libtunepimp-0.5.3-gcc43.patch
+patch -p1 < $CWD/libtunepimp-0.5.3-gcc44.patch
+# Patch for new libmp4v2
+patch -p1 < $CWD/libtunepimp-0.5.3-libmp4v2.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \