Date: Saturday, March 6, 2010 @ 13:45:26 Author: andrea Revision: 71345
upgpkg: tunepimp 0.5.3-7 rebuilt and patched for mp4v2 1.9.1 Added: tunepimp/trunk/gcc4.4.patch tunepimp/trunk/mp4v2-1.9.patch tunepimp/trunk/tunepimp-gcc43.patch Modified: tunepimp/trunk/PKGBUILD Deleted: tunepimp/trunk/mp4.patch tunepimp/trunk/tunepimp-gcc43.patch ----------------------+ PKGBUILD | 32 ++--- gcc4.4.patch | 13 ++ mp4.patch | 20 --- mp4v2-1.9.patch | 30 +++++ tunepimp-gcc43.patch | 290 ++++++++++++++++++++++++------------------------- 5 files changed, 205 insertions(+), 180 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-03-06 18:45:22 UTC (rev 71344) +++ PKGBUILD 2010-03-06 18:45:26 UTC (rev 71345) @@ -3,37 +3,39 @@ pkgname=tunepimp pkgver=0.5.3 -pkgrel=6 -pkgdesc="The TunePimp library (also referred to as libtunepimp) is a development library geared towards developers who wish to create MusicBrainz enabled tagging applications." -arch=(i686 x86_64) +pkgrel=7 +pkgdesc="The TunePimp library (also referred to as libtunepimp) is a development library geared towards developers who wish to create MusicBrainz enabled tagging applications" +url="http://www.musicbrainz.org/products/tunepimp/"; +arch=('i686' 'x86_64') license=('GPL') options=('!libtool' '!makeflags') makedepends=('python') -depends=('curl>=7.16.2' 'musicbrainz' 'zlib' 'libmad' 'flac>=1.1.4' 'libvorbis' 'readline' 'libmpcdec' 'libofa' 'taglib' 'libmp4v2') +depends=('curl' 'musicbrainz' 'zlib' 'libmad' 'flac' 'libvorbis' 'readline' 'libmpcdec' 'libofa' 'taglib' 'libmp4v2') replaces=('trm') source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/lib${pkgname}-${pkgver}.tar.gz tunepimp-gcc43.patch - mp4.patch) -url="http://www.musicbrainz.org/products/tunepimp/"; + gcc4.4.patch + mp4v2-1.9.patch) -build() { - cd ${startdir}/src/lib${pkgname}-${pkgver} + build() { + cd ${srcdir}/lib${pkgname}-${pkgver} sed -i -e 's,-ltermcap,-lncurses,' configure sed -i -e 's:-lthr:-lpthread:g' lib/threads/posix/Makefile.in - patch -Np0 -i ../tunepimp-gcc43.patch || return 1 - patch -Np0 -i ../mp4.patch || return 1 + patch -Np0 -i ${srcdir}/tunepimp-gcc43.patch || return 1 + patch -Np1 -i ${srcdir}/gcc4.4.patch || return 1 + patch -Np1 -i ${srcdir}/mp4v2-1.9.patch || return 1 ./configure --prefix=/usr make || return 1 - make DESTDIR=${startdir}/pkg install + make DESTDIR=${pkgdir} install # install python bindings cd python - python setup.py install --root=${startdir}/pkg + python setup.py install --root=${pkgdir} # fix includes for kdemultimedia - cd ${startdir}/pkg/usr/include + cd ${pkgdir}/usr/include ln -s tunepimp-0.5 tunepimp } - md5sums=('09649f983acef679a548344ba7a9bb2f' '40f48ad658958b909909b204bf9b1367' - '8d8dc225511544ec23755e62f3eef456') + 'b325bf8ed98bc008611ece0c418642f8' + '9f41d473a07e13808762545772fe3435') Added: gcc4.4.patch =================================================================== --- gcc4.4.patch (rev 0) +++ gcc4.4.patch 2010-03-06 18:45:26 UTC (rev 71345) @@ -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); Deleted: mp4.patch =================================================================== --- mp4.patch 2010-03-06 18:45:22 UTC (rev 71344) +++ mp4.patch 2010-03-06 18:45:26 UTC (rev 71345) @@ -1,20 +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 Added: mp4v2-1.9.patch =================================================================== --- mp4v2-1.9.patch (rev 0) +++ mp4v2-1.9.patch 2010-03-06 18:45:26 UTC (rev 71345) @@ -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 Deleted: tunepimp-gcc43.patch =================================================================== --- tunepimp-gcc43.patch 2010-03-06 18:45:22 UTC (rev 71344) +++ tunepimp-gcc43.patch 2010-03-06 18:45:26 UTC (rev 71345) @@ -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 <math.h> - #include <stdio.h> -+#include <stdlib.h> - #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 <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include <string> - #include <map> - #include <expat.h> -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 <stdio.h> -+#include <stdlib.h> - #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 <string.h> - #include <stdio.h> -+#include <stdlib.h> - #include <map> - 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 <stdlib.h> - #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 <stdio.h> -+#include <stdlib.h> - #ifndef WIN32 - #include <unistd.h> - #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 <assert.h> - #include <errno.h> -+#include <stdlib.h> -+#include <string.h> - #include <string> - #ifndef WIN32 - #include <unistd.h> -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 <string.h> - #include <stdio.h> -+#include <stdlib.h> - #include <mp4.h> - #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 <stdio.h> -+#include <stdlib.h> - #include <time.h> - #include <ctype.h> - #include <musicbrainz/mb_c.h> -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 <stdio.h> -+#include <stdlib.h> - #include <assert.h> - #include <ctype.h> - #include <musicbrainz/mb_c.h> -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 <string.h> - #include <stdio.h> -+#include <stdlib.h> - #include <wmafile.h> - #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 <string.h> - #include <tstring.h> - #include <wmafile.h> - #include <wmatag.h> -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 <string.h> - #include <string> - #include <cstdio> \ No newline at end of file Added: tunepimp-gcc43.patch =================================================================== --- tunepimp-gcc43.patch (rev 0) +++ tunepimp-gcc43.patch 2010-03-06 18:45:26 UTC (rev 71345) @@ -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 <math.h> + #include <stdio.h> ++#include <stdlib.h> + #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 <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <string> + #include <map> + #include <expat.h> +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 <stdio.h> ++#include <stdlib.h> + #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 <string.h> + #include <stdio.h> ++#include <stdlib.h> + #include <map> + 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 <stdlib.h> + #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 <stdio.h> ++#include <stdlib.h> + #ifndef WIN32 + #include <unistd.h> + #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 <assert.h> + #include <errno.h> ++#include <stdlib.h> ++#include <string.h> + #include <string> + #ifndef WIN32 + #include <unistd.h> +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 <string.h> + #include <stdio.h> ++#include <stdlib.h> + #include <mp4.h> + #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 <stdio.h> ++#include <stdlib.h> + #include <time.h> + #include <ctype.h> + #include <musicbrainz/mb_c.h> +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 <stdio.h> ++#include <stdlib.h> + #include <assert.h> + #include <ctype.h> + #include <musicbrainz/mb_c.h> +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 <string.h> + #include <stdio.h> ++#include <stdlib.h> + #include <wmafile.h> + #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 <string.h> + #include <tstring.h> + #include <wmafile.h> + #include <wmatag.h> +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 <string.h> + #include <string> + #include <cstdio> \ No newline at end of file
