8 files changed, 77 insertions, 32 deletions

diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile
index 3d598ea6edcf..bcd922c86b5c 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.7 2006/09/14 21:25:16 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Bad gstreamer-plugins
diff --git a/multimedia/gstreamer-plugins-bad/files/patch-configure b/multimedia/gstreamer-plugins-bad/files/patch-configure
index 4ea746f00336..16a5ac1151b2 100644
--- a/multimedia/gstreamer-plugins-bad/files/patch-configure
+++ b/multimedia/gstreamer-plugins-bad/files/patch-configure
@@ -1,33 +1,33 @@
---- configure.orig	Wed Sep 13 08:11:45 2006
-+++ configure	Wed Sep 13 08:12:32 2006
-@@ -30382,9 +30382,9 @@
+--- configure.orig	Thu Dec 21 10:11:48 2006
++++ configure	Fri Dec 22 16:51:50 2006
+@@ -37333,9 +37333,9 @@
  
    HAVE_FAAD="yes"
  
--  echo "$as_me:$LINENO: checking for faacDecOpen in -lfaad" >&5
--echo $ECHO_N "checking for faacDecOpen in -lfaad... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for faacDecOpen in -lfaad" >&5
+-echo $ECHO_N "checking for faacDecOpen in -lfaad... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_faad_faacDecOpen+set}" = set; then
-+  echo "$as_me:$LINENO: checking for NeAACDecOpen in -lfaad" >&5
-+echo $ECHO_N "checking for NeAACDecOpen in -lfaad... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for NeAACDecOpen in -lfaad" >&5
++echo $ECHO_N "checking for NeAACDecOpen in -lfaad... $ECHO_C" >&6; }
 +if test "${ac_cv_lib_faad_NeAACDecOpen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -30402,11 +30402,11 @@
+@@ -37353,11 +37353,11 @@
+ #ifdef __cplusplus
+ extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
 -char faacDecOpen ();
 +char NeAACDecOpen ();
  int
  main ()
  {
--faacDecOpen ();
-+NeAACDecOpen ();
+-return faacDecOpen ();
++return NeAACDecOpen ();
    ;
    return 0;
  }
-@@ -30432,20 +30432,20 @@
+@@ -37396,21 +37396,21 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -37,18 +37,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_cv_lib_faad_faacDecOpen=no
-+ac_cv_lib_faad_NeAACDecOpen=no
+-	ac_cv_lib_faad_faacDecOpen=no
++	ac_cv_lib_faad_NeAACDecOpen=no
  fi
- rm -f conftest.err conftest.$ac_objext \
+ 
+ rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_faad_faacDecOpen" >&5
--echo "${ECHO_T}$ac_cv_lib_faad_faacDecOpen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_faad_faacDecOpen" >&5
+-echo "${ECHO_T}$ac_cv_lib_faad_faacDecOpen" >&6; }
 -if test $ac_cv_lib_faad_faacDecOpen = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_faad_NeAACDecOpen" >&5
-+echo "${ECHO_T}$ac_cv_lib_faad_NeAACDecOpen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_faad_NeAACDecOpen" >&5
++echo "${ECHO_T}$ac_cv_lib_faad_NeAACDecOpen" >&6; }
 +if test $ac_cv_lib_faad_NeAACDecOpen = yes; then
    HAVE_FAAD=yes
  else
diff --git a/multimedia/gstreamer-plugins-bad/pkg-plist b/multimedia/gstreamer-plugins-bad/pkg-plist
index a58856b3130a..c2439ca5b9c2 100644
--- a/multimedia/gstreamer-plugins-bad/pkg-plist
+++ b/multimedia/gstreamer-plugins-bad/pkg-plist
@@ -1,27 +1,63 @@
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.a
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.la
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
+lib/gstreamer-%%VERSION%%/libgstdeinterlace.a
+lib/gstreamer-%%VERSION%%/libgstdeinterlace.la
+lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
+lib/gstreamer-%%VERSION%%/libgstfilter.a
+lib/gstreamer-%%VERSION%%/libgstfilter.la
+lib/gstreamer-%%VERSION%%/libgstfilter.so
 lib/gstreamer-%%VERSION%%/libgstfreeze.a
 lib/gstreamer-%%VERSION%%/libgstfreeze.la
 lib/gstreamer-%%VERSION%%/libgstfreeze.so
 lib/gstreamer-%%VERSION%%/libgstglimagesink.a
 lib/gstreamer-%%VERSION%%/libgstglimagesink.la
 lib/gstreamer-%%VERSION%%/libgstglimagesink.so
+lib/gstreamer-%%VERSION%%/libgsth264parse.a
+lib/gstreamer-%%VERSION%%/libgsth264parse.la
+lib/gstreamer-%%VERSION%%/libgsth264parse.so
 lib/gstreamer-%%VERSION%%/libgstmodplug.a
 lib/gstreamer-%%VERSION%%/libgstmodplug.la
 lib/gstreamer-%%VERSION%%/libgstmodplug.so
+lib/gstreamer-%%VERSION%%/libgstmultifile.a
+lib/gstreamer-%%VERSION%%/libgstmultifile.la
+lib/gstreamer-%%VERSION%%/libgstmultifile.so
+lib/gstreamer-%%VERSION%%/libgstnsf.a
+lib/gstreamer-%%VERSION%%/libgstnsf.la
+lib/gstreamer-%%VERSION%%/libgstnsf.so
+lib/gstreamer-%%VERSION%%/libgstnuvdemux.a
+lib/gstreamer-%%VERSION%%/libgstnuvdemux.la
+lib/gstreamer-%%VERSION%%/libgstnuvdemux.so
 lib/gstreamer-%%VERSION%%/libgstqtdemux.a
 lib/gstreamer-%%VERSION%%/libgstqtdemux.la
 lib/gstreamer-%%VERSION%%/libgstqtdemux.so
+lib/gstreamer-%%VERSION%%/libgstreplaygain.a
+lib/gstreamer-%%VERSION%%/libgstreplaygain.la
+lib/gstreamer-%%VERSION%%/libgstreplaygain.so
+lib/gstreamer-%%VERSION%%/libgstrfbsrc.a
+lib/gstreamer-%%VERSION%%/libgstrfbsrc.la
+lib/gstreamer-%%VERSION%%/libgstrfbsrc.so
+lib/gstreamer-%%VERSION%%/libgstspectrum.a
+lib/gstreamer-%%VERSION%%/libgstspectrum.la
+lib/gstreamer-%%VERSION%%/libgstspectrum.so
 lib/gstreamer-%%VERSION%%/libgstspeed.a
 lib/gstreamer-%%VERSION%%/libgstspeed.la
 lib/gstreamer-%%VERSION%%/libgstspeed.so
 lib/gstreamer-%%VERSION%%/libgsttta.a
 lib/gstreamer-%%VERSION%%/libgsttta.la
 lib/gstreamer-%%VERSION%%/libgsttta.so
+lib/gstreamer-%%VERSION%%/libgstvideocrop.a
+lib/gstreamer-%%VERSION%%/libgstvideocrop.la
+lib/gstreamer-%%VERSION%%/libgstvideocrop.so
+lib/gstreamer-%%VERSION%%/libgstvideoparse.a
+lib/gstreamer-%%VERSION%%/libgstvideoparse.la
+lib/gstreamer-%%VERSION%%/libgstvideoparse.so
 lib/gstreamer-%%VERSION%%/libgstxingheader.a
 lib/gstreamer-%%VERSION%%/libgstxingheader.la
 lib/gstreamer-%%VERSION%%/libgstxingheader.so
+lib/gstreamer-%%VERSION%%/libgsty4menc.a
+lib/gstreamer-%%VERSION%%/libgsty4menc.la
+lib/gstreamer-%%VERSION%%/libgsty4menc.so
 share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile
index 8133176c84ca..5947d34bf29d 100644
--- a/multimedia/gstreamer-plugins-good/Makefile
+++ b/multimedia/gstreamer-plugins-good/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.10 2006/09/14 22:41:06 ahze Exp $
 #
 
-PORTREVISION=	4
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Good gstreamer-plugins
diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist
index 51ed562b3a73..ae51a5fb4eaa 100644
--- a/multimedia/gstreamer-plugins-good/pkg-plist
+++ b/multimedia/gstreamer-plugins-good/pkg-plist
@@ -10,6 +10,9 @@ lib/gstreamer-%%VERSION%%/libgstalphacolor.so
 lib/gstreamer-%%VERSION%%/libgstapetag.a
 lib/gstreamer-%%VERSION%%/libgstapetag.la
 lib/gstreamer-%%VERSION%%/libgstapetag.so
+lib/gstreamer-%%VERSION%%/libgstaudiofx.a
+lib/gstreamer-%%VERSION%%/libgstaudiofx.la
+lib/gstreamer-%%VERSION%%/libgstaudiofx.so
 lib/gstreamer-%%VERSION%%/libgstauparse.a
 lib/gstreamer-%%VERSION%%/libgstauparse.la
 lib/gstreamer-%%VERSION%%/libgstauparse.so
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 7ecfb258696b..02f6b1f591a6 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -32,10 +32,10 @@ LIB_DEPENDS+=	gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \
 BASE_PORTVERSION=	0.10.11
 BASE_DISTNAME=		gst-plugins-base-${BASE_PORTVERSION}
 BASE_DISTFILE=		${BASE_DISTNAME}${EXTRACT_SUFX}
-BAD_PORTVERSION=	0.10.3
+BAD_PORTVERSION=	0.10.4
 BAD_DISTNAME=		gst-plugins-bad-${BAD_PORTVERSION}
 BAD_DISTFILE=		${BAD_DISTNAME}${EXTRACT_SUFX}
-GOOD_PORTVERSION=	0.10.4
+GOOD_PORTVERSION=	0.10.5
 GOOD_DISTNAME=		gst-plugins-good-${GOOD_PORTVERSION}
 GOOD_DISTFILE=		${GOOD_DISTNAME}${EXTRACT_SUFX}
 UGLY_PORTVERSION=	0.10.5
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index daa8480158f1..71e018354261 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -12,8 +12,10 @@ BASE_GST_ALL_PLUGINS= \
 		vorbis
 # bad
 BAD_GST_ALL_PLUGINS+= \
+		alsaspdif \
 		amrwb \
 		bz2 \
+		cdaudio \
 		directfb \
 		divx \
 		dts \
@@ -21,15 +23,18 @@ BAD_GST_ALL_PLUGINS+= \
 		faad \
 		gsm \
 		ivorbis \
+		jack \
 		libmms \
+		mpeg2enc \
 		musepack \
 		musicbrainz \
 		neon \
 		sdl \
 		soundtouch \
+		spc \
 		swfdec \
-		xvid \
-		wavpack
+		wavpack \
+		xvid
 #		throra
 
 # good
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 51eabbb0292c..fb7fc1305bc7 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,12 +1,12 @@
 MD5 (gst-plugins-base-0.10.11.tar.bz2) = 2e78ff25635b31d948def7c2b2d79054
 SHA256 (gst-plugins-base-0.10.11.tar.bz2) = 2193e3f940f0fd2ca10a137efbb79bc1edc8a12543b618b9a97f680f9d15bfb4
 SIZE (gst-plugins-base-0.10.11.tar.bz2) = 1409996
-MD5 (gst-plugins-bad-0.10.3.tar.bz2) = 8545a02c408976c5e9f0c2cf3c6a362e
-SHA256 (gst-plugins-bad-0.10.3.tar.bz2) = 648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
-SIZE (gst-plugins-bad-0.10.3.tar.bz2) = 953949
+MD5 (gst-plugins-bad-0.10.4.tar.bz2) = 2e57395cdf72733477fb328f1fa3f053
+SHA256 (gst-plugins-bad-0.10.4.tar.bz2) = 240b9a25ff116eac6457ea60813291f6c77ff7c167d5bf3ec3d90bbad31da1ce
+SIZE (gst-plugins-bad-0.10.4.tar.bz2) = 1231000
 MD5 (gst-plugins-ugly-0.10.5.tar.bz2) = 2e6bf35ebcb2ab508b43ef3aaee878ad
 SHA256 (gst-plugins-ugly-0.10.5.tar.bz2) = f3ade61e890d2bd2d5b5f1b27dba44b9ac31252f68b1a589ab944f1086c282ae
 SIZE (gst-plugins-ugly-0.10.5.tar.bz2) = 744261
-MD5 (gst-plugins-good-0.10.4.tar.bz2) = e189496e7987898823d28d26b79f63dc
-SHA256 (gst-plugins-good-0.10.4.tar.bz2) = f2b90ef5fb4b2d0b06d5fd8193a7c19b1d08d4f737abeafabf04d39673ea703b
-SIZE (gst-plugins-good-0.10.4.tar.bz2) = 1225739
+MD5 (gst-plugins-good-0.10.5.tar.bz2) = c45fc9ace9feb4d3df32da0a6d262d84
+SHA256 (gst-plugins-good-0.10.5.tar.bz2) = dcf56a49b8fc0db16985bf133d4085d84602a19c15acb79890ac012d7cf9f962
+SIZE (gst-plugins-good-0.10.5.tar.bz2) = 1356388