Update to 0.8.11.

Add new plugins x264.

Approved by:	maintainer (implicit)

5 files changed, 29 insertions, 36 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index cf13fadf7eb1..5b05867927e8 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.8.10
-PORTREVISION?=	1
+PORTVERSION=	0.8.11
+PORTREVISION?=	0
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://gstreamer.freedesktop.org/src/gst-plugins/
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 5c1403e7583d..4e4ef9a5dfd7 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -75,6 +75,7 @@ GST_ALL_PLUGINS= \
 		vorbis \
 		vorbistest \
 		wavpack \
+		x264 \
 		xvid
 
 # Disable all plugins by default\
@@ -104,14 +105,15 @@ CONFIGURE_ARGS+=--disable-tests \
 		--enable-xshm \
 		--enable-xvideo
 
-.if (${ARCH} == "i386")
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-CONFIGURE_ARGS+=--enable-spc
-PLIST_SUB+=	SPC=""
-.else
+# spc is broken a the moment
+#.if (${ARCH} == "i386")
+#BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+#CONFIGURE_ARGS+=--enable-spc
+#PLIST_SUB+=	SPC=""
+#.else
 CONFIGURE_ARGS+=--disable-spc
 PLIST_SUB+=	SPC="@comment "
-.endif
+#.endif
 
 .if ${GST_PLUGIN}!="base"
 
@@ -463,6 +465,12 @@ LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
 LIB_DEPENDS+=	wavpack.0:${PORTSDIR}/audio/wavpack
 .endif
 
+# x264
+.if ${GST_PLUGIN}=="x264"
+LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
+PLIST_FILES=	${GST_LIB_DIR}/libx264.so
+.endif
+
 # xvid
 .if ${GST_PLUGIN}=="xvid"
 LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 4b35ca59720c..b6dd917ee86c 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gst-plugins-0.8.10.tar.bz2) = 99f36ba2b91015a23d3c20a8f424b232
-SIZE (gnome2/gst-plugins-0.8.10.tar.bz2) = 2397528
+MD5 (gnome2/gst-plugins-0.8.11.tar.bz2) = ea787eeed3761ff03cb60ecebebe1c30
+SIZE (gnome2/gst-plugins-0.8.11.tar.bz2) = 2439654
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c b/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c
index a53b67028709..f3eb910fd77b 100644
--- a/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c
+++ b/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c
@@ -1,5 +1,5 @@
---- ext/cdparanoia/gstcdparanoia.c.orig	Mon Jul 11 14:36:25 2005
-+++ ext/cdparanoia/gstcdparanoia.c	Mon Jul 11 14:38:41 2005
+--- ext/cdparanoia/gstcdparanoia.c.orig	Mon Aug 29 13:50:49 2005
++++ ext/cdparanoia/gstcdparanoia.c	Thu Sep  1 15:30:11 2005
 @@ -562,6 +562,7 @@
      gint16 *cdda_buf;
      gint64 timestamp;
@@ -8,32 +8,15 @@
  
      /* convert the sequence sector number to a timestamp */
      format = GST_FORMAT_TIME;
-@@ -575,7 +576,6 @@
-       gst_pad_convert (src->srcpad, sector_format,
-           get_relative (src, src->cur_track, src->cur_sector), &format,
-           &timestamp);
--      GstEvent *discont_ev;
- 
-       if (src->flush_pending) {
-         src->flush_pending = FALSE;
-@@ -788,9 +788,15 @@
+@@ -572,7 +573,6 @@
  
-   /* fail if the device couldn't be found */
-   if (src->d == NULL) {
-+#if defined(__FreeBSD__)
-     GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
-         (_("Could not open CD device %s for reading."),
--            src->d->cdda_device_name), ("cdda_identify failed"));
-+	     src->d->dev->device_path), ("cdda_identify failed"));
-+#else
-+    GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
-+        (_("Could not open CD device %s for reading."),
-+	     src->d->cdda_device_name), ("cdda_identify failed"));
-+#endif
-     return FALSE;
-   }
+     if (!src->discont_sent && (is_track_switch (src, src->cur_sector) ||
+             (src->prev_sec != src->cur_sector))) {
+-      GstEvent *discont_ev;
  
-@@ -805,9 +811,15 @@
+       if (src->cur_track == src->d->tracks) {
+         GST_DEBUG_OBJECT (src, "End of CD");
+@@ -815,9 +815,15 @@
  
    /* open the disc */
    if (cdda_open (src->d)) {
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index 512299914d5a..ce0f0adbf656 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -56,6 +56,7 @@ lib/gstreamer-%%VERSION%%/libgstdebug.so
 lib/gstreamer-%%VERSION%%/libgstdecodebin.so
 lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
 lib/gstreamer-%%VERSION%%/libgstdvdlpcmdec.so
+lib/gstreamer-%%VERSION%%/libgstdvdsubdec.so
 lib/gstreamer-%%VERSION%%/libgstefence.so
 lib/gstreamer-%%VERSION%%/libgsteffectv.so
 lib/gstreamer-%%VERSION%%/libgstequalizer.so
@@ -68,6 +69,7 @@ lib/gstreamer-%%VERSION%%/libgstgamma.so
 lib/gstreamer-%%VERSION%%/libgstgoom.so
 lib/gstreamer-%%VERSION%%/libgstidct.so
 lib/gstreamer-%%VERSION%%/libgstinterleave.so
+lib/gstreamer-%%VERSION%%/libgstimagemixer.so
 lib/gstreamer-%%VERSION%%/libgstlevel.so
 lib/gstreamer-%%VERSION%%/libgstmatroska.so
 lib/gstreamer-%%VERSION%%/libgstmedian.so