libtunpimp: update to 0.4.1

5 files changed, 30 insertions, 60 deletions

diff --git a/libtunepimp/.footprint b/libtunepimp/.footprint
index 4a68ec24d..9c496b4a4 100644
--- a/libtunepimp/.footprint
+++ b/libtunepimp/.footprint
@@ -5,13 +5,22 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/tunepimp/
 -rw-r--r--	root/root	usr/include/tunepimp/context.h
+-rw-r--r--	root/root	usr/include/tunepimp/decode_plugin.h
 -rw-r--r--	root/root	usr/include/tunepimp/defs.h
+-rw-r--r--	root/root	usr/include/tunepimp/fileio.h
+-rw-r--r--	root/root	usr/include/tunepimp/metadata_plugin.h
 -rw-r--r--	root/root	usr/include/tunepimp/tp_c.h
 -rw-r--r--	root/root	usr/include/tunepimp/track.h
 -rw-r--r--	root/root	usr/include/tunepimp/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.2.0.0
-lrwxrwxrwx	root/root	usr/lib/libtunepimp.so.2 -> libtunepimp.so.2.0.0
--rwxr-xr-x	root/root	usr/lib/libtunepimp.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/libtunepimp.so -> libtunepimp.so.3.0.0
+lrwxrwxrwx	root/root	usr/lib/libtunepimp.so.3 -> libtunepimp.so.3.0.0
+-rwxr-xr-x	root/root	usr/lib/libtunepimp.so.3.0.0
+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/mp3.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
diff --git a/libtunepimp/.md5sum b/libtunepimp/.md5sum
index 5dcf30911..ca8c159c4 100644
--- a/libtunepimp/.md5sum
+++ b/libtunepimp/.md5sum
@@ -1,2 +1,2 @@
-0a2290651498463e317e2f24946d10f2  libtunepimp-0.3.0.patch
-f1f506914150c4917ec730f847ad4709  libtunepimp-0.3.0.tar.gz
+e5b7453107d913991ba15f850623f09c  libtunepimp-0.4.1.patch
+bb4c2e49899e6d3e27e7a781ca078cb7  libtunepimp-0.4.1.tar.gz
diff --git a/libtunepimp/Pkgfile b/libtunepimp/Pkgfile
index 74c13814d..ff5e1e534 100644
--- a/libtunepimp/Pkgfile
+++ b/libtunepimp/Pkgfile
@@ -5,14 +5,15 @@
 # Depends on: libvorbis, flac, libmad, libogg, expat, libmusicbrainz, libid3tag
 
 name=libtunepimp
-version=0.3.0
-release=2
+version=0.4.1
+release=1
 source=(http://ftp.musicbrainz.org/pub/musicbrainz/$name-$version.tar.gz \
 	$name-$version.patch)
 build() {
 	cd $name-$version
 	patch -p1 < $SRC/$name-$version.patch
-	./configure --prefix=/usr --disable-nls
+	./configure --prefix=/usr \
+        --disable-nls
 	make
 	make DESTDIR=$PKG install
 }
diff --git a/libtunepimp/libtunepimp-0.3.0.patch b/libtunepimp/libtunepimp-0.3.0.patch
deleted file mode 100644
index 3b7ab33b2..000000000
--- a/libtunepimp/libtunepimp-0.3.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nru libtunepimp-0.3.0/configure libtunepimp-0.3.0-new/configure
---- libtunepimp-0.3.0/configure	2004-03-30 11:42:24.000000000 +0200
-+++ libtunepimp-0.3.0-new/configure	2004-09-06 17:05:51.348758754 +0200
-@@ -19591,7 +19591,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline -ltermcap $LIBS"
-+LIBS="-lreadline -lncurses $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -19650,7 +19650,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
- echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
- if test $ac_cv_lib_readline_readline = yes; then
--  READLINE_LIBS="-lreadline -ltermcap"
-+  READLINE_LIBS="-lreadline -lncurses"
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBREADLINE 1
-diff -Nru libtunepimp-0.3.0/configure.in libtunepimp-0.3.0-new/configure.in
---- libtunepimp-0.3.0/configure.in	2004-03-30 11:40:04.000000000 +0200
-+++ libtunepimp-0.3.0-new/configure.in	2004-09-06 17:05:51.349758217 +0200
-@@ -46,14 +46,14 @@
- 
- dnl Check for readline. This is optional.
- AC_CHECK_LIB(readline, readline,
--             [READLINE_LIBS="-lreadline -ltermcap"
-+             [READLINE_LIBS="-lreadline -lncurses"
-              AC_DEFINE(HAVE_LIBREADLINE,1,[Readline Support])],
-              [echo "*"
-              echo "*  The GNU readline library isn't installed."
-              echo "*  This means the sample tagger, tp_tagger, won't"
-              echo "*  have readline support."
-              echo "*"
--	     ],-ltermcap)
-+	     ],-lncurses)
- 
- dnl Check for MAD decoder lib for mp3 support
- AC_CHECK_LIB(mad,mad_version,
-diff -Nru libtunepimp-0.3.0/lib/threads/posix/thread.h libtunepimp-0.3.0-new/lib/threads/posix/thread.h
---- libtunepimp-0.3.0/lib/threads/posix/thread.h	2004-03-25 10:20:15.000000000 +0100
-+++ libtunepimp-0.3.0-new/lib/threads/posix/thread.h	2004-09-06 17:29:30.996443199 +0200
-@@ -28,6 +28,7 @@
- #define __THREAD_H_
- 
- #include <pthread.h>
-+#include <signal.h>
- #include "semaphore.h"
- 
- #include "defs.h"
diff --git a/libtunepimp/libtunepimp-0.4.1.patch b/libtunepimp/libtunepimp-0.4.1.patch
new file mode 100644
index 000000000..6063766d8
--- /dev/null
+++ b/libtunepimp/libtunepimp-0.4.1.patch
@@ -0,0 +1,12 @@
+diff -ur ../libtunepimp-0.4.1.orig/configure ./configure
+--- ../libtunepimp-0.4.1.orig/configure	2006-03-29 00:15:50.000000000 -0700
++++ ./configure	2006-03-29 00:17:22.000000000 -0700
+@@ -20228,7 +20228,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline -ltermcap $LIBS"
++LIBS="-lreadline -lncurses $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF