Update gstreamer ports.

Gstreamer to 0.10.36.
Gstreamer-plugins(-base) to 0.10.36.
Gstreamer-plugins-bad to 0.10.23.
Gstreamer-plugins-good to 0.10.31.
Gstreamer-plugins-ugly to 0.10.19.

Add hack to unbreak the flite plugin.

21 files changed, 86 insertions, 84 deletions

diff --git a/multimedia/gstreamer-plugins-all/Makefile b/multimedia/gstreamer-plugins-all/Makefile
index 9f171f37b7af..d6c504c6bcc9 100644
--- a/multimedia/gstreamer-plugins-all/Makefile
+++ b/multimedia/gstreamer-plugins-all/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gstreamer-plugins-all
 PORTVERSION=	1.3.${GST_VERSION}.${GST_SHLIB_VERSION}
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -40,7 +40,6 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NVDPAU} # Needs to be build agains running kernel
 .if ${ARCH} != "i386"
 PORT_OPTIONS:=	${PORT_OPTIONS:NSPC} # i386 only
 .endif
-PORT_OPTIONS:=	${PORT_OPTIONS:NFLITE} # broken
 
 .for f in ${OPTIONS_DEFINE}
 .if ${PORT_OPTIONS:M${f:U}}
diff --git a/multimedia/gstreamer-plugins-bad/files/patch-ext_mpeg2enc_gstmpeg2encoder.cc b/multimedia/gstreamer-plugins-bad/files/patch-ext_mpeg2enc_gstmpeg2encoder.cc
deleted file mode 100644
index 5b42f5d829d5..000000000000
--- a/multimedia/gstreamer-plugins-bad/files/patch-ext_mpeg2enc_gstmpeg2encoder.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./ext/mpeg2enc/gstmpeg2encoder.cc.orig	2011-06-07 12:41:52.230187424 +0200
-+++ ./ext/mpeg2enc/gstmpeg2encoder.cc	2011-06-07 12:42:40.731015830 +0200
-@@ -27,9 +27,8 @@
- #include <mpegconsts.h>
- #include <quantize.hh>
- #if GST_MJPEGTOOLS_API >= 10900
--#include <ontheflyratectl.hh>
--#include <pass1ratectl.hh>
--#include <pass2ratectl.hh>
-+#include <ontheflyratectlpass1.hh>
-+#include <ontheflyratectlpass2.hh>
- #else
- #include <ratectl.hh>
- #endif
diff --git a/multimedia/gstreamer-plugins-bad/pkg-plist b/multimedia/gstreamer-plugins-bad/pkg-plist
index feb0ee37f1ef..d80518bcbe9a 100644
--- a/multimedia/gstreamer-plugins-bad/pkg-plist
+++ b/multimedia/gstreamer-plugins-bad/pkg-plist
@@ -1,9 +1,20 @@
+include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstbasecamerasrc.h
+include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabin-enum.h
+include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabinpreview.h
+include/gstreamer-%%VERSION%%/gst/codecparsers/gsth264parser.h
+include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpeg4parser.h
+include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpegvideoparser.h
+include/gstreamer-%%VERSION%%/gst/codecparsers/gstvc1parser.h
 include/gstreamer-%%VERSION%%/gst/interfaces/photography-enumtypes.h
 include/gstreamer-%%VERSION%%/gst/interfaces/photography.h
 include/gstreamer-%%VERSION%%/gst/signalprocessor/gstsignalprocessor.h
 include/gstreamer-%%VERSION%%/gst/video/gstbasevideocodec.h
 include/gstreamer-%%VERSION%%/gst/video/gstbasevideodecoder.h
 include/gstreamer-%%VERSION%%/gst/video/gstbasevideoencoder.h
+include/gstreamer-%%VERSION%%/gst/video/gstbasevideoutils.h
+include/gstreamer-%%VERSION%%/gst/video/gstsurfacebuffer.h
+include/gstreamer-%%VERSION%%/gst/video/gstsurfaceconverter.h
+include/gstreamer-%%VERSION%%/gst/video/videocontext.h
 lib/gstreamer-%%VERSION%%/libgstadpcmdec.la
 lib/gstreamer-%%VERSION%%/libgstadpcmdec.so
 lib/gstreamer-%%VERSION%%/libgstadpcmenc.la
@@ -14,10 +25,14 @@ lib/gstreamer-%%VERSION%%/libgstasfmux.la
 lib/gstreamer-%%VERSION%%/libgstasfmux.so
 lib/gstreamer-%%VERSION%%/libgstautoconvert.la
 lib/gstreamer-%%VERSION%%/libgstautoconvert.so
+lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.la
+lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.so
 lib/gstreamer-%%VERSION%%/libgstbayer.la
 lib/gstreamer-%%VERSION%%/libgstbayer.so
 lib/gstreamer-%%VERSION%%/libgstcamerabin.la
 lib/gstreamer-%%VERSION%%/libgstcamerabin.so
+lib/gstreamer-%%VERSION%%/libgstcamerabin2.la
+lib/gstreamer-%%VERSION%%/libgstcamerabin2.so
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.la
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
 lib/gstreamer-%%VERSION%%/libgstcoloreffects.la
@@ -38,12 +53,16 @@ lib/gstreamer-%%VERSION%%/libgstdvdspu.la
 lib/gstreamer-%%VERSION%%/libgstdvdspu.so
 lib/gstreamer-%%VERSION%%/libgstdvbsuboverlay.la
 lib/gstreamer-%%VERSION%%/libgstdvbsuboverlay.so
+lib/gstreamer-%%VERSION%%/libgstfaceoverlay.la
+lib/gstreamer-%%VERSION%%/libgstfaceoverlay.so
 lib/gstreamer-%%VERSION%%/libgstfestival.la
 lib/gstreamer-%%VERSION%%/libgstfestival.so
 lib/gstreamer-%%VERSION%%/libgstfieldanalysis.la
 lib/gstreamer-%%VERSION%%/libgstfieldanalysis.so
 lib/gstreamer-%%VERSION%%/libgstfragmented.la
 lib/gstreamer-%%VERSION%%/libgstfragmented.so
+lib/gstreamer-%%VERSION%%/libgstfreeverb.la
+lib/gstreamer-%%VERSION%%/libgstfreeverb.so
 lib/gstreamer-%%VERSION%%/libgstfreeze.la
 lib/gstreamer-%%VERSION%%/libgstfreeze.so
 lib/gstreamer-%%VERSION%%/libgstfrei0r.la
@@ -58,8 +77,8 @@ lib/gstreamer-%%VERSION%%/libgsthdvparse.la
 lib/gstreamer-%%VERSION%%/libgsthdvparse.so
 lib/gstreamer-%%VERSION%%/libgstid3tag.la
 lib/gstreamer-%%VERSION%%/libgstid3tag.so
-lib/gstreamer-%%VERSION%%/libgstinvtelecine.la
-lib/gstreamer-%%VERSION%%/libgstinvtelecine.so
+lib/gstreamer-%%VERSION%%/libgstinter.la
+lib/gstreamer-%%VERSION%%/libgstinter.so
 lib/gstreamer-%%VERSION%%/libgstinterlace.la
 lib/gstreamer-%%VERSION%%/libgstinterlace.so
 lib/gstreamer-%%VERSION%%/libgstivfparse.la
@@ -72,8 +91,6 @@ lib/gstreamer-%%VERSION%%/libgstlegacyresample.la
 lib/gstreamer-%%VERSION%%/libgstlegacyresample.so
 lib/gstreamer-%%VERSION%%/libgstliveadder.la
 lib/gstreamer-%%VERSION%%/libgstliveadder.so
-lib/gstreamer-%%VERSION%%/libgstmpeg4videoparse.la
-lib/gstreamer-%%VERSION%%/libgstmpeg4videoparse.so
 lib/gstreamer-%%VERSION%%/libgstmpegdemux.la
 lib/gstreamer-%%VERSION%%/libgstmpegdemux.so
 lib/gstreamer-%%VERSION%%/libgstmpegpsmux.la
@@ -102,6 +119,8 @@ lib/gstreamer-%%VERSION%%/libgstpnm.so
 %%I386%%lib/gstreamer-%%VERSION%%/libgstreal.so
 lib/gstreamer-%%VERSION%%/libgstrawparse.la
 lib/gstreamer-%%VERSION%%/libgstrawparse.so
+lib/gstreamer-%%VERSION%%/libgstremovesilence.la
+lib/gstreamer-%%VERSION%%/libgstremovesilence.so
 lib/gstreamer-%%VERSION%%/libgstrfbsrc.la
 lib/gstreamer-%%VERSION%%/libgstrfbsrc.so
 lib/gstreamer-%%VERSION%%/libgstrtpmux.la
@@ -120,6 +139,8 @@ lib/gstreamer-%%VERSION%%/libgstshm.la
 lib/gstreamer-%%VERSION%%/libgstshm.so
 lib/gstreamer-%%VERSION%%/libgstsiren.la
 lib/gstreamer-%%VERSION%%/libgstsiren.so
+lib/gstreamer-%%VERSION%%/libgstsmooth.la
+lib/gstreamer-%%VERSION%%/libgstsmooth.so
 lib/gstreamer-%%VERSION%%/libgstspeed.la
 lib/gstreamer-%%VERSION%%/libgstspeed.so
 lib/gstreamer-%%VERSION%%/libgststereo.la
@@ -142,10 +163,18 @@ lib/gstreamer-%%VERSION%%/libgstvmnc.la
 lib/gstreamer-%%VERSION%%/libgstvmnc.so
 lib/gstreamer-%%VERSION%%/libgsty4mdec.la
 lib/gstreamer-%%VERSION%%/libgsty4mdec.so
+lib/libgstbasecamerabinsrc-%%VERSION%%.a
+lib/libgstbasecamerabinsrc-%%VERSION%%.la
+lib/libgstbasecamerabinsrc-%%VERSION%%.so
+lib/libgstbasecamerabinsrc-%%VERSION%%.so.0
 lib/libgstbasevideo-%%VERSION%%.a
 lib/libgstbasevideo-%%VERSION%%.la
 lib/libgstbasevideo-%%VERSION%%.so
 lib/libgstbasevideo-%%VERSION%%.so.0
+lib/libgstcodecparsers-%%VERSION%%.a
+lib/libgstcodecparsers-%%VERSION%%.la
+lib/libgstcodecparsers-%%VERSION%%.so
+lib/libgstcodecparsers-%%VERSION%%.so.0
 lib/libgstphotography-%%VERSION%%.a
 lib/libgstphotography-%%VERSION%%.la
 lib/libgstphotography-%%VERSION%%.so
@@ -163,6 +192,7 @@ share/locale/da/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/eo/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
@@ -195,3 +225,5 @@ share/locale/zh_CN/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry include/gstreamer-%%VERSION%%/gst/signalprocessor
+@dirrmtry include/gstreamer-%%VERSION%%/gst/codecparsers
+@dirrmtry include/gstreamer-%%VERSION%%/gst/basecamerabinsrc
diff --git a/multimedia/gstreamer-plugins-dvd/Makefile b/multimedia/gstreamer-plugins-dvd/Makefile
index e0b55e58d4ed..6683a5373e97 100644
--- a/multimedia/gstreamer-plugins-dvd/Makefile
+++ b/multimedia/gstreamer-plugins-dvd/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/multimedia/gstreamer-plugins-dvd/Makefile,v 1.7 2008/03/19 14:05:36 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer dvd plugin set
diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist
index a4abec0e467f..eb6c24c4dc67 100644
--- a/multimedia/gstreamer-plugins-good/pkg-plist
+++ b/multimedia/gstreamer-plugins-good/pkg-plist
@@ -105,6 +105,7 @@ share/locale/da/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/eo/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
diff --git a/multimedia/gstreamer-plugins-mpeg2enc/Makefile b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
index 3333a6d274ba..ec0488758256 100644
--- a/multimedia/gstreamer-plugins-mpeg2enc/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/multimedia/gstreamer-plugins-mpeg2enc/Makefile,v 1.5 2008/03/19 14:05:37 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer mpeg encoder plugin
diff --git a/multimedia/gstreamer-plugins-resindvd/Makefile b/multimedia/gstreamer-plugins-resindvd/Makefile
index 2105affe4a53..75002309020d 100644
--- a/multimedia/gstreamer-plugins-resindvd/Makefile
+++ b/multimedia/gstreamer-plugins-resindvd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer resindvd plugin
diff --git a/multimedia/gstreamer-plugins-schroedinger/Makefile b/multimedia/gstreamer-plugins-schroedinger/Makefile
index e9c471c12668..92b2d534a61e 100644
--- a/multimedia/gstreamer-plugins-schroedinger/Makefile
+++ b/multimedia/gstreamer-plugins-schroedinger/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer Dirac high-speed codec plugin
diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile
index bf883e8c1f67..8f2db5579f80 100644
--- a/multimedia/gstreamer-plugins-ugly/Makefile
+++ b/multimedia/gstreamer-plugins-ugly/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.13 2008/03/19 14:05:37 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Ugly gstreamer-plugins
diff --git a/multimedia/gstreamer-plugins-ugly/pkg-plist b/multimedia/gstreamer-plugins-ugly/pkg-plist
index ad9c5a415952..ce0100400876 100644
--- a/multimedia/gstreamer-plugins-ugly/pkg-plist
+++ b/multimedia/gstreamer-plugins-ugly/pkg-plist
@@ -21,6 +21,7 @@ share/locale/da/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/eo/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
diff --git a/multimedia/gstreamer-plugins-vp8/Makefile b/multimedia/gstreamer-plugins-vp8/Makefile
index 10aee304c5a9..4e55b5aa4e15 100644
--- a/multimedia/gstreamer-plugins-vp8/Makefile
+++ b/multimedia/gstreamer-plugins-vp8/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer vp8 codec plugin
diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile
index dcb316cba5c9..9c355de0326d 100644
--- a/multimedia/gstreamer-plugins-x264/Makefile
+++ b/multimedia/gstreamer-plugins-x264/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $
 #
 
-PORTREVISION=	5
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer x264 plugin
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index c17317b424d7..b0dafa5a6da7 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION?=	${BASE_PORTVERSION}
-PORTREVISION?=	1
+PORTREVISION?=	0
 PORTEPOCH=	3
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
@@ -21,23 +21,23 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	GStreamer written collection of plugins handling several media types
 
 BUILD_DEPENDS+=	v4l_compat>=1.0.20110720:${PORTSDIR}/multimedia/v4l_compat \
-		gstreamer>=0.10.34:${PORTSDIR}/multimedia/gstreamer \
+		gstreamer>=0.10.36:${PORTSDIR}/multimedia/gstreamer \
 		orc>=0.4.14:${PORTSDIR}/devel/orc
 LIB_DEPENDS+=	gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \
 		orc-0.4.0:${PORTSDIR}/devel/orc
 
 CFLAGS:=	${CFLAGS} -O2 -Wno-format
 
-BASE_PORTVERSION=	0.10.35
+BASE_PORTVERSION=	0.10.36
 BASE_DISTNAME=		gst-plugins-base-${BASE_PORTVERSION}
 BASE_DISTFILE=		${BASE_DISTNAME}${EXTRACT_SUFX}
-BAD_PORTVERSION=	0.10.22
+BAD_PORTVERSION=	0.10.23
 BAD_DISTNAME=		gst-plugins-bad-${BAD_PORTVERSION}
 BAD_DISTFILE=		${BAD_DISTNAME}${EXTRACT_SUFX}
-GOOD_PORTVERSION=	0.10.30
+GOOD_PORTVERSION=	0.10.31
 GOOD_DISTNAME=		gst-plugins-good-${GOOD_PORTVERSION}
 GOOD_DISTFILE=		${GOOD_DISTNAME}${EXTRACT_SUFX}
-UGLY_PORTVERSION=	0.10.18
+UGLY_PORTVERSION=	0.10.19
 UGLY_DISTNAME=		gst-plugins-ugly-${UGLY_PORTVERSION}
 UGLY_DISTFILE=		${UGLY_DISTNAME}${EXTRACT_SUFX}
 DIST?=		good
@@ -127,11 +127,12 @@ DEFAULT_DVD_DEVICE=/dev/acd0
 
 post-patch:
 .if ${DIST}=="bad"
-	@${REINPLACE_CMD} -e 's|opencv <= 2.2.0|opencv <= 2.3.9|g' \
-	${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|opencv <= 2.2.0|opencv <= 2.3.99|g' \
+	-e 's|GST_LIBVERSION=23:0:0|GST_LIBVERSION=0:0:0|g' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \
-	${WRKSRC}/ext/resindvd/resindvdbin.c \
-	${WRKSRC}/ext/resindvd/resindvdsrc.c
+		${WRKSRC}/ext/resindvd/resindvdbin.c \
+		${WRKSRC}/ext/resindvd/resindvdsrc.c
 .endif
 	@${FIND} ${WRKSRC}/ext -name Makefile.in | \
 	${XARGS} -n 10 ${REINPLACE_CMD} -e \
@@ -157,8 +158,12 @@ post-patch:
 	  s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
 	@${REINPLACE_CMD} -e 's|DEFAULT_AUDIOSINK="alsasink"|DEFAULT_AUDIOSINK="${DEFAULT_AUDIOSINK}"|; \
 		s|DEFAULT_AUDIOSRC="alsasrc"|DEFAULT_AUDIOSRC="${DEFAULT_AUDIOSRC}"|' \
-		-e 's|libpng12.pc|libpng15.pc|g' \
         	-e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
+.if ${GST_PLUGIN} == "flite"
+# Hack to get all the libraries linked to the flite plugin so it is useable.
+	-@${REINPLACE_CMD} -e 's|-Wl,--as-needed||g' \
+		${WRKSRC}/../gnome-libtool
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 80907686ad6b..4f872ab2ce74 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -184,7 +184,7 @@ gst_amrnb_LIB_DEPENDS+=	opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
 gst_amrnb_PLIST_FILES=	${GST_LIB_DIR}/libgstamrnb.la \
 			${GST_LIB_DIR}/libgstamrnb.so \
 			share/gstreamer-${VERSION}/presets/GstAmrnbEnc.prs
-gst_amrnb_PLIST_DIRS=	share/gstreamer-${VERSION}/presets \
+gst_amrnb_PLIST_DIRSTRY=share/gstreamer-${VERSION}/presets \
 			share/gstreamer-${VERSION}
 gst_amrnb_DIST=		ugly
 
@@ -433,7 +433,6 @@ gst_ogg_DIST=	base
 # opencv
 gst_opencv_LIB_DEPENDS+=opencv_highgui.2:${PORTSDIR}/graphics/opencv
 gst_opencv_PLIST_FILES= ${GST_LIB_DIR}/libgstopencv.la \
-			${GST_LIB_DIR}/libgstopencv.a \
 			${GST_LIB_DIR}/libgstopencv.so
 gst_opencv_DIST=	bad
 
@@ -575,7 +574,6 @@ gst_vorbis_DIST=	base
 # vp8
 gst_vp8_LIB_DEPENDS+=	vpx.1:${PORTSDIR}/multimedia/libvpx
 gst_vp8_PLIST_FILES=	${GST_LIB_DIR}/libgstvp8.la \
-			${GST_LIB_DIR}/libgstvp8.a \
 			${GST_LIB_DIR}/libgstvp8.so
 gst_vp8_DIST=		bad
 
@@ -584,7 +582,7 @@ gst_x264_LIB_DEPENDS+=	x264.123:${PORTSDIR}/multimedia/x264
 gst_x264_PLIST_FILES=	${GST_LIB_DIR}/libgstx264.la \
 		${GST_LIB_DIR}/libgstx264.so \
 		share/gstreamer-${VERSION}/presets/GstX264Enc.prs
-gst_x264_PLIST_DIRS=	share/gstreamer-${VERSION}/presets \
+gst_x264_PLIST_DIRSTRY=	share/gstreamer-${VERSION}/presets \
 			share/gstreamer-${VERSION}
 gst_x264_DIST=	ugly
 
@@ -628,6 +626,7 @@ LIB_DEPENDS+=	${gst_${GST_PLUGIN}_LIB_DEPENDS}
 RUN_DEPENDS+=	${gst_${GST_PLUGIN}_RUN_DEPENDS}
 PLIST_FILES=	${gst_${GST_PLUGIN}_PLIST_FILES}
 PLIST_DIRS=	${gst_${GST_PLUGIN}_PLIST_DIRS}
+PLIST_DIRSTRY=	${gst_${GST_PLUGIN}_PLIST_DIRSTRY}
 EXTRA_LIBS+=	${gst_${GST_PLUGIN}_EXTRA_LIBS}
 USE_GNOME+=	${gst_${GST_PLUGIN}_USE_GNOME}
 CONFIGURE_ENV+=	${gst_${GST_PLUGIN}_CONFIGURE_ENV}
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index a011b038e387..c293ab2469e5 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,8 +1,8 @@
-SHA256 (gst-plugins-base-0.10.35.tar.bz2) = cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
-SIZE (gst-plugins-base-0.10.35.tar.bz2) = 2782902
-SHA256 (gst-plugins-bad-0.10.22.tar.bz2) = d8f7102f43ffea076646427115ffdccb3975954f1e9367bd304f7ee01e12070c
-SIZE (gst-plugins-bad-0.10.22.tar.bz2) = 3539722
-SHA256 (gst-plugins-ugly-0.10.18.tar.bz2) = f9c16748cd9269fae86422d8254a579fa6db073797a5a19a9dc5c72cd66c8e14
-SIZE (gst-plugins-ugly-0.10.18.tar.bz2) = 1070222
-SHA256 (gst-plugins-good-0.10.30.tar.bz2) = b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6
-SIZE (gst-plugins-good-0.10.30.tar.bz2) = 3361361
+SHA256 (gst-plugins-base-0.10.36.tar.bz2) = 2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976
+SIZE (gst-plugins-base-0.10.36.tar.bz2) = 3036143
+SHA256 (gst-plugins-bad-0.10.23.tar.bz2) = 0eae7d1a1357ae8377fded6a1b42e663887beabe0e6cc336e2ef9ada42e11491
+SIZE (gst-plugins-bad-0.10.23.tar.bz2) = 4001543
+SHA256 (gst-plugins-ugly-0.10.19.tar.bz2) = 1ca90059275c0f5dca71d4d1601a8f429b7852baed0723e820703b977e2c8df0
+SIZE (gst-plugins-ugly-0.10.19.tar.bz2) = 1083623
+SHA256 (gst-plugins-good-0.10.31.tar.bz2) = 7e27840e40a7932ef2dc032d7201f9f41afcaf0b437daf5d1d44dc96d9e35ac6
+SIZE (gst-plugins-good-0.10.31.tar.bz2) = 3390378
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_pango_Makefile.in b/multimedia/gstreamer-plugins/files/patch-ext_pango_Makefile.in
deleted file mode 100644
index cec86b2009aa..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext_pango_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/pango/Makefile.in.orig	2008-07-26 06:39:00.827210159 -0700
-+++ ext/pango/Makefile.in	2008-07-26 06:57:02.595333482 -0700
-@@ -86,7 +86,7 @@
- pluginLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(plugin_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--libgstpango_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
-+libgstpango_la_DEPENDENCIES = \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- am_libgstpango_la_OBJECTS = libgstpango_la-gstclockoverlay.lo \
-@@ -481,7 +481,7 @@
- 
- libgstpango_la_LIBADD = \
- 	$(GST_PLUGINS_BASE_LIBS) \
--	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
-+	-lgstvideo-$(GST_MAJORMINOR) \
- 	$(GST_BASE_LIBS) \
- 	$(GST_LIBS) \
- 	$(PANGO_LIBS)
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index 3197bf83a480..f1b098961ab1 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -6,6 +6,9 @@ include/gstreamer-%%VERSION%%/gst/app/gstappsrc.h
 include/gstreamer-%%VERSION%%/gst/audio/audio.h
 include/gstreamer-%%VERSION%%/gst/audio/audio-enumtypes.h
 include/gstreamer-%%VERSION%%/gst/audio/gstaudioclock.h
+include/gstreamer-%%VERSION%%/gst/audio/gstaudiodecoder.h
+include/gstreamer-%%VERSION%%/gst/audio/gstaudioencoder.h
+include/gstreamer-%%VERSION%%/gst/audio/gstaudioiec61937.h
 include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h
 include/gstreamer-%%VERSION%%/gst/audio/gstaudiosink.h
 include/gstreamer-%%VERSION%%/gst/audio/gstaudiosrc.h
@@ -67,12 +70,14 @@ include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspurl.h
 include/gstreamer-%%VERSION%%/gst/sdp/gstsdp.h
 include/gstreamer-%%VERSION%%/gst/sdp/gstsdpmessage.h
 include/gstreamer-%%VERSION%%/gst/tag/gsttagdemux.h
+include/gstreamer-%%VERSION%%/gst/tag/gsttagmux.h
 include/gstreamer-%%VERSION%%/gst/tag/tag.h
 include/gstreamer-%%VERSION%%/gst/tag/xmpwriter.h
 include/gstreamer-%%VERSION%%/gst/video/gstvideofilter.h
 include/gstreamer-%%VERSION%%/gst/video/gstvideosink.h
 include/gstreamer-%%VERSION%%/gst/video/video.h
 include/gstreamer-%%VERSION%%/gst/video/video-enumtypes.h
+include/gstreamer-%%VERSION%%/gst/video/video-overlay-composition.h
 lib/girepository-1.0/GstApp-%%VERSION%%.typelib
 lib/girepository-1.0/GstAudio-%%VERSION%%.typelib
 lib/girepository-1.0/GstFft-%%VERSION%%.typelib
@@ -207,6 +212,7 @@ share/gir-1.0/GstRtsp-%%VERSION%%.gir
 share/gir-1.0/GstSdp-%%VERSION%%.gir
 share/gir-1.0/GstTag-%%VERSION%%.gir
 share/gir-1.0/GstVideo-%%VERSION%%.gir
+share/gst-plugins-base/license-translations.dict
 share/locale/af/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
@@ -216,6 +222,7 @@ share/locale/da/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/eo/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
@@ -243,6 +250,7 @@ share/locale/uk/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+@dirrm share/gst-plugins-base
 @dirrm include/gstreamer-%%VERSION%%/gst/video
 @dirrm include/gstreamer-%%VERSION%%/gst/tag
 @dirrm include/gstreamer-%%VERSION%%/gst/sdp
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index dcac257de455..c82ae321e4e0 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.10.35
+PORTVERSION=	0.10.36
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gstreamer/
 
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index b04ad2ade70c..b49668c5420c 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gstreamer-0.10.35.tar.bz2) = 817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786
-SIZE (gstreamer-0.10.35.tar.bz2) = 3606254
+SHA256 (gstreamer-0.10.36.tar.bz2) = e556a529e0a8cf1cd0afd0cab2af5488c9524e7c3f409de29b5d82bb41ae7a30
+SIZE (gstreamer-0.10.36.tar.bz2) = 3655705
diff --git a/multimedia/gstreamer/files/patch-gst_gstregistry.c b/multimedia/gstreamer/files/patch-gst_gstregistry.c
deleted file mode 100644
index 5a80c72cfa63..000000000000
--- a/multimedia/gstreamer/files/patch-gst_gstregistry.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gst/gstregistry.c.orig	2010-01-20 02:48:56.000000000 +0100
-+++ gst/gstregistry.c	2010-02-11 10:46:09.000000000 +0100
-@@ -1163,7 +1163,7 @@ gst_registry_scan_path_level (GstRegistr
-             G_GINT64_FORMAT " != %" G_GINT64_FORMAT " or external dependency "
-             "env_vars changed: %d or external dependencies changed: %d"
-             " or old path %s != new path %s",
--            plugin->file_mtime, file_status.st_mtime,
-+            (glong) plugin->file_mtime, (glong) file_status.st_mtime,
-             (gint64) plugin->file_size, (gint64) file_status.st_size,
-             env_vars_changed, deps_changed, plugin->filename, filename);
-         gst_registry_remove_plugin (context->registry, plugin);
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index 10691affcdd3..50bd60265d69 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -19,6 +19,7 @@ include/gstreamer-%%VERSION%%/gst/base/gstbitreader.h
 include/gstreamer-%%VERSION%%/gst/base/gstbytereader.h
 include/gstreamer-%%VERSION%%/gst/base/gstbytewriter.h
 include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h
+include/gstreamer-%%VERSION%%/gst/base/gstcollectpads2.h
 include/gstreamer-%%VERSION%%/gst/base/gstdataqueue.h
 include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h
 include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h
@@ -150,6 +151,7 @@ share/locale/da/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+share/locale/eo/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/gstreamer-%%VERSION%%.mo