From c1cd5e271d73277cf63a6733d80366c016b0dfa7 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 5 Jul 2011 00:54:47 +0000
Subject: [PATCH] Disable some modules that are better handled by
 gstreamer-ffmpeg.

from Brad
---
 multimedia/gstreamer-0.10/plugins-bad/Makefile     | 14 +++++++-------
 .../gstreamer-0.10/plugins-bad/pkg/PLIST-main      |  8 +-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/multimedia/gstreamer-0.10/plugins-bad/Makefile b/multimedia/gstreamer-0.10/plugins-bad/Makefile
index c61796eaa32..f82be35466e 100644
--- a/multimedia/gstreamer-0.10/plugins-bad/Makefile
+++ b/multimedia/gstreamer-0.10/plugins-bad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2011/07/01 22:25:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.58 2011/07/05 00:54:47 ajacoutot Exp $
 
 COMMENT-main =		bad elements for GStreamer
 COMMENT-neon =		neon element for GStreamer (plugins-bad)
@@ -11,7 +11,7 @@ PKGNAME-main =		gstreamer-plugins-bad-${V}
 PKGNAME-neon =		gstreamer-neon-${V}
 PKGNAME-mjpeg =		gstreamer-mjpeg-${V}
 
-REVISION-main =		1
+REVISION-main =		2
 
 MULTI_PACKAGES =	-main -neon -mjpeg
 
@@ -37,19 +37,17 @@ BUILD_DEPENDS +=        audio/ladspa
 WANTLIB-main += ${WANTLIB}
 WANTLIB-main += BPM GL SDL SoundTouch X11 Xau Xdamage Xdmcp Xext Xfixes
 WANTLIB-main += Xrender Xxf86vm ass bz2 cairo cdaudio croco-0.6 crypto
-WANTLIB-main += curl dca drm dvdnav dvdread enca expat faac faad fontconfig
+WANTLIB-main += curl dca drm dvdnav dvdread enca expat fontconfig
 WANTLIB-main += freetype gdk_pixbuf-2.0 gio-2.0 gsm gstaudio-0.10 gstbase-0.10
 WANTLIB-main += gstcontroller-0.10 gstinterfaces-0.10 gstpbutils-0.10
 WANTLIB-main += gstriff-0.10 gstrtp-0.10 gstsdp-0.10 gsttag-0.10 gstvideo-0.10
 WANTLIB-main += idn jasper lrdf mms mpcdec orc-0.4 pango-1.0 pangocairo-1.0
 WANTLIB-main += pangoft2-1.0 pixman-1 png pthread-stubs raptor rsvg-2
 WANTLIB-main += schroedinger-1.0 sndfile sndio ssl stdc++ usbhid vpx
-WANTLIB-main += xcb xcb-render xcb-shm xslt xvidcore
+WANTLIB-main += xcb xcb-render xcb-shm xslt
 
 LIB_DEPENDS-main =	${LIB_DEPENDS} \
 			${P}/plugins-base \
-			audio/faac \
-			audio/faad \
 			audio/gsm \
 			audio/libcdaudio \
 			audio/libdca \
@@ -63,7 +61,6 @@ LIB_DEPENDS-main =	${LIB_DEPENDS} \
 			multimedia/libmms \
 			multimedia/libvpx \
 			multimedia/schroedinger>=1.0.10 \
-			multimedia/xvidcore \
 			x11/gnome/librsvg \
 			multimedia/libdvdnav>=4.1.3p0v0 \
 			textproc/liblrdf
@@ -96,6 +93,8 @@ CONFIGURE_ARGS =	--disable-acm \
 			--disable-divx \
 			--disable-dvb \
 			--disable-dvdspu \
+			--disable-faac \
+			--disable-faad \
 			--disable-fbdev \
 			--disable-gme \
 			--disable-kate \
@@ -115,6 +114,7 @@ CONFIGURE_ARGS =	--disable-acm \
 			--disable-vdpau \
 			--disable-wildmidi \
 			--disable-wininet \
+			--disable-xvid \
 			--disable-zbar
 
 # XXX subpackage?
diff --git a/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main b/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main
index 2ef51f4686e..c8d1d69c4ba 100644
--- a/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main
+++ b/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.19 2011/07/01 22:25:58 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.20 2011/07/05 00:54:47 ajacoutot Exp $
 @conflict gstreamer-plugins-base-<0.10.25
 @conflict gstreamer-bz2-*
 @conflict gstreamer-faac-*
@@ -74,10 +74,6 @@ lib/gstreamer-${VERSION}/libgstdtmf.so
 lib/gstreamer-${VERSION}/libgstdtsdec.so
 @comment lib/gstreamer-${VERSION}/libgstdvbsuboverlay.la
 lib/gstreamer-${VERSION}/libgstdvbsuboverlay.so
-@comment lib/gstreamer-${VERSION}/libgstfaac.la
-lib/gstreamer-${VERSION}/libgstfaac.so
-@comment lib/gstreamer-${VERSION}/libgstfaad.la
-lib/gstreamer-${VERSION}/libgstfaad.so
 @comment lib/gstreamer-${VERSION}/libgstfestival.la
 lib/gstreamer-${VERSION}/libgstfestival.so
 @comment lib/gstreamer-${VERSION}/libgstfieldanalysis.la
@@ -200,8 +196,6 @@ lib/gstreamer-${VERSION}/libgstvideosignal.so
 lib/gstreamer-${VERSION}/libgstvmnc.so
 @comment lib/gstreamer-${VERSION}/libgstvp8.la
 lib/gstreamer-${VERSION}/libgstvp8.so
-@comment lib/gstreamer-${VERSION}/libgstxvid.la
-lib/gstreamer-${VERSION}/libgstxvid.so
 @comment lib/gstreamer-${VERSION}/libgsty4mdec.la
 lib/gstreamer-${VERSION}/libgsty4mdec.so
 @comment lib/gstreamer-${VERSION}/libresindvd.la