Update to 0.6.1

Submitted by:	marcus

4 files changed, 23 insertions, 15 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index eee16cf69888..7877ee1e0445 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.6.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,18 +17,15 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	GStreamer written collection of plugins handling several media types
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20 \
-		gconf-2.5:${PORTSDIR}/devel/gconf2 \
-		gstreamer-0.6.0:${PORTSDIR}/multimedia/gstreamer \
-		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gstreamer-0.6.0:${PORTSDIR}/multimedia/gstreamer \
 		popt.0:${PORTSDIR}/devel/popt \
-		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack \
 		gnomehier \
-		gnomeprefix
+		gnomeprefix \
+		gconf2
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
@@ -119,6 +115,8 @@ post-install:
 # hermes is required for gstreamer-player to work
 # since it is currently the only colorspace plugin available
 WITH_HERMES=	yes
+# gnomevfs is required for gstreamer-player to work
+WITH_GNOMEVFS=	yes
 
 ##
 ## auto detect possible plugins
@@ -160,7 +158,7 @@ WITH_LAME=yes
 .endif
 
 # gnomevfs
-.if exists(${X11BASE}/lib/libgnomevfs-2.a)
+.if ${HAVE_GNOME:Mgnomevfs2}!=""
 WITH_GNOMEVFS=yes
 .endif
 
@@ -344,8 +342,7 @@ PLIST_SUB+=	FREETYPE=""
 CONFIGURE_ARGS+=	--disable-gnome_vfs
 PLIST_SUB+=	GNOMEVFS="@comment "
 .else
-LIB_DEPENDS+=	gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
-
+USE_GNOME+=	gnomevfs2
 PLIST_SUB+=	GNOMEVFS=""
 .endif
 
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index caeb20303290..b7ef389b6be7 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1 +1 @@
-MD5 (gst-plugins-0.6.0.tar.gz) = c1eadcf2486577bb36d4e89cbfa2e65f
+MD5 (gst-plugins-0.6.1.tar.gz) = 0d3cc17cafc57f145d80b880af47f99f
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c b/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c
new file mode 100644
index 000000000000..05c0e53668b6
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c
@@ -0,0 +1,11 @@
+--- ext/a52dec/gsta52dec.c.orig	Sun Apr  6 18:58:19 2003
++++ ext/a52dec/gsta52dec.c	Sun Apr 20 13:16:28 2003
+@@ -25,7 +25,7 @@
+ 
+ #include <stdlib.h>
+ 
+-#ifdef HAVE_STDINT_H
++#if defined(HAVE_STDINT_H) || defined(__FreeBSD__)
+ #include <stdint.h>
+ #else
+ /* (Ronald) hacky... can't include stdint.h because it's not available
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index 39161a107e49..c530bc804e10 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -20,8 +20,8 @@ lib/gstreamer-%%VERSION%%/libgstaudio.so
 %%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so
 lib/gstreamer-%%VERSION%%/libgstaudioscale.so
 lib/gstreamer-%%VERSION%%/libgstauparse.so
-%%AVIFILE%%lib/gstreamer-%%VERSION%%/libgstavidemux.so
-%%AVIFILE%%lib/gstreamer-%%VERSION%%/libgstavimux.so
+lib/gstreamer-%%VERSION%%/libgstavidemux.so
+lib/gstreamer-%%VERSION%%/libgstavimux.so
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
 lib/gstreamer-%%VERSION%%/libgstchart.so
 %%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so
@@ -54,6 +54,7 @@ lib/gstreamer-%%VERSION%%/libgstlevel.so
 %%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so
 lib/gstreamer-%%VERSION%%/libgstmedian.so
 %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so
+lib/gstreamer-%%VERSION%%/libgstmodplug.so
 lib/gstreamer-%%VERSION%%/libgstmono2stereo.so
 lib/gstreamer-%%VERSION%%/libgstmonoscope.so
 lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
@@ -123,7 +124,6 @@ lib/libgstplay-%%VERSION%%.so.%%SHLIB_VERSION%%
 libdata/pkgconfig/gstreamer-gconf-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-libs-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc
-share/aclocal/gst-element-check-%%VERSION%%.m4
 @unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true
 @dirrm include/gstreamer-%%VERSION%%/gst/video
 @dirrm include/gstreamer-%%VERSION%%/gst/riff