- Add more "default" plugins to core and fix plist on ogg and theora

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

3 files changed, 10 insertions, 13 deletions

diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile
index da9823b6b..344957af2 100644
--- a/multimedia/gstreamer-plugins-core/Makefile
+++ b/multimedia/gstreamer-plugins-core/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.10 2006/01/20 16:25:11 ahze Exp $
 
 PORTNAME=	gstreamer-plugins-core
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -26,7 +27,7 @@ WANT_GSTREAMER=	yes
 .include <bsd.port.pre.mk>
 
 # Audio plugins
-USE_GSTREAMER+=	mad ogg
+USE_GSTREAMER+=	mad ogg vorbis
 
 # Graphics plugins
 USE_GSTREAMER+=	libpng
@@ -35,7 +36,7 @@ USE_GSTREAMER+=	libpng
 USE_GSTREAMER+=	pango
 
 # Multimedia plugins
-USE_GSTREAMER+=	ffmpeg
+USE_GSTREAMER+=	ffmpeg theora
 
 .if !defined(WITHOUT_DVD)
 # Audio plugins
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 89a0eb7c9..285a34eec 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION?=	0.10.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GNOME:S/$/:base/} \
 		http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
@@ -123,6 +123,9 @@ post-patch:
 	${XARGS} -n 10 ${REINPLACE_CMD} -e \
 	's|malloc\.h|stdlib.h|; \
 	 s|stdint\.h|inttypes.h|; \
+	 s|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la||; \
+	 s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la||; \
+	 s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la||; \
 	 s|%%VERSION%%|${VERSION}|'
 #.for f in ${GST_ALL_PLUGINS}
 #	@${REINPLACE_CMD} -e 's|ext/${f}/Makefile||g' \
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index f08d10dc4..ad6b83fe8 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -278,8 +278,7 @@ DIST=	bad
 # ogg
 .if ${GST_PLUGIN}=="ogg"
 LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
-GST_PLUGIN_DIR=	gst-libs/gst/riff \
-		ext/ogg
+EXTRA_LIBS+=	-lgstriff-${VERSION}
 DIST=	base
 .endif
 
@@ -316,13 +315,6 @@ LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
 # theora
 .if ${GST_PLUGIN}=="theora"
 LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
-GST_PLUGIN_DIR=	gst-libs/gst/tag \
-		ext/theora
-PLIST_FILES=	include/gstreamer-0.10/gst/tag/tag.h \
-		${GST_LIB_DIR}/libgsttheora.so \
-		lib/libgsttag-0.10.a \
-		lib/libgsttag-0.10.so \
-		lib/libgsttag-0.10.so.1
 DIST=	base
 .endif
 
@@ -330,6 +322,7 @@ DIST=	base
 .if ${GST_PLUGIN}=="vorbis"
 USE_GSTREAMER+=	ogg
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+EXTRA_LIBS+=	-lgsttag-${VERSION} -lgstaudio-${VERSION}
 DIST=	base
 .endif