From c7d61a18cfe11a9b4da9196c249f06a9b0ea8e10 Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 27 Feb 2010 18:10:23 +0100 Subject: libtunepimp dans test --- extra/libtunepimp/.footprint | 44 -------- extra/libtunepimp/.md5sum | 4 - extra/libtunepimp/Pkgfile | 29 ------ extra/libtunepimp/gcc43.patch | 145 --------------------------- extra/libtunepimp/m4.patch | 21 ---- extra/libtunepimp/tunepimp-0.5.3-gcc44.patch | 13 --- test/libtunepimp/.footprint | 44 ++++++++ test/libtunepimp/.md5sum | 4 + test/libtunepimp/Pkgfile | 29 ++++++ test/libtunepimp/gcc43.patch | 145 +++++++++++++++++++++++++++ test/libtunepimp/m4.patch | 21 ++++ test/libtunepimp/tunepimp-0.5.3-gcc44.patch | 13 +++ 12 files changed, 256 insertions(+), 256 deletions(-) delete mode 100644 extra/libtunepimp/.footprint delete mode 100644 extra/libtunepimp/.md5sum delete mode 100644 extra/libtunepimp/Pkgfile delete mode 100644 extra/libtunepimp/gcc43.patch delete mode 100644 extra/libtunepimp/m4.patch delete mode 100644 extra/libtunepimp/tunepimp-0.5.3-gcc44.patch create mode 100644 test/libtunepimp/.footprint create mode 100644 test/libtunepimp/.md5sum create mode 100644 test/libtunepimp/Pkgfile create mode 100644 test/libtunepimp/gcc43.patch create mode 100644 test/libtunepimp/m4.patch create mode 100644 test/libtunepimp/tunepimp-0.5.3-gcc44.patch diff --git a/extra/libtunepimp/.footprint b/extra/libtunepimp/.footprint deleted file mode 100644 index 856589d91..000000000 --- a/extra/libtunepimp/.footprint +++ /dev/null @@ -1,44 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/puid -drwxr-xr-x root/root usr/include/ -lrwxrwxrwx root/root usr/include/tunepimp -> tunepimp-0.5 -drwxr-xr-x root/root usr/include/tunepimp-0.5/ --rw-r--r-- root/root usr/include/tunepimp-0.5/context.h --rw-r--r-- root/root usr/include/tunepimp-0.5/decode_plugin.h --rw-r--r-- root/root usr/include/tunepimp-0.5/defs.h --rw-r--r-- root/root usr/include/tunepimp-0.5/fileio.h --rw-r--r-- root/root usr/include/tunepimp-0.5/metadata.h --rw-r--r-- root/root usr/include/tunepimp-0.5/metadata_plugin.h --rw-r--r-- root/root usr/include/tunepimp-0.5/tp_c.h --rw-r--r-- root/root usr/include/tunepimp-0.5/track.h --rw-r--r-- root/root usr/include/tunepimp-0.5/tunepimp.h -drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libtunepimp.a --rwxr-xr-x root/root usr/lib/libtunepimp.la -lrwxrwxrwx root/root usr/lib/libtunepimp.so -> libtunepimp.so.5.0.3 -lrwxrwxrwx root/root usr/lib/libtunepimp.so.5 -> libtunepimp.so.5.0.3 --rwxr-xr-x root/root usr/lib/libtunepimp.so.5.0.3 -drwxr-xr-x root/root usr/lib/python2.6/ -drwxr-xr-x root/root usr/lib/python2.6/site-packages/ --rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp-0.5.3-py2.6.egg-info -drwxr-xr-x root/root usr/lib/python2.6/site-packages/tunepimp/ --rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/__init__.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/__init__.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/metadata.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/metadata.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/track.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/track.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/tunepimp.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/tunepimp.pyc -drwxr-xr-x root/root usr/lib/tunepimp/ -drwxr-xr-x root/root usr/lib/tunepimp/plugins/ --rw-r-xr-x root/root usr/lib/tunepimp/plugins/flac.tpp --rw-r-xr-x root/root usr/lib/tunepimp/plugins/mp4.tpp --rw-r-xr-x root/root usr/lib/tunepimp/plugins/mpc.tpp --rw-r-xr-x root/root usr/lib/tunepimp/plugins/speex.tpp --rw-r-xr-x root/root usr/lib/tunepimp/plugins/tta.tpp --rw-r-xr-x root/root usr/lib/tunepimp/plugins/vorbis.tpp --rw-r-xr-x root/root usr/lib/tunepimp/plugins/wav.tpp --rw-r-xr-x root/root usr/lib/tunepimp/plugins/wma.tpp --rw-r-xr-x root/root usr/lib/tunepimp/plugins/wv.tpp diff --git a/extra/libtunepimp/.md5sum b/extra/libtunepimp/.md5sum deleted file mode 100644 index 8b0be32a7..000000000 --- a/extra/libtunepimp/.md5sum +++ /dev/null @@ -1,4 +0,0 @@ -3bb39f6ff451f6f0b64fa4761bd4f5b5 gcc43.patch -09649f983acef679a548344ba7a9bb2f libtunepimp-0.5.3.tar.gz -f6cbc15a35c69e1e69bdc9389bb10ecb m4.patch -b325bf8ed98bc008611ece0c418642f8 tunepimp-0.5.3-gcc44.patch diff --git a/extra/libtunepimp/Pkgfile b/extra/libtunepimp/Pkgfile deleted file mode 100644 index 45ae6f651..000000000 --- a/extra/libtunepimp/Pkgfile +++ /dev/null @@ -1,29 +0,0 @@ -# Description: Librairie multimedia pour MusicBrainz -# URL: http://www.musicbrainz.org -# Maintainer: NuTyX core team -# Packager: thierryn1 at hispeed dot ch -# Depends on: libmusicbrainz, curl, libofa - -name=libtunepimp -version=0.5.3 -release=1 -source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/$name-$version.tar.gz\ - gcc43.patch tunepimp-0.5.3-gcc44.patch m4.patch) - -build() { - cd $name-$version - sed -i -e 's,-ltermcap,-lncurses,' configure - sed -i -e 's:-lthr:-lpthread:g' lib/threads/posix/Makefile.in - - patch -Np0 -i ../gcc43.patch - patch -Np1 -i ../tunepimp-0.5.3-gcc44.patch - patch -Np0 -i ../m4.patch - - ./configure --prefix=/usr - make - make DESTDIR=$PKG install - cd python - python setup.py install --root=$PKG - cd $PKG/usr/include - ln -s tunepimp-0.5 tunepimp -} diff --git a/extra/libtunepimp/gcc43.patch b/extra/libtunepimp/gcc43.patch deleted file mode 100644 index 2090803a8..000000000 --- a/extra/libtunepimp/gcc43.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -up lib/metadata.cpp.gcc43 lib/metadata.cpp ---- lib/metadata.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 -+++ lib/metadata.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - #include - #include -+#include - #include "metadata.h" - #include "../config.h" - using namespace std; -diff -up lib/protocol.cpp.gcc43 lib/protocol.cpp ---- lib/protocol.cpp.gcc43 2006-11-28 14:25:04.000000000 -0600 -+++ lib/protocol.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -8,6 +8,7 @@ - -------------------------------------------------------------------*/ - #include - #include -+#include - #include - #include - #include -diff -up lib/utf8/utf8util.cpp.gcc43 lib/utf8/utf8util.cpp ---- lib/utf8/utf8util.cpp.gcc43 2006-11-18 04:52:26.000000000 -0600 -+++ lib/utf8/utf8util.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - - #include -+#include - #include "utf8util.h" - #include "utf8.h" - #ifdef WIN32 -diff -up lib/tunepimp.cpp.gcc43 lib/tunepimp.cpp ---- lib/tunepimp.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 -+++ lib/tunepimp.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -30,7 +30,9 @@ - #endif - #endif - -+#include - #include -+#include - #include - using namespace std; - -diff -up lib/c_wrapper.cpp.gcc43 lib/c_wrapper.cpp ---- lib/c_wrapper.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 -+++ lib/c_wrapper.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -24,6 +24,7 @@ - $Id: tunepimp-0.5.3-gcc43.patch,v 1.1 2008/04/07 05:49:36 philantrop Exp $ - - ----------------------------------------------------------------------------*/ -+#include - #include "tunepimp.h" - #include "mutex.h" - #include "tp_c.h" -diff -up lib/readmeta.cpp.gcc43 lib/readmeta.cpp ---- lib/readmeta.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 -+++ lib/readmeta.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -31,6 +31,7 @@ - #endif - - #include -+#include - #ifndef WIN32 - #include - #endif -diff -up lib/fileio.cpp.gcc43 lib/fileio.cpp ---- lib/fileio.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 -+++ lib/fileio.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -27,6 +27,8 @@ - - #include - #include -+#include -+#include - #include - #ifndef WIN32 - #include -diff -up plugins/mp4/mp4.cpp.gcc43 plugins/mp4/mp4.cpp ---- plugins/mp4/mp4.cpp.gcc43 2006-11-18 04:51:08.000000000 -0600 -+++ plugins/mp4/mp4.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - #include "metadata.h" - #include "plugin.h" -diff -up plugins/mp3/id3_meta.cpp.gcc43 plugins/mp3/id3_meta.cpp ---- plugins/mp3/id3_meta.cpp.gcc43 2006-11-18 04:51:07.000000000 -0600 -+++ plugins/mp3/id3_meta.cpp 2008-02-21 20:41:35.000000000 -0600 -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - - #include -+#include - #include - #include - #include -diff -up plugins/mp3/id3_2_3_meta.cpp.gcc43 plugins/mp3/id3_2_3_meta.cpp ---- plugins/mp3/id3_2_3_meta.cpp.gcc43 2006-11-18 04:51:07.000000000 -0600 -+++ plugins/mp3/id3_2_3_meta.cpp 2008-02-21 20:41:59.000000000 -0600 -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - - #include -+#include - #include - #include - #include -diff -up plugins/wma/wma.cpp.gcc43 plugins/wma/wma.cpp ---- plugins/wma/wma.cpp.gcc43 2006-11-18 04:51:28.000000000 -0600 -+++ plugins/wma/wma.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - #include "metadata.h" - #include "plugin.h" -diff -up plugins/wma/wmafile.cpp.gcc43 plugins/wma/wmafile.cpp ---- plugins/wma/wmafile.cpp.gcc43 2006-11-18 04:51:28.000000000 -0600 -+++ plugins/wma/wmafile.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -19,6 +19,7 @@ - * USA * - ***************************************************************************/ - -+#include - #include - #include - #include -diff -up include/tunepimp-0.5/metadata.h.gcc43 include/tunepimp-0.5/metadata.h ---- include/tunepimp-0.5/metadata.h.gcc43 2006-11-18 04:52:08.000000000 -0600 -+++ include/tunepimp-0.5/metadata.h 2008-02-21 20:39:10.000000000 -0600 -@@ -27,6 +27,7 @@ - #ifndef __METADATA_H__ - #define __METADATA_H__ - -+#include - #include - #include diff --git a/extra/libtunepimp/m4.patch b/extra/libtunepimp/m4.patch deleted file mode 100644 index fcad6c6f2..000000000 --- a/extra/libtunepimp/m4.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- plugins/mp4/mp4.cpp~ 2009-05-09 16:00:27.000000000 +0200 -+++ plugins/mp4/mp4.cpp 2009-05-09 16:00:27.000000000 +0200 -@@ -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/extra/libtunepimp/tunepimp-0.5.3-gcc44.patch b/extra/libtunepimp/tunepimp-0.5.3-gcc44.patch deleted file mode 100644 index 2c5e4f9db..000000000 --- a/extra/libtunepimp/tunepimp-0.5.3-gcc44.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/test/libtunepimp/.footprint b/test/libtunepimp/.footprint new file mode 100644 index 000000000..856589d91 --- /dev/null +++ b/test/libtunepimp/.footprint @@ -0,0 +1,44 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/puid +drwxr-xr-x root/root usr/include/ +lrwxrwxrwx root/root usr/include/tunepimp -> tunepimp-0.5 +drwxr-xr-x root/root usr/include/tunepimp-0.5/ +-rw-r--r-- root/root usr/include/tunepimp-0.5/context.h +-rw-r--r-- root/root usr/include/tunepimp-0.5/decode_plugin.h +-rw-r--r-- root/root usr/include/tunepimp-0.5/defs.h +-rw-r--r-- root/root usr/include/tunepimp-0.5/fileio.h +-rw-r--r-- root/root usr/include/tunepimp-0.5/metadata.h +-rw-r--r-- root/root usr/include/tunepimp-0.5/metadata_plugin.h +-rw-r--r-- root/root usr/include/tunepimp-0.5/tp_c.h +-rw-r--r-- root/root usr/include/tunepimp-0.5/track.h +-rw-r--r-- root/root usr/include/tunepimp-0.5/tunepimp.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libtunepimp.a +-rwxr-xr-x root/root usr/lib/libtunepimp.la +lrwxrwxrwx root/root usr/lib/libtunepimp.so -> libtunepimp.so.5.0.3 +lrwxrwxrwx root/root usr/lib/libtunepimp.so.5 -> libtunepimp.so.5.0.3 +-rwxr-xr-x root/root usr/lib/libtunepimp.so.5.0.3 +drwxr-xr-x root/root usr/lib/python2.6/ +drwxr-xr-x root/root usr/lib/python2.6/site-packages/ +-rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp-0.5.3-py2.6.egg-info +drwxr-xr-x root/root usr/lib/python2.6/site-packages/tunepimp/ +-rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/__init__.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/metadata.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/metadata.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/track.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/track.pyc +-rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/tunepimp.py +-rw-r--r-- root/root usr/lib/python2.6/site-packages/tunepimp/tunepimp.pyc +drwxr-xr-x root/root usr/lib/tunepimp/ +drwxr-xr-x root/root usr/lib/tunepimp/plugins/ +-rw-r-xr-x root/root usr/lib/tunepimp/plugins/flac.tpp +-rw-r-xr-x root/root usr/lib/tunepimp/plugins/mp4.tpp +-rw-r-xr-x root/root usr/lib/tunepimp/plugins/mpc.tpp +-rw-r-xr-x root/root usr/lib/tunepimp/plugins/speex.tpp +-rw-r-xr-x root/root usr/lib/tunepimp/plugins/tta.tpp +-rw-r-xr-x root/root usr/lib/tunepimp/plugins/vorbis.tpp +-rw-r-xr-x root/root usr/lib/tunepimp/plugins/wav.tpp +-rw-r-xr-x root/root usr/lib/tunepimp/plugins/wma.tpp +-rw-r-xr-x root/root usr/lib/tunepimp/plugins/wv.tpp diff --git a/test/libtunepimp/.md5sum b/test/libtunepimp/.md5sum new file mode 100644 index 000000000..8b0be32a7 --- /dev/null +++ b/test/libtunepimp/.md5sum @@ -0,0 +1,4 @@ +3bb39f6ff451f6f0b64fa4761bd4f5b5 gcc43.patch +09649f983acef679a548344ba7a9bb2f libtunepimp-0.5.3.tar.gz +f6cbc15a35c69e1e69bdc9389bb10ecb m4.patch +b325bf8ed98bc008611ece0c418642f8 tunepimp-0.5.3-gcc44.patch diff --git a/test/libtunepimp/Pkgfile b/test/libtunepimp/Pkgfile new file mode 100644 index 000000000..9ccc79699 --- /dev/null +++ b/test/libtunepimp/Pkgfile @@ -0,0 +1,29 @@ +# Description: Librairie multimedia pour MusicBrainz +# URL: http://www.musicbrainz.org +# Maintainer: NuTyX core team +# Packager: thierryn1 at hispeed dot ch +# Depends on: libmusicbrainz, curl, expat + +name=libtunepimp +version=0.5.3 +release=1 +source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/$name-$version.tar.gz\ + gcc43.patch tunepimp-0.5.3-gcc44.patch m4.patch) + +build() { + cd $name-$version + sed -i -e 's,-ltermcap,-lncurses,' configure + sed -i -e 's:-lthr:-lpthread:g' lib/threads/posix/Makefile.in + + patch -Np0 -i ../gcc43.patch + patch -Np1 -i ../tunepimp-0.5.3-gcc44.patch + patch -Np0 -i ../m4.patch + + ./configure --prefix=/usr + make + make DESTDIR=$PKG install + cd python + python setup.py install --root=$PKG + cd $PKG/usr/include + ln -s tunepimp-0.5 tunepimp +} diff --git a/test/libtunepimp/gcc43.patch b/test/libtunepimp/gcc43.patch new file mode 100644 index 000000000..2090803a8 --- /dev/null +++ b/test/libtunepimp/gcc43.patch @@ -0,0 +1,145 @@ +diff -up lib/metadata.cpp.gcc43 lib/metadata.cpp +--- lib/metadata.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 ++++ lib/metadata.cpp 2008-02-21 20:39:10.000000000 -0600 +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + #include + #include ++#include + #include "metadata.h" + #include "../config.h" + using namespace std; +diff -up lib/protocol.cpp.gcc43 lib/protocol.cpp +--- lib/protocol.cpp.gcc43 2006-11-28 14:25:04.000000000 -0600 ++++ lib/protocol.cpp 2008-02-21 20:39:10.000000000 -0600 +@@ -8,6 +8,7 @@ + -------------------------------------------------------------------*/ + #include + #include ++#include + #include + #include + #include +diff -up lib/utf8/utf8util.cpp.gcc43 lib/utf8/utf8util.cpp +--- lib/utf8/utf8util.cpp.gcc43 2006-11-18 04:52:26.000000000 -0600 ++++ lib/utf8/utf8util.cpp 2008-02-21 20:39:10.000000000 -0600 +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + + #include ++#include + #include "utf8util.h" + #include "utf8.h" + #ifdef WIN32 +diff -up lib/tunepimp.cpp.gcc43 lib/tunepimp.cpp +--- lib/tunepimp.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 ++++ lib/tunepimp.cpp 2008-02-21 20:39:10.000000000 -0600 +@@ -30,7 +30,9 @@ + #endif + #endif + ++#include + #include ++#include + #include + using namespace std; + +diff -up lib/c_wrapper.cpp.gcc43 lib/c_wrapper.cpp +--- lib/c_wrapper.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 ++++ lib/c_wrapper.cpp 2008-02-21 20:39:10.000000000 -0600 +@@ -24,6 +24,7 @@ + $Id: tunepimp-0.5.3-gcc43.patch,v 1.1 2008/04/07 05:49:36 philantrop Exp $ + + ----------------------------------------------------------------------------*/ ++#include + #include "tunepimp.h" + #include "mutex.h" + #include "tp_c.h" +diff -up lib/readmeta.cpp.gcc43 lib/readmeta.cpp +--- lib/readmeta.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 ++++ lib/readmeta.cpp 2008-02-21 20:39:10.000000000 -0600 +@@ -31,6 +31,7 @@ + #endif + + #include ++#include + #ifndef WIN32 + #include + #endif +diff -up lib/fileio.cpp.gcc43 lib/fileio.cpp +--- lib/fileio.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 ++++ lib/fileio.cpp 2008-02-21 20:39:10.000000000 -0600 +@@ -27,6 +27,8 @@ + + #include + #include ++#include ++#include + #include + #ifndef WIN32 + #include +diff -up plugins/mp4/mp4.cpp.gcc43 plugins/mp4/mp4.cpp +--- plugins/mp4/mp4.cpp.gcc43 2006-11-18 04:51:08.000000000 -0600 ++++ plugins/mp4/mp4.cpp 2008-02-21 20:39:10.000000000 -0600 +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + #include "metadata.h" + #include "plugin.h" +diff -up plugins/mp3/id3_meta.cpp.gcc43 plugins/mp3/id3_meta.cpp +--- plugins/mp3/id3_meta.cpp.gcc43 2006-11-18 04:51:07.000000000 -0600 ++++ plugins/mp3/id3_meta.cpp 2008-02-21 20:41:35.000000000 -0600 +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + + #include ++#include + #include + #include + #include +diff -up plugins/mp3/id3_2_3_meta.cpp.gcc43 plugins/mp3/id3_2_3_meta.cpp +--- plugins/mp3/id3_2_3_meta.cpp.gcc43 2006-11-18 04:51:07.000000000 -0600 ++++ plugins/mp3/id3_2_3_meta.cpp 2008-02-21 20:41:59.000000000 -0600 +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + + #include ++#include + #include + #include + #include +diff -up plugins/wma/wma.cpp.gcc43 plugins/wma/wma.cpp +--- plugins/wma/wma.cpp.gcc43 2006-11-18 04:51:28.000000000 -0600 ++++ plugins/wma/wma.cpp 2008-02-21 20:39:10.000000000 -0600 +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + #include "metadata.h" + #include "plugin.h" +diff -up plugins/wma/wmafile.cpp.gcc43 plugins/wma/wmafile.cpp +--- plugins/wma/wmafile.cpp.gcc43 2006-11-18 04:51:28.000000000 -0600 ++++ plugins/wma/wmafile.cpp 2008-02-21 20:39:10.000000000 -0600 +@@ -19,6 +19,7 @@ + * USA * + ***************************************************************************/ + ++#include + #include + #include + #include +diff -up include/tunepimp-0.5/metadata.h.gcc43 include/tunepimp-0.5/metadata.h +--- include/tunepimp-0.5/metadata.h.gcc43 2006-11-18 04:52:08.000000000 -0600 ++++ include/tunepimp-0.5/metadata.h 2008-02-21 20:39:10.000000000 -0600 +@@ -27,6 +27,7 @@ + #ifndef __METADATA_H__ + #define __METADATA_H__ + ++#include + #include + #include diff --git a/test/libtunepimp/m4.patch b/test/libtunepimp/m4.patch new file mode 100644 index 000000000..fcad6c6f2 --- /dev/null +++ b/test/libtunepimp/m4.patch @@ -0,0 +1,21 @@ +--- plugins/mp4/mp4.cpp~ 2009-05-09 16:00:27.000000000 +0200 ++++ plugins/mp4/mp4.cpp 2009-05-09 16:00:27.000000000 +0200 +@@ -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/test/libtunepimp/tunepimp-0.5.3-gcc44.patch b/test/libtunepimp/tunepimp-0.5.3-gcc44.patch new file mode 100644 index 000000000..2c5e4f9db --- /dev/null +++ b/test/libtunepimp/tunepimp-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); -- cgit v1.2.3-70-g09d2