Update to 0.8.7.

Changelog: http://gstreamer.freedesktop.org/releases/gst-plugins/0.8.7.html

remove libkio reinplace stuff, kio plugins is dead.
speex works again with both the stable and devel version.
configure does the right thing for musepack.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3359 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 23 insertions, 78 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 0de9a69ab..5d5045bb3 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.8.6
+PORTVERSION=	0.8.7
+PORTREVISION?=	0
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://gstreamer.freedesktop.org/src/gst-plugins/
@@ -110,27 +111,16 @@ post-patch:
 		${WRKSRC}/sys/cdrom/gstcdplayer_ioctl.c \
 		${WRKSRC}/sys/vcd/vcdsrc.c \
 		${WRKSRC}/sys/vcd/vcdsrc.h
-# KDE libkio required thread support
-	@${REINPLACE_CMD} -E \
-		-e 's|(KIO_CFLAGS=.+)"$$|\1 ${PTHREAD_CFLAGS}"|' \
-		-e 's|(KIO_LIBS=.+)"$$|\1 ${PTHREAD_LIBS}"|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 # mplex fix -- gst configure does not use mjpegtool's config to find include.
 	@${REINPLACE_CMD} -E \
 		-e 's|PFLAGS@|PFLAGS@ -I${LOCALBASE}/include/mjpegtools -I${LOCALBASE}/include/mjpegtools/mplex|' \
 		${WRKSRC}/ext/mplex/Makefile.in
-# speex fix -- speex.h has moved to include/speex/speex.h
-	@${REINPLACE_CMD} -e 's|-I.|-I. -I${LOCALBASE}/include/speex|' \
-		${WRKSRC}/ext/speex/Makefile.in
 .if ${CXXFLAGS:M*=athlon-4} || ${CXXFLAGS:M*=athlon-mp} || ${CXXFLAGS:M*=athlon-xp}
 # Fix gst-register when using -O -march=athlon-xp
 	@${REINPLACE_CMD} -e 's|@CXXF|-fgcse @CXXF|g' \
 		${WRKSRC}/gst/modplug/Makefile.in \
 		${WRKSRC}/gst/modplug/libmodplug/Makefile.in
 .endif
-# tell configure where the musepack includes live
-	@${REINPLACE_CMD} -e 's|/usr/include/musepack|${LOCALBASE}/include/musepack|g' \
-		${WRKSRC}/configure
 
 pre-build:
 # This port cannot be CFLAGS safe, when using p4 optimizations
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 9e53ec335..c40d8b09b 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -7,6 +7,7 @@ GST_ALL_PLUGINS= \
 		artstest \
 		artsc \
 		audiofile \
+		cairo \
 		cdaudio \
 		cdparanoia \
 		dirac \
@@ -34,6 +35,7 @@ GST_ALL_PLUGINS= \
 		libfame \
 		libfametest\
 		libmng \
+		libmms \
 		libpng \
 		librfb \
 		libvisual \
@@ -123,6 +125,11 @@ LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 GST_PLIST_SUFFIX=	sink
 .endif
 
+# cairo
+.if ${GST_PLUGIN}=="cairo"
+LIB_DEPENDS+=	cairo.1:${PORTSDIR}/graphics/cairo
+.endif
+
 # cdparanoia
 .if ${GST_PLUGIN}=="cdparanoia"
 LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
@@ -266,10 +273,15 @@ PLIST_FILES=	${GST_LIB_DIR}/libgstdvdnavsrc.so \
 LIB_DEPENDS+=	fame-0.9.1:${PORTSDIR}/multimedia/libfame
 .endif
 
+# libmms
+.if ${GST_PLUGIN}=="libmng"
+LIB_DEPENDS+=   mms.0:${PORTSDIR}/multimedia/libmms
+.endif
+
 # libmng
 .if ${GST_PLUGIN}=="libmng"
 LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
-PLIST_FILES=    ${GST_LIB_DIR}/libgstmng.so
+#PLIST_FILES=    ${GST_LIB_DIR}/libgstmng.so
 .endif
 
 # mikmod
@@ -413,8 +425,8 @@ do-build:
 		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
 .endfor
 	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gst-register-${GST_VERSION} \
-		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml \
-		>> ${TMPPLIST}"
+		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml" \
+		>> ${TMPPLIST}
 
 
 post-build:
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 1c4d6a648..c52424ac1 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gst-plugins-0.8.6.tar.bz2) = e6b04215e7d928bd2fcce390ab406ffd
-SIZE (gnome2/gst-plugins-0.8.6.tar.bz2) = 2033762
+MD5 (gnome2/gst-plugins-0.8.7.tar.bz2) = 24030f8664b0e6f39bc31616f4953af5
+SIZE (gnome2/gst-plugins-0.8.7.tar.bz2) = 2134878
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_musepack_gstmusepackdec.cpp b/multimedia/gstreamer-plugins/files/patch-ext_musepack_gstmusepackdec.cpp
deleted file mode 100644
index 1b1799ca9..000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext_musepack_gstmusepackdec.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
---- ext/musepack/gstmusepackdec.cpp.orig	Sun Nov  7 19:30:06 2004
-+++ ext/musepack/gstmusepackdec.cpp	Thu Dec 16 16:31:42 2004
-@@ -30,14 +30,24 @@
-     GST_STATIC_CAPS ("audio/x-musepack")
-     );
- 
-+#ifdef MPC_FIXED_POINT
-+#define BASE_CAPS \
-+  "audio/x-raw-int, " \
-+    "signed = (bool) TRUE, " \
-+    "width = (int) 32, " \
-+    "depth = (int) 32"
-+#else
-+#define BASE_CAPS \
-+  "audio/x-raw-float, " \
-+    "width = (int) 32, " \
-+    "buffer-frames = (int) 0"
-+#endif
-+
- static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
-     GST_PAD_SRC,
-     GST_PAD_ALWAYS,
--    GST_STATIC_CAPS ("audio/x-raw-int, "
-+    GST_STATIC_CAPS (BASE_CAPS ", "
-         "endianness = (int) BYTE_ORDER, "
--        "signed = (bool) TRUE, "
--        "width = (int) 32, "
--        "depth = (int) 32, "
-         "rate = (int) [ 8000, 96000 ], "
-         "channels = (int) [ 1, 2 ]")
-     );
-@@ -352,6 +362,7 @@
- gst_musepack_stream_init (GstMusepackDec * musepackdec)
- {
-   StreamInfo si = StreamInfo ();
-+  GstCaps *caps;
- 
-   if (musepackdec->dec)
-     delete musepackdec->dec;
-@@ -379,15 +390,12 @@
-     return FALSE;
-   }
- 
--  if (!gst_pad_set_explicit_caps (musepackdec->srcpad,
--           gst_caps_new_simple ("audio/x-raw-int",
--               "width", G_TYPE_INT, 32,
--               "depth", G_TYPE_INT, 32,
--               "endianness", G_TYPE_INT, G_BYTE_ORDER,
--               "channels", G_TYPE_INT, si.simple.Channels,
--               "rate", G_TYPE_INT, si.simple.SampleFreq,
--               "signed", G_TYPE_BOOLEAN, TRUE,
--               NULL))) {
-+  caps = gst_caps_from_string (BASE_CAPS);
-+  gst_caps_set_simple (caps,
-+      "endianness", G_TYPE_INT, G_BYTE_ORDER,
-+      "channels", G_TYPE_INT, si.simple.Channels,
-+      "rate", G_TYPE_INT, si.simple.SampleFreq, NULL);
-+  if (!gst_pad_set_explicit_caps (musepackdec->srcpad, caps)) {
-     GST_ELEMENT_ERROR (musepackdec, CORE, NEGOTIATION, (NULL), (NULL));
-     delete musepackdec->dec;
-     musepackdec->dec = NULL;
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index ec973cb3b..a8ac681ae 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -2,6 +2,8 @@ bin/gst-launch-ext-%%VERSION%%
 bin/gst-visualise-%%VERSION%%
 include/gstreamer-%%VERSION%%/gst/audio/audio.h
 include/gstreamer-%%VERSION%%/gst/audio/audioclock.h
+include/gstreamer-%%VERSION%%/gst/audio/multichannel-enumtypes.h
+include/gstreamer-%%VERSION%%/gst/audio/multichannel.h
 include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h
 include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-enumtypes.h
 include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance.h
@@ -36,6 +38,7 @@ lib/gstreamer-%%VERSION%%/libgstadder.so
 lib/gstreamer-%%VERSION%%/libgstalaw.so
 lib/gstreamer-%%VERSION%%/libgstalpha.so
 lib/gstreamer-%%VERSION%%/libgstalphacolor.so
+lib/gstreamer-%%VERSION%%/libgstapetag.so	
 lib/gstreamer-%%VERSION%%/libgstasf.so
 lib/gstreamer-%%VERSION%%/libgstaudio.so
 lib/gstreamer-%%VERSION%%/libgstaudioconvert.so
@@ -101,6 +104,7 @@ lib/gstreamer-%%VERSION%%/libgstswitch.so
 lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
 lib/gstreamer-%%VERSION%%/libgsttagedit.so
 lib/gstreamer-%%VERSION%%/libgsttcp.so
+lib/gstreamer-%%VERSION%%/libgsttta.so
 lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so
 lib/gstreamer-%%VERSION%%/libgstudp.so
 lib/gstreamer-%%VERSION%%/libgstvbidec.so