- Add gstreamer-plugins-good

  gstreamer-plugins-good is the sys and gst dirs
- Readd ffmpeg to USE_GSTREAMER
- Add good to gstreamer-plugins-core

GO GNOME 2.13.5!!


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

6 files changed, 79 insertions, 7 deletions

diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index 5fc505501..6a6c67e35 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -7,7 +7,7 @@
 # Date:		4 Oct 2004
 #
 # $FreeBSD$
-#    $MCom: ports/Mk/bsd.gstreamer.mk,v 1.14 2006/01/20 18:07:42 ahze Exp $
+#    $MCom: ports/Mk/bsd.gstreamer.mk,v 1.15 2006/01/20 18:46:33 ahze Exp $
 
 .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include)
 
@@ -58,8 +58,8 @@ GST80_SHLIB_VERSION=	1
 # These are the current supported gstreamer-plugins modules
 #
 _USE_GSTREAMER_ALL=	a52dec aalib cairo cdparanoia \
-			dv esound faac faad flac gconf gnomevfs \
-			gsm ivorbis jpeg ladspa lame libcaca \
+			dv esound faac faad ffmpeg flac gconf gnomevfs \
+			good gsm ivorbis jpeg ladspa lame libcaca \
 			libmms libpng libvisual mad mpeg2dec \
 			musepack ogg pango sdl shout2 sidplay \
 			speex theora vorbis wavpack
@@ -190,6 +190,8 @@ dv_DEPENDS=	multimedia/gstreamer-plugins-dv
 
 dvd_DEPENDS=	multimedia/gstreamer-plugins-dvd
 
+good_DEPENDS=	multimedia/gstreamer-plugins-good
+
 libfame_DEPENDS=	multimedia/gstreamer-plugins-libfame
 
 mpeg2dec_DEPENDS=	multimedia/gstreamer-plugins-mpeg2dec
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile
new file mode 100644
index 000000000..ab8dde676
--- /dev/null
+++ b/multimedia/gstreamer-plugins-good/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for:	gstreamer-plugins-good
+# Date created:			20 Jan 2006
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+PORTREVISION=	0
+CATEGORIES=	multimedia
+
+COMMENT=	Good gstreamer-plugins
+
+GST_PLUGIN=	good
+GST_PLUGIN_SUFFIX=	-good
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+
+EXTRACT_ONLY=	${GOOD_DISTFILE}
+WRKSRC=	${WRKDIR}/${GOOD_DISTNAME}
+
+GOOD_GST_DIRS=	gst sys
+PLIST_SUB=	VERSION="${GST_VERSION}"
+NO_GSTREAMER_COMMON=	yes
+PLIST=	${.CURDIR}/pkg-plist
+
+do-build:
+.for dir in ${GOOD_GST_DIRS}
+	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+.endfor
+
+do-install:
+.for dir in ${GOOD_GST_DIRS}
+	@(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+.endfor
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist
new file mode 100644
index 000000000..03686b16c
--- /dev/null
+++ b/multimedia/gstreamer-plugins-good/pkg-plist
@@ -0,0 +1,27 @@
+lib/gstreamer-%%VERSION%%/libgstalaw.so
+lib/gstreamer-%%VERSION%%/libgstalpha.so
+lib/gstreamer-%%VERSION%%/libgstalphacolor.so
+lib/gstreamer-%%VERSION%%/libgstauparse.so
+lib/gstreamer-%%VERSION%%/libgstautodetect.so
+lib/gstreamer-%%VERSION%%/libgstavi.so
+lib/gstreamer-%%VERSION%%/libgstcutter.so
+lib/gstreamer-%%VERSION%%/libgstdebug.so
+lib/gstreamer-%%VERSION%%/libgsteffectv.so
+lib/gstreamer-%%VERSION%%/libgstflxdec.so
+lib/gstreamer-%%VERSION%%/libgstgoom.so
+lib/gstreamer-%%VERSION%%/libgstid3demux.so
+lib/gstreamer-%%VERSION%%/libgstlevel.so
+lib/gstreamer-%%VERSION%%/libgstmatroska.so
+lib/gstreamer-%%VERSION%%/libgstmulaw.so
+lib/gstreamer-%%VERSION%%/libgstmultipart.so
+lib/gstreamer-%%VERSION%%/libgstnavigationtest.so
+lib/gstreamer-%%VERSION%%/libgstossaudio.so
+lib/gstreamer-%%VERSION%%/libgstrtp.so
+lib/gstreamer-%%VERSION%%/libgstrtsp.so
+lib/gstreamer-%%VERSION%%/libgstsmpte.so
+lib/gstreamer-%%VERSION%%/libgstudp.so
+lib/gstreamer-%%VERSION%%/libgstvideobox.so
+lib/gstreamer-%%VERSION%%/libgstvideoflip.so
+lib/gstreamer-%%VERSION%%/libgstvideomixer.so
+lib/gstreamer-%%VERSION%%/libgstwavenc.so
+lib/gstreamer-%%VERSION%%/libgstwavparse.so
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index f56722f06..2647dabc3 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION?=	0.10.2
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GNOME:S/$/:base/} \
 		http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 0ae7b87a6..ea2c4e76a 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -103,7 +103,7 @@ CONFIGURE_ARGS+=--disable-spc
 PLIST_SUB+=	SPC="@comment "
 #.endif
 
-.if ${GST_PLUGIN}!="base"
+.if ${GST_PLUGIN}!="base" && !defined(NO_GSTREAMER_COMMON)
 GST_PLUGIN_SUFFIX?=	-${GST_PLUGIN}
 
 COMMENT=	Gstreamer ${GST_PLUGIN} plugin
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 2419606d0..077af8ac0 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2/Makefile,v 1.128 2006/01/06 17:41:58 marcus Exp $
+#   $MCom: ports/x11/gnome2/Makefile,v 1.129 2006/01/20 02:56:14 ahze Exp $
 #
 
 PORTNAME=	gnome2
 PORTVERSION=	2.13.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -53,6 +53,8 @@ RUN_DEPENDS?=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
 		ximian-connector-setup-2.6:${PORTSDIR}/mail/evolution-exchange \
 		${X11BASE}/lib/gstreamer-0.8/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core80 \
 		${X11BASE}/lib/gstreamer-0.8/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf80 \
+		${X11BASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins \
+		${X11BASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
 		totem:${PORTSDIR}/multimedia/totem-gstreamer \
 		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
 		${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \