Explicitly disable multiple drivers. This fixes the build under Linux,

where OpenGL was not detected properly but was included in the PLIST.
Also avoids the installation of the v4l plugin, which resulted in extra
files in that system.  Bump PKGREVISION to 1.

3 files changed, 26 insertions, 15 deletions

diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile
index 45365e427b9..05673cb58a2 100644
--- a/multimedia/gst-plugins/Makefile
+++ b/multimedia/gst-plugins/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2004/04/15 21:24:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2005/01/13 12:56:31 jmmv Exp $
 #
 
 .include "Makefile.common"
 
+PKGREVISION=		1
+
 COMMENT+=		base plugins
 
 USE_X11=		yes
@@ -19,6 +21,7 @@ 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/}
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/gst-plugins
 
 GCONF2_SCHEMAS=		gstreamer-0.8.schemas
 
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
index 778415d7528..2ee9fe9b5bd 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/01/06 11:25:10 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.14 2005/01/13 12:56:31 jmmv Exp $
 #
 
 DISTNAME=		gst-plugins-0.8.7
@@ -23,11 +23,7 @@ USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 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-docs-build
 CONFIGURE_ARGS+=	--disable-examples
 CONFIGURE_ARGS+=	--disable-tests
 
@@ -38,7 +34,7 @@ CONFIGURE_ARGS+=	--disable-tests
 CONFIGURE_ENV+=		have_func=no
 .endif
 
-# Disable all drivers by default.
+# Disable all drivers and features by default.
 .for driver in	a52dec \
 		aalib \
 		aalibtest \
@@ -47,11 +43,16 @@ CONFIGURE_ENV+=		have_func=no
 		artsc \
 		artstest \
 		audiofile \
+		audioresample \
+		cairo \
+		cdaudio \
 		cdparanoia \
 		cdrom \
 		dirac \
+		directfb \
 		divx \
 		dts \
+		dv1394 \
 		dvdnav \
 		dvdread \
 		dxr3 \
@@ -61,14 +62,17 @@ CONFIGURE_ENV+=		have_func=no
 		faad \
 		flac \
 		freetypetest \
+		gconf \
+		gconftool \
 		gdk_pixbuf \
 		gnome_vfs \
 		gsm \
+		gst_v4l \
+		gst_v4l2 \
 		hermes \
 		ivorbis \
 		jack \
 		jpeg \
-		kio \
 		ladspa \
 		lame \
 		lcs \
@@ -77,7 +81,8 @@ CONFIGURE_ENV+=		have_func=no
 		libfame \
 		libfametest \
 		libmikmodtest \
-		libpng \
+		libmms \
+		libmng \
 		libpng \
 		librfb \
 		libvisual \
@@ -86,13 +91,17 @@ CONFIGURE_ENV+=		have_func=no
 		mpeg2dec \
 		mpeg2enc \
 		mplex \
+		musepack \
 		musicbrainz \
 		nas \
 		ogg \
 		oggtest \
+		opengl \
 		oss \
 		osx_audio \
+		osx_video \
 		pango \
+		polyp \
 		qcam \
 		raw1394 \
 		sdl \
@@ -108,12 +117,12 @@ CONFIGURE_ENV+=		have_func=no
 		swfdec \
 		tarkin \
 		theora \
-		v4l \
-		v4l2 \
 		vcd \
 		vorbis \
 		vorbistest \
-		xvid
+		x \
+		xshm \
+		xvideo
 CONFIGURE_ARGS+=	--disable-${driver}
 .endfor
 .undef driver
diff --git a/multimedia/gst-plugins/PLIST b/multimedia/gst-plugins/PLIST
index 02c1f1bcbe6..22e89106256 100644
--- a/multimedia/gst-plugins/PLIST
+++ b/multimedia/gst-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/01/06 11:25:10 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/01/13 12:56:31 jmmv Exp $
 bin/gst-launch-ext-0.8
 bin/gst-visualise-0.8
 include/gstreamer-0.8/gst/audio/audio.h
@@ -63,7 +63,6 @@ lib/gstreamer-0.8/libgstffmpegcolorspace.la
 lib/gstreamer-0.8/libgstfilter.la
 lib/gstreamer-0.8/libgstflxdec.la
 lib/gstreamer-0.8/libgstgamma.la
-lib/gstreamer-0.8/libgstglimagesink.la
 lib/gstreamer-0.8/libgstgoom.la
 lib/gstreamer-0.8/libgstidct.la
 lib/gstreamer-0.8/libgstinterleave.la