Sort out the X input and output plugins.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17113 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 21 insertions, 24 deletions

diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index 05622dc90..58e4eaea0 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -6,7 +6,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/Mk/bsd.gstreamer.mk,v 1.51 2012/10/06 16:28:54 kwm Exp $
+#    $MCom: ports/Mk/bsd.gstreamer.mk,v 1.52 2012/10/11 22:26:28 kwm Exp $
 
 .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include)
 
@@ -90,7 +90,7 @@ _GSTREAMER_PLUGINS+=annodex cairo esound ffmpeg fluendo-mp3 gconf hal mm python
 
 # plugins only in 1.0
 .if defined(USE_GSTREAMER1)
-_GSTREAMER_PLUGINS+=celt mad spandsp vpx x zbar
+_GSTREAMER_PLUGINS+=celt mad spandsp vpx x ximagesrc zbar
 .endif
 
 # other plugins
@@ -321,6 +321,8 @@ cdio_DEPENDS=	sysutils/gstreamer-plugins-cdio
 
 x_DEPENDS=	x11/gstreamer1-plugins-x
 
+ximagesrc_DEPENDS=	x11/gstreamer1-plugins-ximagesrc
+
 #-- x11-toolkits plugins section ---------------------------------------------#
 
 pango_DEPENDS=	x11-toolkits/gstreamer-plugins-pango
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
index 0011bd59b..975ef778f 100644
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#    $MCom: ports/multimedia/gstreamer1-plugins/Makefile.common,v 1.3 2012/10/06 16:28:55 kwm Exp $
+#    $MCom: ports/multimedia/gstreamer1-plugins/Makefile.common,v 1.4 2012/10/11 22:26:28 kwm Exp $
 
 # XXX configure checks for bad
 
@@ -164,7 +164,6 @@ GOOD_GST_ALL_PLUGINS+= \
 		vpx \
 		wavpack \
 		x
-#		ximagesrc
 #		cairo \
 
 GOOD_GST_NON_PLUGINS=	\
@@ -177,10 +176,8 @@ GOOD_GST_NON_PLUGINS=	\
 		--disable-osx_video \
 		--disable-sunaudio \
 		--disable-waveform \
-		--disable-x \
 		--enable-zlib
 
-
 # ugly
 UGLY_GST_ALL_PLUGINS+= \
 		a52dec \
@@ -263,9 +260,6 @@ CONFIGURE_ARGS+=	--enable-${GST_PLUGIN}
 #		--disable-sunaudio \
 #		--disable-wildmidi \
 #		--disable-xine \
-#		--enable-x \
-#		--enable-xshm \
-#		--enable-xvideo
 
 .if !defined(NO_GSTREAMER_COMMON)
 GST_PLUGIN_SUFFIX?=	-${GST_PLUGIN}
@@ -600,20 +594,24 @@ gst_vorbis_PLIST_FILES=		${GST_LIB_DIR}/libgstvorbis.la \
 gst_vpx_LIB_DEPENDS+=	vpx:${PORTSDIR}/multimedia/libvpx
 
 # X
-gst_x_USE_XORG+=	x11 xv xext
-# xxx videoproto xextproto, xshm?
+.if ${DIST} == base
+gst_x_USE_XORG=		x11 xv xext
 gst_x_CONFIGURE_ARGS+=	--enable-xvideo --enable-xshm
 gst_x_GST_PLUGIN_DIR=	sys/ximage sys/xvimage
 gst_x_PLIST_FILES=	${GST_LIB_DIR}/libgstximagesink.la \
 			${GST_LIB_DIR}/libgstximagesink.so \
 			${GST_LIB_DIR}/libgstxvimagesink.la \
 			${GST_LIB_DIR}/libgstxvimagesink.so
-# base
+.endif
 
+.if ${DIST} == good
 # Ximagesrc
-#gst_x_GST_PLUGIN_SUFFIX
-# --disable-x --disable-xshm --disable-xvideo ..
-# good
+gst_x_USE_XORG=		x11 xfixes xdamage xext
+gst_x_CONFIGURE_ARGS+=	--enable-x
+gst_x_GST_PLUGIN_DIR=	sys/ximage
+gst_x_PLIST_FILES=	${GST_LIB_DIR}/libgstximagesrc.la \
+			${GST_LIB_DIR}/libgstximagesrc.so
+.endif
 
 # x264
 gst_x264_LIB_DEPENDS+=	x264:${PORTSDIR}/multimedia/x264
@@ -674,7 +672,7 @@ RUN_DEPENDS+=	${gst_${GST_PLUGIN}_RUN_DEPENDS}
 PLIST_FILES=	${gst_${GST_PLUGIN}_PLIST_FILES}
 PLIST_DIRS=	${gst_${GST_PLUGIN}_PLIST_DIRS}
 EXTRA_LIBS+=	${gst_${GST_PLUGIN}_EXTRA_LIBS}
-USE_XORG+=	${GST_${GST_PLUGIN}_USE_XORG}
+USE_XORG+=	${gst_${GST_PLUGIN}_USE_XORG}
 USE_GNOME+=	${gst_${GST_PLUGIN}_USE_GNOME}
 CONFIGURE_ENV+=	${gst_${GST_PLUGIN}_CONFIGURE_ENV}
 
diff --git a/x11/gstreamer1-plugins-x/Makefile b/x11/gstreamer1-plugins-x/Makefile
index b31eb7563..0f488f995 100644
--- a/x11/gstreamer1-plugins-x/Makefile
+++ b/x11/gstreamer1-plugins-x/Makefile
@@ -1,14 +1,12 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/x11/gstreamer1-plugins-x/Makefile,v 1.1 2012/10/06 09:04:19 kwm Exp $
 
 PORTREVISION=	0
 CATEGORIES=	x11
 
 COMMENT=	Gstreamer X and Xvideo output plugins
 
-BROKEN=		needs more work
-
 GST_PLUGIN=	x
 DIST=		base
 
diff --git a/x11/gstreamer1-plugins-ximagesrc/Makefile b/x11/gstreamer1-plugins-ximagesrc/Makefile
index c19706f3f..4b762b7bb 100644
--- a/x11/gstreamer1-plugins-ximagesrc/Makefile
+++ b/x11/gstreamer1-plugins-ximagesrc/Makefile
@@ -1,15 +1,14 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/x11/gstreamer1-plugins-ximagesrc/Makefile,v 1.1 2012/10/06 09:04:19 kwm Exp $
 
 PORTREVISION=	0
 CATEGORIES=	audio
+PKGNAMESUFFIX=	-ximagesrc
 
-COMMENT=	Gstreamer ximagesrc plugin
+COMMENT=	Gstreamer X source plugin
 
-BROKEN=		needs more work
-
-GST_PLUGIN=	ximagesrc
+GST_PLUGIN=	x
 DIST=		good
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins