diff options
18 files changed, 234 insertions, 14 deletions
diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile index 61b92303c187..33f9a3d266d9 100644 --- a/audio/libtunepimp-old/Makefile +++ b/audio/libtunepimp-old/Makefile @@ -7,6 +7,7 @@ PORTNAME= libtunepimp PORTVERSION= 0.4.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/ \ @@ -15,25 +16,31 @@ MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/ \ MAINTAINER= lauri@kde.org COMMENT= Client library for musicbrainz -LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ - FLAC:${PORTSDIR}/audio/flac \ +LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ + expat:${PORTSDIR}/textproc/expat2 \ mad:${PORTSDIR}/audio/libmad \ + mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \ + musicbrainz:${PORTSDIR}/audio/libmusicbrainz \ ogg:${PORTSDIR}/audio/libogg \ - expat:${PORTSDIR}/textproc/expat2 \ - musicbrainz:${PORTSDIR}/audio/libmusicbrainz + tag:${PORTSDIR}/audio/taglib \ + vorbis:${PORTSDIR}/audio/libvorbis CONFLICTS= trm-0* USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv" + LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes post-patch: @${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \ - s|^CXXFLAGS=|#CXXFLAGS=|g' ${WRKSRC}/configure + s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lthr|${PTHREAD_LIBS}|g' \ ${WRKSRC}/lib/threads/posix/Makefile.in +post-configure: + @${REINPLACE_CMD} -e 's|\(^LDFLAGS =.*\)|\1 ${PTHREAD_LIBS} -liconv|g' \ + ${WRKSRC}/examples/Makefile + .include <bsd.port.mk> diff --git a/audio/libtunepimp-old/files/patch-configure b/audio/libtunepimp-old/files/patch-configure new file mode 100644 index 000000000000..babac2c52ba0 --- /dev/null +++ b/audio/libtunepimp-old/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Mon Apr 10 10:52:03 2006 ++++ configure Mon Apr 10 10:54:14 2006 +@@ -20506,7 +20506,7 @@ + TAGLIB_VERSION=`$TAGLIB_CONFIG --version` + echo "$as_me:$LINENO: checking for taglib >= 1.4.0" >&5 + echo $ECHO_N "checking for taglib >= 1.4.0... $ECHO_C" >&6 +- VERSION_CHECK=`expr $TAGLIB_VERSION \>\= 1.4.0` ++ VERSION_CHECK=`expr $TAGLIB_VERSION \>\= 1.4` + if test "$VERSION_CHECK" = "1" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 diff --git a/audio/libtunepimp-old/files/patch-lib-metadata.cpp b/audio/libtunepimp-old/files/patch-lib-metadata.cpp new file mode 100644 index 000000000000..018363898587 --- /dev/null +++ b/audio/libtunepimp-old/files/patch-lib-metadata.cpp @@ -0,0 +1,17 @@ +--- lib/metadata.cpp.orig Wed Nov 10 17:37:26 2004 ++++ lib/metadata.cpp Wed Sep 14 17:25:59 2005 +@@ -34,6 +34,14 @@ + #include "astrcmp.h" + } + ++#ifndef min ++#define min(a,b) ((a) < (b) ? (a) : (b)) ++#endif ++ ++#ifndef max ++#define max(a,b) ((a) > (b) ? (a) : (b)) ++#endif ++ + const int numAlbumTypeStrings = 11; + const char *albumTypeStrings[] = + { diff --git a/audio/libtunepimp-old/files/patch-lib-utf8-utf8util.cpp b/audio/libtunepimp-old/files/patch-lib-utf8-utf8util.cpp new file mode 100644 index 000000000000..a3a5cabb78e8 --- /dev/null +++ b/audio/libtunepimp-old/files/patch-lib-utf8-utf8util.cpp @@ -0,0 +1,20 @@ +--- lib/utf8/utf8util.cpp.orig Mon Jul 11 05:01:23 2005 ++++ lib/utf8/utf8util.cpp Wed Sep 14 17:19:42 2005 +@@ -38,7 +38,7 @@ + char *dest; + string to; + +- to.clear(); ++ to = ""; + ret = utf8_encode(from.c_str(), &dest); + if (ret >= 0) + { +@@ -54,7 +54,7 @@ + char *dest; + string to; + +- to.clear(); ++ to = ""; + ret = utf8_decode(from.c_str(), &dest); + if (ret >= 0) + { diff --git a/audio/libtunepimp-old/files/patch-plugins-flac-flac.cpp b/audio/libtunepimp-old/files/patch-plugins-flac-flac.cpp new file mode 100644 index 000000000000..5d590d59034b --- /dev/null +++ b/audio/libtunepimp-old/files/patch-plugins-flac-flac.cpp @@ -0,0 +1,13 @@ +--- plugins/flac/flac.cpp.orig Tue Jun 28 13:03:06 2005 ++++ plugins/flac/flac.cpp Wed Sep 14 17:35:23 2005 +@@ -33,7 +33,10 @@ + #ifdef WIN32 + #include <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif + diff --git a/audio/libtunepimp-old/files/patch-plugins-mp3-mp3.cpp b/audio/libtunepimp-old/files/patch-plugins-mp3-mp3.cpp new file mode 100644 index 000000000000..8b8e8fd87acd --- /dev/null +++ b/audio/libtunepimp-old/files/patch-plugins-mp3-mp3.cpp @@ -0,0 +1,13 @@ +--- plugins/mp3/mp3.cpp.orig Tue Jul 12 06:44:06 2005 ++++ plugins/mp3/mp3.cpp Wed Sep 14 17:32:42 2005 +@@ -33,7 +33,10 @@ + #ifdef WIN32 + #include <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif + diff --git a/audio/libtunepimp-old/files/patch-plugins-vorbis-vorbis.cpp b/audio/libtunepimp-old/files/patch-plugins-vorbis-vorbis.cpp new file mode 100644 index 000000000000..2ab8c472b45e --- /dev/null +++ b/audio/libtunepimp-old/files/patch-plugins-vorbis-vorbis.cpp @@ -0,0 +1,13 @@ +--- plugins/vorbis/vorbis.cpp.orig Tue Jun 28 13:03:06 2005 ++++ plugins/vorbis/vorbis.cpp Wed Sep 14 17:34:12 2005 +@@ -33,7 +33,10 @@ + #ifdef WIN32 + #include <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif + diff --git a/audio/libtunepimp-old/files/patch-plugins-wav-wav.cpp b/audio/libtunepimp-old/files/patch-plugins-wav-wav.cpp new file mode 100644 index 000000000000..34bf7b46d4c3 --- /dev/null +++ b/audio/libtunepimp-old/files/patch-plugins-wav-wav.cpp @@ -0,0 +1,13 @@ +--- plugins/wav/wav.cpp.orig Wed Jun 15 06:15:18 2005 ++++ plugins/wav/wav.cpp Wed Sep 14 17:30:30 2005 +@@ -34,7 +34,10 @@ + #ifdef WIN32 + #include <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif +
\ No newline at end of file diff --git a/audio/libtunepimp-old/pkg-plist b/audio/libtunepimp-old/pkg-plist index db2a99a68150..dca0bb75b436 100644 --- a/audio/libtunepimp-old/pkg-plist +++ b/audio/libtunepimp-old/pkg-plist @@ -14,8 +14,11 @@ lib/libtunepimp.so lib/libtunepimp.so.3 lib/tunepimp/plugins/flac.tpp lib/tunepimp/plugins/mp3.tpp +lib/tunepimp/plugins/mp4.tpp +lib/tunepimp/plugins/mpc.tpp lib/tunepimp/plugins/vorbis.tpp lib/tunepimp/plugins/wav.tpp -@dirrm include/tunepimp +lib/tunepimp/plugins/wma.tpp @dirrm lib/tunepimp/plugins @dirrm lib/tunepimp +@dirrm include/tunepimp diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile index 61b92303c187..33f9a3d266d9 100644 --- a/audio/libtunepimp/Makefile +++ b/audio/libtunepimp/Makefile @@ -7,6 +7,7 @@ PORTNAME= libtunepimp PORTVERSION= 0.4.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/ \ @@ -15,25 +16,31 @@ MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/ \ MAINTAINER= lauri@kde.org COMMENT= Client library for musicbrainz -LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ - FLAC:${PORTSDIR}/audio/flac \ +LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ + expat:${PORTSDIR}/textproc/expat2 \ mad:${PORTSDIR}/audio/libmad \ + mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \ + musicbrainz:${PORTSDIR}/audio/libmusicbrainz \ ogg:${PORTSDIR}/audio/libogg \ - expat:${PORTSDIR}/textproc/expat2 \ - musicbrainz:${PORTSDIR}/audio/libmusicbrainz + tag:${PORTSDIR}/audio/taglib \ + vorbis:${PORTSDIR}/audio/libvorbis CONFLICTS= trm-0* USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv" + LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes post-patch: @${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \ - s|^CXXFLAGS=|#CXXFLAGS=|g' ${WRKSRC}/configure + s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lthr|${PTHREAD_LIBS}|g' \ ${WRKSRC}/lib/threads/posix/Makefile.in +post-configure: + @${REINPLACE_CMD} -e 's|\(^LDFLAGS =.*\)|\1 ${PTHREAD_LIBS} -liconv|g' \ + ${WRKSRC}/examples/Makefile + .include <bsd.port.mk> diff --git a/audio/libtunepimp/files/patch-configure b/audio/libtunepimp/files/patch-configure new file mode 100644 index 000000000000..babac2c52ba0 --- /dev/null +++ b/audio/libtunepimp/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Mon Apr 10 10:52:03 2006 ++++ configure Mon Apr 10 10:54:14 2006 +@@ -20506,7 +20506,7 @@ + TAGLIB_VERSION=`$TAGLIB_CONFIG --version` + echo "$as_me:$LINENO: checking for taglib >= 1.4.0" >&5 + echo $ECHO_N "checking for taglib >= 1.4.0... $ECHO_C" >&6 +- VERSION_CHECK=`expr $TAGLIB_VERSION \>\= 1.4.0` ++ VERSION_CHECK=`expr $TAGLIB_VERSION \>\= 1.4` + if test "$VERSION_CHECK" = "1" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 diff --git a/audio/libtunepimp/files/patch-lib-metadata.cpp b/audio/libtunepimp/files/patch-lib-metadata.cpp new file mode 100644 index 000000000000..018363898587 --- /dev/null +++ b/audio/libtunepimp/files/patch-lib-metadata.cpp @@ -0,0 +1,17 @@ +--- lib/metadata.cpp.orig Wed Nov 10 17:37:26 2004 ++++ lib/metadata.cpp Wed Sep 14 17:25:59 2005 +@@ -34,6 +34,14 @@ + #include "astrcmp.h" + } + ++#ifndef min ++#define min(a,b) ((a) < (b) ? (a) : (b)) ++#endif ++ ++#ifndef max ++#define max(a,b) ((a) > (b) ? (a) : (b)) ++#endif ++ + const int numAlbumTypeStrings = 11; + const char *albumTypeStrings[] = + { diff --git a/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp b/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp new file mode 100644 index 000000000000..a3a5cabb78e8 --- /dev/null +++ b/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp @@ -0,0 +1,20 @@ +--- lib/utf8/utf8util.cpp.orig Mon Jul 11 05:01:23 2005 ++++ lib/utf8/utf8util.cpp Wed Sep 14 17:19:42 2005 +@@ -38,7 +38,7 @@ + char *dest; + string to; + +- to.clear(); ++ to = ""; + ret = utf8_encode(from.c_str(), &dest); + if (ret >= 0) + { +@@ -54,7 +54,7 @@ + char *dest; + string to; + +- to.clear(); ++ to = ""; + ret = utf8_decode(from.c_str(), &dest); + if (ret >= 0) + { diff --git a/audio/libtunepimp/files/patch-plugins-flac-flac.cpp b/audio/libtunepimp/files/patch-plugins-flac-flac.cpp new file mode 100644 index 000000000000..5d590d59034b --- /dev/null +++ b/audio/libtunepimp/files/patch-plugins-flac-flac.cpp @@ -0,0 +1,13 @@ +--- plugins/flac/flac.cpp.orig Tue Jun 28 13:03:06 2005 ++++ plugins/flac/flac.cpp Wed Sep 14 17:35:23 2005 +@@ -33,7 +33,10 @@ + #ifdef WIN32 + #include <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif + diff --git a/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp b/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp new file mode 100644 index 000000000000..8b8e8fd87acd --- /dev/null +++ b/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp @@ -0,0 +1,13 @@ +--- plugins/mp3/mp3.cpp.orig Tue Jul 12 06:44:06 2005 ++++ plugins/mp3/mp3.cpp Wed Sep 14 17:32:42 2005 +@@ -33,7 +33,10 @@ + #ifdef WIN32 + #include <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif + diff --git a/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp b/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp new file mode 100644 index 000000000000..2ab8c472b45e --- /dev/null +++ b/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp @@ -0,0 +1,13 @@ +--- plugins/vorbis/vorbis.cpp.orig Tue Jun 28 13:03:06 2005 ++++ plugins/vorbis/vorbis.cpp Wed Sep 14 17:34:12 2005 +@@ -33,7 +33,10 @@ + #ifdef WIN32 + #include <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif + diff --git a/audio/libtunepimp/files/patch-plugins-wav-wav.cpp b/audio/libtunepimp/files/patch-plugins-wav-wav.cpp new file mode 100644 index 000000000000..34bf7b46d4c3 --- /dev/null +++ b/audio/libtunepimp/files/patch-plugins-wav-wav.cpp @@ -0,0 +1,13 @@ +--- plugins/wav/wav.cpp.orig Wed Jun 15 06:15:18 2005 ++++ plugins/wav/wav.cpp Wed Sep 14 17:30:30 2005 +@@ -34,7 +34,10 @@ + #ifdef WIN32 + #include <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif +
\ No newline at end of file diff --git a/audio/libtunepimp/pkg-plist b/audio/libtunepimp/pkg-plist index db2a99a68150..dca0bb75b436 100644 --- a/audio/libtunepimp/pkg-plist +++ b/audio/libtunepimp/pkg-plist @@ -14,8 +14,11 @@ lib/libtunepimp.so lib/libtunepimp.so.3 lib/tunepimp/plugins/flac.tpp lib/tunepimp/plugins/mp3.tpp +lib/tunepimp/plugins/mp4.tpp +lib/tunepimp/plugins/mpc.tpp lib/tunepimp/plugins/vorbis.tpp lib/tunepimp/plugins/wav.tpp -@dirrm include/tunepimp +lib/tunepimp/plugins/wma.tpp @dirrm lib/tunepimp/plugins @dirrm lib/tunepimp +@dirrm include/tunepimp |