3 files changed, 16 insertions, 6 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 1b1d412329c9..edc351c24e2c 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
 		${MASTER_SITE_LOCAL:S|$|ahze/:good|} \
 		${MASTER_SITE_LOCAL:S|$|ahze/:bad|} \
 		${MASTER_SITE_LOCAL:S|$|ahze/:ugly|}
-PKGNAMESUFFIX=	-plugins${GST_PLUGIN_SUFFIX}
+PKGNAMESUFFIX?=	-plugins${GST_PLUGIN_SUFFIX}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	GStreamer written collection of plugins handling several media types
@@ -37,7 +37,7 @@ BASE_DISTFILE=		${BASE_DISTNAME}${EXTRACT_SUFX}
 BAD_PORTVERSION=	0.10.18
 BAD_DISTNAME=		gst-plugins-bad-${BAD_PORTVERSION}
 BAD_DISTFILE=		${BAD_DISTNAME}${EXTRACT_SUFX}
-GOOD_PORTVERSION=	0.10.17
+GOOD_PORTVERSION=	0.10.21
 GOOD_DISTNAME=		gst-plugins-good-${GOOD_PORTVERSION}
 GOOD_DISTFILE=		${GOOD_DISTNAME}${EXTRACT_SUFX}
 UGLY_PORTVERSION=	0.10.14
@@ -151,6 +151,7 @@ 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|libpng14.pc|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index adff6907f72c..6d11723f7e86 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -80,6 +80,7 @@ GOOD_GST_ALL_PLUGINS+= \
 		soup \
 		speex \
 		taglib \
+		gst_v4l2 \
 		wavpack
 
 # ugly
@@ -131,7 +132,6 @@ CONFIGURE_ARGS+=--disable-tests \
 		--disable-osx_video \
 		--disable-directdrawsink \
 		--disable-directsoundsink \
-		--disable-v4l2src \
 		--disable-tarkin \
 		--enable-static \
 		--disable-sunaudio \
@@ -456,6 +456,15 @@ gst_theora_PLIST_FILES=		${GST_LIB_DIR}/libgsttheora.la \
 		${GST_LIB_DIR}/libgsttheora.so
 gst_theora_DIST=	base
 
+# gst_v4l2
+gst_gst_v4l2_LIB_DEPENDS+=	v4l2.0:${PORTSDIR}/multimedia/libv4l
+gst_gst_v4l2_RUN_DEPENDS+=	webcamd:${PORTSDIR}/multimedia/webcamd
+gst_gst_v4l2_PLIST_FILES=	${GST_LIB_DIR}/libgstvideo4linux2.la \
+		${GST_LIB_DIR}/libgstvideo4linux2.so
+gst_gst_v4l2_CONFIGURE_ARGS+=	--enable-gst_v4l2
+gst_gst_v4l2_GST_PLUGIN_DIR=sys/v4l2
+gst_gst_v4l2_DIST=	good
+
 # vorbis
 gst_vorbis_USE_GSTREAMER+=	ogg
 gst_vorbis_LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 23f5da5f497a..cfc9dcb87e98 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -7,6 +7,6 @@ SIZE (gst-plugins-bad-0.10.18.tar.bz2) = 3028412
 MD5 (gst-plugins-ugly-0.10.14.tar.bz2) = 0bc0d27bcce88c73ef6c81e88624e686
 SHA256 (gst-plugins-ugly-0.10.14.tar.bz2) = 78dba9963e130cfd09f294b60219e6562459c5d848bc3b38a653db7f21fc850b
 SIZE (gst-plugins-ugly-0.10.14.tar.bz2) = 1028518
-MD5 (gst-plugins-good-0.10.17.tar.bz2) = 833546cd2b8bbf86b8ed083b00897918
-SHA256 (gst-plugins-good-0.10.17.tar.bz2) = 4f41fbd325270416c9f55d900e470482a7d1e7efbdbb725ed03a085dec307ad6
-SIZE (gst-plugins-good-0.10.17.tar.bz2) = 2671700
+MD5 (gst-plugins-good-0.10.21.tar.bz2) = 9bc5c9b390edbb96bda42fc553eae5ae
+SHA256 (gst-plugins-good-0.10.21.tar.bz2) = 24445a1cf56302ab4ad5f56055d5c3d81c704b8f9f6875fe78a25d4f72716d22
+SIZE (gst-plugins-good-0.10.21.tar.bz2) = 2675836