- Update gstreamer-plugins to 0.10.7

- Update bad to 0.10.3
- Update good to 0.10.3
- Readd dvd and dts plugins

11 files changed, 120 insertions, 22 deletions

diff --git a/MOVED b/MOVED
index 69fc3f5e5030..a5891fc28dec 100644
--- a/MOVED
+++ b/MOVED
@@ -2264,8 +2264,6 @@ audio/gstreamer-plugins-audiofile|audio/gstreamer-plugins-audiofile80|2006-04-29
 audio/gstreamer-plugins-cdaudio|audio/gstreamer-plugins-cdaudio80|2006-04-29|Not part of gstreamer 0.10 yet
 sysutils/gstreamer-plugins-cdio|sysutils/gstreamer-plugins-cdio80|2006-04-29|Not part of gstreamer 0.10 yet
 multimedia/gstreamer-plugins-dirac|multimedia/gstreamer-plugins-dirac80|2006-04-29|Not part of gstreamer 0.10 yet
-multimedia/gstreamer-plugins-dts|multimedia/gstreamer-plugins-dts80|2006-04-29|Not part of gstreamer 0.10 yet
-multimedia/gstreamer-plugins-dvd|multimedia/gstreamer-plugins-dvd80|2006-04-29|Not part of gstreamer 0.10 yet
 graphics/gstreamer-plugins-gdkpixbuf|graphics/gstreamer-plugins-gdkpixbuf80|2006-04-29|Not part of gstreamer 0.10 yet
 graphics/gstreamer-plugins-hermes|graphics/gstreamer-plugins-hermes80|2006-04-29|Not part of gstreamer 0.10 yet
 audio/gstreamer-plugins-jack|audio/gstreamer-plugins-jack80|2006-04-29|Not part of gstreamer 0.10 yet
@@ -2274,7 +2272,6 @@ graphics/gstreamer-plugins-libmng|graphics/gstreamer-plugins-libmng80|2006-04-29
 audio/gstreamer-plugins-mikmod|audio/gstreamer-plugins-mikmod80|2006-04-29|Not part of gstreamer 0.10 yet
 multimedia/gstreamer-plugins-mpeg2enc|multimedia/gstreamer-plugins-mpeg2enc80|2006-04-29|Not part of gstreamer 0.10 yet
 multimedia/gstreamer-plugins-mplex|multimedia/gstreamer-plugins-mplex80|2006-04-29|Not part of gstreamer 0.10 yet
-audio/gstreamer-plugins-musicbrainz|audio/gstreamer-plugins-musicbrainz80|2006-04-29|Not part of gstreamer 0.10 yet
 audio/gstreamer-plugins-nas|audio/gstreamer-plugins-nas80|2006-04-29|Not part of gstreamer 0.10 yet
 audio/gstreamer-plugins-polypaudio|audio/gstreamer-plugins-polypaudio80|2006-04-29|Not part of gstreamer 0.10 yet
 audio/gstreamer-plugins-shout|audio/gstreamer-plugins-shout80|2006-04-29|Not part of gstreamer 0.10 yet
diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index fc0e018ad402..42ac474d23dc 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -60,8 +60,8 @@ GST80_SHLIB_VERSION=	1
 #
 # These are the current supported gstreamer-plugins modules
 #
-_USE_GSTREAMER_ALL=	a52dec aalib bad cairo cdparanoia \
-			dv esound faac faad ffmpeg flac gconf gnomevfs \
+_USE_GSTREAMER_ALL=	a52dec aalib bad cairo cdparanoia dts \
+			dv dvd esound faac faad ffmpeg flac gconf gnomevfs \
 			gnonlin good gsm ivorbis jpeg ladspa lame libcaca \
 			libmms libpng libvisual mad mpeg2dec \
 			musepack ogg pango sdl shout2 sidplay \
@@ -184,8 +184,6 @@ bad_DEPENDS=	multimedia/gstreamer-plugins-bad
 
 dirac_DEPENDS=	multimedia/gstreamer-plugins-dirac
 
-dts_DEPENDS=	multimedia/gstreamer-plugins-dts
-
 ffmpeg_DEPENDS=	multimedia/gstreamer-ffmpeg
 ffmpeg_GST80_SUFX=	80
 ffmpeg_GST80_PREFIX=	gstreamer-
@@ -194,6 +192,8 @@ ffmpeg_GST_SUFX=	# empty
 ffmpeg_GST80_VERSION=	0.8.7
 ffmpeg_GST_VERSION=	0.10.0
 
+dts_DEPENDS=	multimedia/gstreamer-plugins-dts
+
 dv_DEPENDS=	multimedia/gstreamer-plugins-dv
 
 dvd_DEPENDS=	multimedia/gstreamer-plugins-dvd
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 42745924dceb..e7a0364b522a 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -54,9 +54,11 @@
     SUBDIR += gstreamer-plugins-core
     SUBDIR += gstreamer-plugins-core80
     SUBDIR += gstreamer-plugins-dirac80
+    SUBDIR += gstreamer-plugins-dts
     SUBDIR += gstreamer-plugins-dts80
     SUBDIR += gstreamer-plugins-dv
     SUBDIR += gstreamer-plugins-dv80
+    SUBDIR += gstreamer-plugins-dvd
     SUBDIR += gstreamer-plugins-dvd80
     SUBDIR += gstreamer-plugins-gnonlin
     SUBDIR += gstreamer-plugins-good
diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile
index 9f97c5248d87..e97bfb21f917 100644
--- a/multimedia/gstreamer-plugins-bad/Makefile
+++ b/multimedia/gstreamer-plugins-bad/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.2 2006/02/26 19:23:20 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Bad gstreamer-plugins
diff --git a/multimedia/gstreamer-plugins-bad/pkg-plist b/multimedia/gstreamer-plugins-bad/pkg-plist
index fa5451b07306..4bc24eaf08f4 100644
--- a/multimedia/gstreamer-plugins-bad/pkg-plist
+++ b/multimedia/gstreamer-plugins-bad/pkg-plist
@@ -7,6 +7,9 @@ lib/gstreamer-%%VERSION%%/libgstfreeze.so
 lib/gstreamer-%%VERSION%%/libgstglimagesink.a
 lib/gstreamer-%%VERSION%%/libgstglimagesink.la
 lib/gstreamer-%%VERSION%%/libgstglimagesink.so
+lib/gstreamer-%%VERSION%%/libgstmodplug.a
+lib/gstreamer-%%VERSION%%/libgstmodplug.la
+lib/gstreamer-%%VERSION%%/libgstmodplug.so
 lib/gstreamer-%%VERSION%%/libgstqtdemux.a
 lib/gstreamer-%%VERSION%%/libgstqtdemux.la
 lib/gstreamer-%%VERSION%%/libgstqtdemux.so
@@ -16,3 +19,6 @@ lib/gstreamer-%%VERSION%%/libgstspeed.so
 lib/gstreamer-%%VERSION%%/libgsttta.a
 lib/gstreamer-%%VERSION%%/libgsttta.la
 lib/gstreamer-%%VERSION%%/libgsttta.so
+lib/gstreamer-%%VERSION%%/libgstxingheader.a
+lib/gstreamer-%%VERSION%%/libgstxingheader.la
+lib/gstreamer-%%VERSION%%/libgstxingheader.so
diff --git a/multimedia/gstreamer-plugins-dts/Makefile b/multimedia/gstreamer-plugins-dts/Makefile
new file mode 100644
index 000000000000..eb7769682393
--- /dev/null
+++ b/multimedia/gstreamer-plugins-dts/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	gstreamer-plugins-dts
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+CATEGORIES=	multimedia
+PORTREVISION=	0
+
+COMMENT=	Gstreamer dts plugin
+
+GST_PLUGIN=	dts
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dvd/Makefile b/multimedia/gstreamer-plugins-dvd/Makefile
new file mode 100644
index 000000000000..80a64ab86dfd
--- /dev/null
+++ b/multimedia/gstreamer-plugins-dvd/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	gstreamer-plugins-dvd
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+CATEGORIES=	multimedia
+PORTREVISION=	0
+
+COMMENT=	Gstreamer dvd plugin set
+
+GST_PLUGIN=	dvd
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist
index 6565484ea7ca..88a6c9279e36 100644
--- a/multimedia/gstreamer-plugins-good/pkg-plist
+++ b/multimedia/gstreamer-plugins-good/pkg-plist
@@ -34,6 +34,9 @@ lib/gstreamer-%%VERSION%%/libgstflxdec.so
 lib/gstreamer-%%VERSION%%/libgstgoom.a
 lib/gstreamer-%%VERSION%%/libgstgoom.la
 lib/gstreamer-%%VERSION%%/libgstgoom.so
+lib/gstreamer-%%VERSION%%/libgsticydemux.a
+lib/gstreamer-%%VERSION%%/libgsticydemux.la
+lib/gstreamer-%%VERSION%%/libgsticydemux.so
 lib/gstreamer-%%VERSION%%/libgstid3demux.a
 lib/gstreamer-%%VERSION%%/libgstid3demux.la
 lib/gstreamer-%%VERSION%%/libgstid3demux.so
@@ -67,6 +70,9 @@ lib/gstreamer-%%VERSION%%/libgstsmpte.so
 lib/gstreamer-%%VERSION%%/libgstudp.a
 lib/gstreamer-%%VERSION%%/libgstudp.la
 lib/gstreamer-%%VERSION%%/libgstudp.so
+lib/gstreamer-%%VERSION%%/libgstvideobalance.a
+lib/gstreamer-%%VERSION%%/libgstvideobalance.la
+lib/gstreamer-%%VERSION%%/libgstvideobalance.so
 lib/gstreamer-%%VERSION%%/libgstvideobox.a
 lib/gstreamer-%%VERSION%%/libgstvideobox.la
 lib/gstreamer-%%VERSION%%/libgstvideobox.so
@@ -82,3 +88,6 @@ lib/gstreamer-%%VERSION%%/libgstwavenc.so
 lib/gstreamer-%%VERSION%%/libgstwavparse.a
 lib/gstreamer-%%VERSION%%/libgstwavparse.la
 lib/gstreamer-%%VERSION%%/libgstwavparse.so
+lib/gstreamer-%%VERSION%%/libgstximagesrc.a
+lib/gstreamer-%%VERSION%%/libgstximagesrc.la
+lib/gstreamer-%%VERSION%%/libgstximagesrc.so
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 12267c76cbaa..2a72155e4972 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -7,9 +7,8 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION?=	0.10.6
+PORTVERSION?=	0.10.7
 ## SET BACK TO PORTREVISION?= when we reset PORTREVISION in all the gst plugin ports
-PORTREVISION?=	1
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GNOME:S|$|sources/gst-plugins-base/0.10/:base|} \
 		http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
@@ -42,10 +41,10 @@ LIB_DEPENDS+=	gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \
 BASE_PORTVERSION=	${PORTVERSION}
 BASE_DISTNAME=		gst-plugins-base-${BASE_PORTVERSION}
 BASE_DISTFILE=		${BASE_DISTNAME}${EXTRACT_SUFX}
-BAD_PORTVERSION=	0.10.1
+BAD_PORTVERSION=	0.10.3
 BAD_DISTNAME=		gst-plugins-bad-${BAD_PORTVERSION}
 BAD_DISTFILE=		${BAD_DISTNAME}${EXTRACT_SUFX}
-GOOD_PORTVERSION=	0.10.2
+GOOD_PORTVERSION=	0.10.3
 GOOD_DISTNAME=		gst-plugins-good-${GOOD_PORTVERSION}
 GOOD_DISTFILE=		${GOOD_DISTNAME}${EXTRACT_SUFX}
 UGLY_PORTVERSION=	0.10.3
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 35bae5d6e2ac..1e91dd5c51ed 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -12,34 +12,52 @@ BASE_GST_ALL_PLUGINS= \
 		vorbis
 # bad
 BAD_GST_ALL_PLUGINS+= \
+		amrwb \
+		bz2 \
 		directfb \
+		divx \
+		dts \
 		faac \
 		faad \
 		gsm \
 		ivorbis \
 		libmms \
 		musepack \
+		musicbrainz \
+		neon \
 		sdl \
+		soundtouch \
+		swfdec \
+		xvid \
 		wavpack
+#		throra
+
 # good
 GOOD_GST_ALL_PLUGINS+= \
 		aalib \
+		annodex \
 		cairo \
+		cdio \
 		dv \
 		esd \
 		flac \
 		gconf \
+		gdk_pixbuf \
+		hal \
 		jpeg \
 		ladspa \
 		libcaca \
 		libpng \
 		raw1394 \
 		shout2 \
-		speex
+		speex \
+		taglib
 # Ugly
 UGLY_GST_ALL_PLUGINS+= \
 		a52dec \
 		amrnb \
+		dvdnav \
+		dvdread \
 		lame \
 		mad \
 		mpeg2dec \
@@ -139,11 +157,35 @@ EXTRA_LIBS+=	-lgstcdda-${VERSION}
 DIST=	base
 .endif
 
+# dts
+.if ${GST_PLUGIN}=="dts"
+LIB_DEPENDS+=   dv.4:${PORTSDIR}/multimedia/libdv
+PLIST_FILES=	${GST_LIB_DIR}/libgstdtsdec.a \
+		${GST_LIB_DIR}/libgstdtsdec.la \
+		${GST_LIB_DIR}/libgstdtsdec.so
+DIST=	bad
+.endif
+
 # dv
 .if ${GST_PLUGIN}=="dv"
 LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
 .endif
 
+.if ${GST_PLUGIN}=="dvd"
+EXTRA_LIBS+=	-ldvdnav
+LIB_DEPENDS+=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
+GST_PLUGIN_DIR=	ext/dvdnav \
+		ext/dvdread
+PLIST_FILES=	${GST_LIB_DIR}/libgstdvdnav.a \
+		${GST_LIB_DIR}/libgstdvdnav.la \
+		${GST_LIB_DIR}/libgstdvdnav.so \
+		${GST_LIB_DIR}/libgstdvdread.a \
+		${GST_LIB_DIR}/libgstdvdread.la \
+		${GST_LIB_DIR}/libgstdvdread.so
+DIST=	ugly
+.endif
+
+
 # esound
 .if ${GST_PLUGIN}=="esound"
 USE_GNOME+=	esound
@@ -272,6 +314,15 @@ LIB_DEPENDS+=	mpcdec.4:${PORTSDIR}/audio/libmpcdec
 DIST=	bad
 .endif
 
+# musicbrainz
+.if ${GST_PLUGIN}=="musicbrainz"
+LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
+PLIST_FILES=	${GST_LIB_DIR}/libgsttrm.so \
+		${GST_LIB_DIR}/libgsttrm.a \
+		${GST_LIB_DIR}/libgsttrm.la
+DIST=	bad
+.endif
+
 # ogg
 .if ${GST_PLUGIN}=="ogg"
 LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index c68496ac3c46..1a3636281772 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,12 +1,12 @@
-MD5 (gnome2/gst-plugins-base-0.10.6.tar.bz2) = d8069d1026896d1379072b520de20ebc
-SHA256 (gnome2/gst-plugins-base-0.10.6.tar.bz2) = 0ef1b8cbe6d7e898d0636342479de46a780f720033c1b4f7217c903aac6d80ad
-SIZE (gnome2/gst-plugins-base-0.10.6.tar.bz2) = 1195072
-MD5 (gnome2/gst-plugins-bad-0.10.1.tar.bz2) = 398729b82b911eebb14156c2fa02525b
-SHA256 (gnome2/gst-plugins-bad-0.10.1.tar.bz2) = 05d83a609aaea44ea8c979897f336cb8b5537a39b271af2831e6cca3851d3007
-SIZE (gnome2/gst-plugins-bad-0.10.1.tar.bz2) = 652144
-MD5 (gnome2/gst-plugins-good-0.10.2.tar.bz2) = 03d3d0b5f19014fe0065234a3ea65ee6
-SHA256 (gnome2/gst-plugins-good-0.10.2.tar.bz2) = dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81
-SIZE (gnome2/gst-plugins-good-0.10.2.tar.bz2) = 963026
+MD5 (gnome2/gst-plugins-base-0.10.7.tar.bz2) = 21ec9c7ac4b02de019a6d8e8c2aaa2a3
+SHA256 (gnome2/gst-plugins-base-0.10.7.tar.bz2) = 7be5984162333dae48d8f7e58e6c7f4b43726c78e2ca13aca6618b1342af8d37
+SIZE (gnome2/gst-plugins-base-0.10.7.tar.bz2) = 1166071
+MD5 (gnome2/gst-plugins-bad-0.10.3.tar.bz2) = 8545a02c408976c5e9f0c2cf3c6a362e
+SHA256 (gnome2/gst-plugins-bad-0.10.3.tar.bz2) = 648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
+SIZE (gnome2/gst-plugins-bad-0.10.3.tar.bz2) = 953949
+MD5 (gnome2/gst-plugins-good-0.10.3.tar.bz2) = a58bb825bd4b22412764f2a8d2f98b1c
+SHA256 (gnome2/gst-plugins-good-0.10.3.tar.bz2) = 8c09374656aca4b8ffbe109a24dcdb98c5d519c4b05bf9eeeb3a34f16b26eaf5
+SIZE (gnome2/gst-plugins-good-0.10.3.tar.bz2) = 1165391
 MD5 (gnome2/gst-plugins-ugly-0.10.3.tar.bz2) = af6f238507b0040bf84fcbc6a241e559
 SHA256 (gnome2/gst-plugins-ugly-0.10.3.tar.bz2) = 0cd916b3f0c8867cea77243d20d8d56ed45b7ef5ec5c5dd1603860ece8e88a10
 SIZE (gnome2/gst-plugins-ugly-0.10.3.tar.bz2) = 605833