Enable X11 support by default; unfortunately, it can't be built as an

independent plugin.  (Let's go with the previous revision bump).

3 files changed, 25 insertions, 7 deletions

diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile
index 3bfad9dcefb..500e2aa8218 100644
--- a/multimedia/gst-plugins/Makefile
+++ b/multimedia/gst-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/04/06 09:36:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/06 11:10:06 jmmv Exp $
 #
 
 .include "Makefile.common"
@@ -7,6 +7,8 @@ PKGREVISION=		2
 
 COMMENT+=		base plugins
 
+USE_X11=		yes
+
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-gconf.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-interfaces.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-media-info.pc.in
@@ -16,6 +18,9 @@ PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-plugins.pc.in
 
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-gconf/--enable-gconf/}
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-gconftool/--enable-gconftool/}
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-x/--enable-x/}
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-xshm/--enable-xshm/}
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-xvideo/--enable-xvideo/}
 
 GCONF2_SCHEMAS=		gstreamer-0.8.schemas
 
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
index b059ed08b63..17349606992 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2004/04/06 09:36:28 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/04/06 11:10:06 jmmv Exp $
 #
 
 DISTNAME=		gst-plugins-0.8.0
@@ -24,6 +24,9 @@ USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--disable-gconf
 CONFIGURE_ARGS+=	--disable-gconftool
+CONFIGURE_ARGS+=	--disable-x
+CONFIGURE_ARGS+=	--disable-xshm
+CONFIGURE_ARGS+=	--disable-xvideo
 CONFIGURE_ARGS+=	--disable-examples
 CONFIGURE_ARGS+=	--disable-tests
 
@@ -96,10 +99,7 @@ CONFIGURE_ARGS+=	--disable-tests
 		vcd \
 		vorbis \
 		vorbistest \
-		x \
-		xshm \
-		xvid \
-		xvideo
+		xvid
 CONFIGURE_ARGS+=	--disable-${driver}
 .endfor
 .undef driver
diff --git a/multimedia/gst-plugins/PLIST b/multimedia/gst-plugins/PLIST
index d3df12befd6..04b236fc751 100644
--- a/multimedia/gst-plugins/PLIST
+++ b/multimedia/gst-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/04/06 09:36:28 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/06 11:10:06 jmmv Exp $
 bin/gst-launch-ext-0.8
 bin/gst-visualise-0.8
 include/gstreamer-0.8/gst/audio/audio.h
@@ -29,6 +29,8 @@ include/gstreamer-0.8/gst/tuner/tunerchannel.h
 include/gstreamer-0.8/gst/tuner/tunernorm.h
 include/gstreamer-0.8/gst/video/video.h
 include/gstreamer-0.8/gst/video/videosink.h
+include/gstreamer-0.8/gst/xoverlay/xoverlay.h
+include/gstreamer-0.8/gst/xwindowlistener/xwindowlistener.h
 lib/gstreamer-0.8/libgstac3parse.a
 lib/gstreamer-0.8/libgstac3parse.la
 lib/gstreamer-0.8/libgstac3parse.so
@@ -251,6 +253,15 @@ lib/gstreamer-0.8/libgstwavenc.so
 lib/gstreamer-0.8/libgstwavparse.a
 lib/gstreamer-0.8/libgstwavparse.la
 lib/gstreamer-0.8/libgstwavparse.so
+lib/gstreamer-0.8/libgstximagesink.a
+lib/gstreamer-0.8/libgstximagesink.la
+lib/gstreamer-0.8/libgstximagesink.so
+lib/gstreamer-0.8/libgstxvimagesink.a
+lib/gstreamer-0.8/libgstxvimagesink.la
+lib/gstreamer-0.8/libgstxvimagesink.so
+lib/gstreamer-0.8/libgstxwindowlistener.a
+lib/gstreamer-0.8/libgstxwindowlistener.la
+lib/gstreamer-0.8/libgstxwindowlistener.so
 lib/gstreamer-0.8/libgsty4menc.a
 lib/gstreamer-0.8/libgsty4menc.la
 lib/gstreamer-0.8/libgsty4menc.so
@@ -287,6 +298,8 @@ ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gst-plugins-0.8.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gst-plugins-0.8.mo
 @comment in GConf2: @dirrm share/gconf/schemas
 @comment in gstreamer: @dirrm lib/gstreamer-0.8
+@dirrm include/gstreamer-0.8/gst/xwindowlistener
+@dirrm include/gstreamer-0.8/gst/xoverlay
 @dirrm include/gstreamer-0.8/gst/video
 @dirrm include/gstreamer-0.8/gst/tuner
 @dirrm include/gstreamer-0.8/gst/tag