update to 0.10.21

changes:
-shapewipe: moved from -bad to -good
-videmux: push mode seeking support
-jitterbuffer: new buffering modes: low/high watermark buffering,
 rtp timestamps
-matroskademux: subtitle stream improvements
-multipartdemux: improve header mime-type parsing
-v4l2sink: change rank to NONE so we don't try to autoplug it
-misc fixes

5 files changed, 10 insertions, 26 deletions

diff --git a/multimedia/gst-plugins0.10-good/Makefile b/multimedia/gst-plugins0.10-good/Makefile
index 163f16261b5..2ac2210c016 100644
--- a/multimedia/gst-plugins0.10-good/Makefile
+++ b/multimedia/gst-plugins0.10-good/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/09/08 20:22:02 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2010/03/12 20:36:41 drochner Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -8,7 +8,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 COMMENT+=		good plugins
 
 # some plugins were moved from bad to good
-CONFLICTS+=		gst-plugins0.10-bad<0.10.14
+CONFLICTS+=		gst-plugins0.10-bad<0.10.18
 
 CONFIGURE_ARGS+=	--enable-gconf
 CONFIGURE_ARGS+=	--enable-gconftool
diff --git a/multimedia/gst-plugins0.10-good/Makefile.common b/multimedia/gst-plugins0.10-good/Makefile.common
index a26df930f57..3377d631911 100644
--- a/multimedia/gst-plugins0.10-good/Makefile.common
+++ b/multimedia/gst-plugins0.10-good/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2010/02/25 17:27:06 reed Exp $
+# $NetBSD: Makefile.common,v 1.25 2010/03/12 20:36:41 drochner Exp $
 #
 # used by audio/gst-plugins0.10-esound/Makefile
 # used by audio/gst-plugins0.10-flac/Makefile
@@ -13,7 +13,7 @@
 # used by net/gst-plugins0.10-soup/Makefile
 
 GST_PLUGINS0.10_TYPE=	good
-GST_PLUGINS0.10_VER=	0.10.18
+GST_PLUGINS0.10_VER=	0.10.21
 
 # Disable all drivers and features by default.
 .for driver in	aalib \
diff --git a/multimedia/gst-plugins0.10-good/PLIST b/multimedia/gst-plugins0.10-good/PLIST
index 55fe8297f27..f1e259667e3 100644
--- a/multimedia/gst-plugins0.10-good/PLIST
+++ b/multimedia/gst-plugins0.10-good/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2010/02/16 13:16:53 drochner Exp $
+@comment $NetBSD: PLIST,v 1.20 2010/03/12 20:36:42 drochner Exp $
 lib/gstreamer-0.10/libgstalaw.la
 lib/gstreamer-0.10/libgstalpha.la
 lib/gstreamer-0.10/libgstalphacolor.la
@@ -34,6 +34,7 @@ lib/gstreamer-0.10/libgstreplaygain.la
 lib/gstreamer-0.10/libgstrtp.la
 lib/gstreamer-0.10/libgstrtpmanager.la
 lib/gstreamer-0.10/libgstrtsp.la
+lib/gstreamer-0.10/libgstshapewipe.la
 lib/gstreamer-0.10/libgstsmpte.la
 lib/gstreamer-0.10/libgstspectrum.la
 lib/gstreamer-0.10/libgstudp.la
diff --git a/multimedia/gst-plugins0.10-good/distinfo b/multimedia/gst-plugins0.10-good/distinfo
index eb2feca6085..d05605025ac 100644
--- a/multimedia/gst-plugins0.10-good/distinfo
+++ b/multimedia/gst-plugins0.10-good/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.26 2010/02/18 07:09:00 obache Exp $
+$NetBSD: distinfo,v 1.27 2010/03/12 20:36:42 drochner Exp $
 
-SHA1 (gst-plugins-good-0.10.18.tar.bz2) = 74a463ed6e300598bd14f3f8915f2765f5420bd5
-RMD160 (gst-plugins-good-0.10.18.tar.bz2) = e93dbf9ece210cb3951fa968cecdaadf826ef81d
-Size (gst-plugins-good-0.10.18.tar.bz2) = 2663870 bytes
+SHA1 (gst-plugins-good-0.10.21.tar.bz2) = ed619824f5ca4592bfe2b2f6df9d53f08bf5f360
+RMD160 (gst-plugins-good-0.10.21.tar.bz2) = 71cfebe965409ffc6d6d3a5b08e3923fc966fffa
+Size (gst-plugins-good-0.10.21.tar.bz2) = 2675836 bytes
 SHA1 (patch-ab) = 2a12779158463e9a33b905beda09bbd39ff4881d
 SHA1 (patch-ac) = 156fcc3c6f14f5a5f92b2f3ebba508477337fc55
 SHA1 (patch-ba) = 0f2cc16c39f8bc2a4854ec928b7c0b60d0559eb5
 SHA1 (patch-bb) = ec781545a7583405a25e8a4dcf689e777f6ac51f
-SHA1 (patch-bc) = 3e13701ee1a462530d936c450b1eda25b0283b07
diff --git a/multimedia/gst-plugins0.10-good/patches/patch-bc b/multimedia/gst-plugins0.10-good/patches/patch-bc
deleted file mode 100644
index 719cc3a9b9e..00000000000
--- a/multimedia/gst-plugins0.10-good/patches/patch-bc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2010/02/18 07:09:01 obache Exp $
-
-fix GST_ELEMENT_ERROR usage
-http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=a45b351ddf48dc876e8e0ee69575480b57ab3e96
-
---- gst/matroska/matroska-demux.c.orig	2010-02-04 17:36:43.000000000 +0000
-+++ gst/matroska/matroska-demux.c
-@@ -2298,7 +2298,7 @@ seek_error:
-   {
-     GST_OBJECT_UNLOCK (demux);
-     GST_PAD_STREAM_UNLOCK (demux->sinkpad);
--    GST_ELEMENT_ERROR (demux, STREAM, DEMUX, NULL, ("Got a seek error"));
-+    GST_ELEMENT_ERROR (demux, STREAM, DEMUX, (NULL), ("Got a seek error"));
-     return FALSE;
-   }
- }