3 files changed, 156 insertions, 1 deletions
diff --git a/libraries/libtunepimp/libtunepimp-0.5.3-gcc43.patch b/libraries/libtunepimp/libtunepimp-0.5.3-gcc43.patch
new file mode 100644
index 0000000000..0220626ed1
--- /dev/null
+++ b/libraries/libtunepimp/libtunepimp-0.5.3-gcc43.patch
@@ -0,0 +1,146 @@
+diff -Nur libtunepimp-0.5.3.orig/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h
+--- libtunepimp-0.5.3.orig/include/tunepimp-0.5/metadata.h	2006-11-18 04:52:08.000000000 -0600
++++ libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h	2009-07-05 22:25:09.566603724 -0500
+@@ -27,6 +27,7 @@
+ #ifndef __METADATA_H__
+ #define __METADATA_H__
+ 
++#include <string.h>
+ #include <string>
+ #include <cstdio>
+ 
+diff -Nur libtunepimp-0.5.3.orig/lib/c_wrapper.cpp libtunepimp-0.5.3/lib/c_wrapper.cpp
+--- libtunepimp-0.5.3.orig/lib/c_wrapper.cpp	2006-11-18 04:52:33.000000000 -0600
++++ libtunepimp-0.5.3/lib/c_wrapper.cpp	2009-07-05 22:25:09.558605363 -0500
+@@ -24,6 +24,7 @@
+    $Id: c_wrapper.cpp 8360 2006-08-07 21:05:12Z luks $
+ 
+ ----------------------------------------------------------------------------*/
++#include <stdlib.h>
+ #include "tunepimp.h"
+ #include "mutex.h"
+ #include "tp_c.h"
+diff -Nur libtunepimp-0.5.3.orig/lib/fileio.cpp libtunepimp-0.5.3/lib/fileio.cpp
+--- libtunepimp-0.5.3.orig/lib/fileio.cpp	2006-11-18 04:52:33.000000000 -0600
++++ libtunepimp-0.5.3/lib/fileio.cpp	2009-07-05 22:25:09.562578982 -0500
+@@ -27,6 +27,8 @@
+ 
+ #include <assert.h>
+ #include <errno.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <string>
+ #ifndef WIN32
+ #include <unistd.h>
+diff -Nur libtunepimp-0.5.3.orig/lib/metadata.cpp libtunepimp-0.5.3/lib/metadata.cpp
+--- libtunepimp-0.5.3.orig/lib/metadata.cpp	2006-11-18 04:52:33.000000000 -0600
++++ libtunepimp-0.5.3/lib/metadata.cpp	2009-07-05 22:25:09.558605363 -0500
+@@ -26,6 +26,7 @@
+ ----------------------------------------------------------------------------*/
+ #include <math.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "metadata.h"
+ #include "../config.h"
+ using namespace std;
+diff -Nur libtunepimp-0.5.3.orig/lib/protocol.cpp libtunepimp-0.5.3/lib/protocol.cpp
+--- libtunepimp-0.5.3.orig/lib/protocol.cpp	2006-11-28 14:25:04.000000000 -0600
++++ libtunepimp-0.5.3/lib/protocol.cpp	2009-07-05 22:25:09.558605363 -0500
+@@ -8,6 +8,7 @@
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <string>
+ #include <map>
+ #include <expat.h>
+diff -Nur libtunepimp-0.5.3.orig/lib/readmeta.cpp libtunepimp-0.5.3/lib/readmeta.cpp
+--- libtunepimp-0.5.3.orig/lib/readmeta.cpp	2006-11-18 04:52:33.000000000 -0600
++++ libtunepimp-0.5.3/lib/readmeta.cpp	2009-07-05 22:25:09.562578982 -0500
+@@ -31,6 +31,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #ifndef WIN32
+ #include <unistd.h>
+ #endif
+diff -Nur libtunepimp-0.5.3.orig/lib/tunepimp.cpp libtunepimp-0.5.3/lib/tunepimp.cpp
+--- libtunepimp-0.5.3.orig/lib/tunepimp.cpp	2006-11-18 04:52:33.000000000 -0600
++++ libtunepimp-0.5.3/lib/tunepimp.cpp	2009-07-05 22:25:09.558605363 -0500
+@@ -30,7 +30,9 @@
+ #endif
+ #endif
+ 
++#include <string.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <map>
+ using namespace std;
+ 
+diff -Nur libtunepimp-0.5.3.orig/lib/utf8/utf8util.cpp libtunepimp-0.5.3/lib/utf8/utf8util.cpp
+--- libtunepimp-0.5.3.orig/lib/utf8/utf8util.cpp	2006-11-18 04:52:26.000000000 -0600
++++ libtunepimp-0.5.3/lib/utf8/utf8util.cpp	2009-07-05 22:25:09.558605363 -0500
+@@ -26,6 +26,7 @@
+ ----------------------------------------------------------------------------*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "utf8util.h"
+ #include "utf8.h"
+ #ifdef WIN32
+diff -Nur libtunepimp-0.5.3.orig/plugins/mp3/id3_2_3_meta.cpp libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp
+--- libtunepimp-0.5.3.orig/plugins/mp3/id3_2_3_meta.cpp	2006-11-18 04:51:07.000000000 -0600
++++ libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp	2009-07-05 22:25:09.562578982 -0500
+@@ -26,6 +26,7 @@
+ ----------------------------------------------------------------------------*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <assert.h>
+ #include <ctype.h>
+ #include <musicbrainz/mb_c.h>
+diff -Nur libtunepimp-0.5.3.orig/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp
+--- libtunepimp-0.5.3.orig/plugins/mp3/id3_meta.cpp	2006-11-18 04:51:07.000000000 -0600
++++ libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp	2009-07-05 22:25:09.562578982 -0500
+@@ -26,6 +26,7 @@
+ ----------------------------------------------------------------------------*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <time.h>
+ #include <ctype.h>
+ #include <musicbrainz/mb_c.h>
+diff -Nur 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	2006-11-18 04:51:08.000000000 -0600
++++ libtunepimp-0.5.3/plugins/mp4/mp4.cpp	2009-07-05 22:25:09.562578982 -0500
+@@ -27,6 +27,7 @@
+ 
+ #include <string.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <mp4.h>
+ #include "metadata.h"
+ #include "plugin.h"
+diff -Nur libtunepimp-0.5.3.orig/plugins/wma/wma.cpp libtunepimp-0.5.3/plugins/wma/wma.cpp
+--- libtunepimp-0.5.3.orig/plugins/wma/wma.cpp	2006-11-18 04:51:28.000000000 -0600
++++ libtunepimp-0.5.3/plugins/wma/wma.cpp	2009-07-05 22:25:09.562578982 -0500
+@@ -27,6 +27,7 @@
+ 
+ #include <string.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <wmafile.h>
+ #include "metadata.h"
+ #include "plugin.h"
+diff -Nur libtunepimp-0.5.3.orig/plugins/wma/wmafile.cpp libtunepimp-0.5.3/plugins/wma/wmafile.cpp
+--- libtunepimp-0.5.3.orig/plugins/wma/wmafile.cpp	2006-11-18 04:51:28.000000000 -0600
++++ libtunepimp-0.5.3/plugins/wma/wmafile.cpp	2009-07-05 22:25:09.566603724 -0500
+@@ -19,6 +19,7 @@
+  *   USA                                                                   *
+  ***************************************************************************/
+ 
++#include <string.h>
+ #include <tstring.h>
+ #include <wmafile.h>
+ #include <wmatag.h>
diff --git a/libraries/libtunepimp/libtunepimp.SlackBuild b/libraries/libtunepimp/libtunepimp.SlackBuild
index ab63029604..750d290b81 100644
--- a/libraries/libtunepimp/libtunepimp.SlackBuild
+++ b/libraries/libtunepimp/libtunepimp.SlackBuild
@@ -15,10 +15,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -36,10 +39,14 @@ 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
+patch -p1 < $CWD/libtunepimp-0.5.3-gcc43.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -66,4 +73,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libtunepimp/libtunepimp.info b/libraries/libtunepimp/libtunepimp.info
index 6e64f5fcdd..1cc751aa95 100644
--- a/libraries/libtunepimp/libtunepimp.info
+++ b/libraries/libtunepimp/libtunepimp.info
@@ -3,6 +3,8 @@ VERSION="0.5.3"
 HOMEPAGE="http://musicbrainz.org"
 DOWNLOAD="ftp://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.5.3.tar.gz"
 MD5SUM="09649f983acef679a548344ba7a9bb2f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michales Michaloudes"
 EMAIL="korgie@gmail.com"
 APPROVED="rworkman"