Update to 0.7.3.

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

14 files changed, 124 insertions, 108 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index f9f4318e2..1aee9cb4b 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.7.2
+PORTVERSION=	0.7.3
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gst-plugins/0.7
@@ -17,7 +17,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	GStreamer written collection of plugins handling several media types
 
-LIB_DEPENDS=	gstreamer-0.7.3:${PORTSDIR}/multimedia/gstreamer \
+LIB_DEPENDS=	gstreamer-0.7.5:${PORTSDIR}/multimedia/gstreamer \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_X_PREFIX=	yes
@@ -60,7 +60,7 @@ XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
 GST_VERSION=${PORTVERSION:C/..$//}
 
 # library minor number
-SHLIB_VERSION=  1
+SHLIB_VERSION=  2
 
 post-patch:
 # as of this writing, FreeBSD does not support lrint* C99 math functions
@@ -100,16 +100,13 @@ post-configure:
 	@${ECHO_CMD} "CC=${CC}" >> \
 		${WRKSRC}/gst-libs/ext/ffmpeg/ffmpeg/config.mak
 	@${MKDIR} ${WRKSRC}/gst-libs/ext/ffmpeg/.deps
-
-.include <bsd.port.pre.mk>
+	@${RM} -f ${WRKSRC}/gst-libs/ext/ffmpeg/patch/*.bak
 
 post-install:
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
 # register plugins
-	@-${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null
-.else
-	@${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null
-.endif
+	-@${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null
+
+.include <bsd.port.pre.mk>
 
 # Fix build on ia64.  This patch breaks other archs, so include it
 # conditionally
@@ -122,6 +119,8 @@ EXTRA_PATCHES=	${FILESDIR}/ia64-patch-ffmpeg::configure
 WITH_HERMES=	yes
 # gnomevfs is required for gstreamer-player to work
 WITH_GNOMEVFS=	yes
+# Add default MAD support.  This is required for rhythmbox to work.
+WITH_MAD=	yes
 
 ##
 ## auto detect possible plugins
@@ -248,6 +247,11 @@ WITH_LIBSIDPLAY=yes
 WITH_MAD=yes
 .endif
 
+# ogg
+.if exists(${LOCALBASE}/lib/libogg.a)
+WITH_OGG=yes
+.endif
+
 # openquicktime
 .if exists(${LOCALBASE}/lib/libopenquicktime.so)
 WITH_OPENQUICKTIME=yes
@@ -554,6 +558,16 @@ LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
 PLIST_SUB+=	LIBMAD=""
 .endif
 
+# ogg
+.ifndef(WITH_OGG)
+CONFIGURE_ARGS+=	--disable-ogg \
+			--disable-oggtest
+PLIST_SUB+=	OGG="@comment "
+.else
+LIB_DEPENDS+=	ogg.4:${PORTSDIR}/audio/libogg
+PLIST_SUB+=	OGG=""
+.endif
+
 # openquicktime
 .ifndef(WITH_OPENQUICKTIME)
 CONFIGURE_ARGS+=	--disable-openquicktime
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index ad52ff817..2a1467345 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gst-plugins-0.7.2.tar.bz2) = 3f3b29146f7a8e12aa367caf6dbb0fb6
+MD5 (gnome2/gst-plugins-0.7.3.tar.bz2) = 2d7ddd33a0bd53302a3d515da19aa944
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_mad_gstid3tag.c b/multimedia/gstreamer-plugins/files/patch-ext_mad_gstid3tag.c
new file mode 100644
index 000000000..288478b29
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-ext_mad_gstid3tag.c
@@ -0,0 +1,13 @@
+--- ext/mad/gstid3tag.c.orig	Fri Dec 19 15:09:09 2003
++++ ext/mad/gstid3tag.c	Fri Dec 19 15:09:33 2003
+@@ -474,8 +474,9 @@
+ 	  tmp = strtoul (utf8, &check, 10);
+ 	  if (*check != '\0') break;
+ 	  if (strcmp (tag_name, GST_TAG_DATE) == 0) {
++	    GDate *d;
+ 	    if (tmp == 0) break;
+-	    GDate *d = g_date_new_dmy (1, 1, tmp);
++	    d = g_date_new_dmy (1, 1, tmp);
+ 	    tmp = g_date_get_julian (d);
+ 	    g_date_free (d);
+ 	  }
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_shout_gstshout.c b/multimedia/gstreamer-plugins/files/patch-ext_shout_gstshout.c
deleted file mode 100644
index d03e18cde..000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext_shout_gstshout.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/shout/gstshout.c.orig	Tue Nov 25 19:09:41 2003
-+++ ext/shout/gstshout.c	Tue Nov 25 20:11:54 2003
-@@ -109,7 +109,7 @@
-   if (!icecastsend_type) {
-     static const GTypeInfo icecastsend_info = {
-       sizeof (GstIcecastSendClass),
--      (GBaseInitFunc gst_icecastsend_base_init, NULL,
-+      (GBaseInitFunc) gst_icecastsend_base_init, NULL,
-       (GClassInitFunc) gst_icecastsend_class_init, NULL, NULL,
-       sizeof (GstIcecastSend), 0,
-       (GInstanceInitFunc) gst_icecastsend_init,
diff --git a/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c b/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c
deleted file mode 100644
index 8149c3981..000000000
--- a/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c.orig	Fri Apr 25 22:06:13 2003
-+++ gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c	Fri Apr 25 23:19:39 2003
-@@ -24,8 +24,14 @@
-  *                     and Falk Hueffner <falk@debian.org>
-  */
- 
-+#include <sys/param.h>
-+
- #include "asm.h"
- #include "../dsputil.h"
-+
-+#if defined(__FreeBSD__) && __FreeBSD_version < 500000
-+typedef __int32_t int_fast32_t;
-+#endif
- 
- extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
-                                         int line_size);
diff --git a/multimedia/gstreamer-plugins/files/patch-gst-libs_ext_ffmpeg_Makefile.in b/multimedia/gstreamer-plugins/files/patch-gst-libs_ext_ffmpeg_Makefile.in
index 2cc654fbf..22f6d71f7 100644
--- a/multimedia/gstreamer-plugins/files/patch-gst-libs_ext_ffmpeg_Makefile.in
+++ b/multimedia/gstreamer-plugins/files/patch-gst-libs_ext_ffmpeg_Makefile.in
@@ -1,6 +1,6 @@
---- gst-libs/ext/ffmpeg/Makefile.in.orig	Tue Nov 25 02:24:22 2003
-+++ gst-libs/ext/ffmpeg/Makefile.in	Tue Nov 25 02:24:35 2003
-@@ -809,7 +809,7 @@
+--- gst-libs/ext/ffmpeg/Makefile.in.orig	Fri Dec 19 14:31:01 2003
++++ gst-libs/ext/ffmpeg/Makefile.in	Fri Dec 19 14:40:11 2003
+@@ -866,7 +866,7 @@
  	libavformat_la-file.lo libavformat_la-flvdec.lo \
  	libavformat_la-flvenc.lo libavformat_la-framehook.lo \
  	libavformat_la-gif.lo libavformat_la-gifdec.lo \
@@ -9,3 +9,12 @@
  	libavformat_la-idroq.lo libavformat_la-img.lo \
  	libavformat_la-ipmovie.lo libavformat_la-jpeg.lo \
  	libavformat_la-mov.lo libavformat_la-movenc.lo \
+@@ -5659,7 +5659,7 @@
+ 
+ patches:
+ 	@echo -n Patching ffmpeg if necessary ...
+-	@patch -p0 -N -r rejects <$(srcdir)/patch/function.patch > /dev/null || true
++#	@patch -p0 -N -r rejects <$(srcdir)/patch/function.patch > /dev/null || true
+ 	@rm -f rejects || true
+ 	@echo done.
+ 
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index bf78e1635..ff3272ef5 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -16,10 +16,13 @@ include/gstreamer-%%VERSION%%/gst/media-info/media-info.h
 include/gstreamer-%%VERSION%%/gst/mixer/mixer.h
 include/gstreamer-%%VERSION%%/gst/mixer/mixertrack.h
 include/gstreamer-%%VERSION%%/gst/navigation/navigation.h
-include/gstreamer-%%VERSION%%/gst/play/play.h
+include/gstreamer-%%VERSION%%/gst/play/gstplay.h
 include/gstreamer-%%VERSION%%/gst/propertyprobe/propertyprobe.h
 include/gstreamer-%%VERSION%%/gst/resample/resample.h
-include/gstreamer-%%VERSION%%/gst/riff/riff.h
+include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h
+include/gstreamer-%%VERSION%%/gst/riff/riff-media.h
+include/gstreamer-%%VERSION%%/gst/riff/riff-read.h
+include/gstreamer-%%VERSION%%/gst/tag/tag.h
 include/gstreamer-%%VERSION%%/gst/tuner/tuner.h
 include/gstreamer-%%VERSION%%/gst/tuner/tunerchannel.h
 include/gstreamer-%%VERSION%%/gst/tuner/tunernorm.h
@@ -33,12 +36,7 @@ lib/gstreamer-%%VERSION%%/libgstac3parse.so
 lib/gstreamer-%%VERSION%%/libgstadder.so
 lib/gstreamer-%%VERSION%%/libgstalaw.so
 %%ARTS%%lib/gstreamer-%%VERSION%%/libgstartsdsink.so
-lib/gstreamer-%%VERSION%%/libgstasfdemux.a
-lib/gstreamer-%%VERSION%%/libgstasfdemux.so
-lib/gstreamer-%%VERSION%%/libgstasfdemux.so.0
-lib/gstreamer-%%VERSION%%/libgstasfmux.a
-lib/gstreamer-%%VERSION%%/libgstasfmux.so
-lib/gstreamer-%%VERSION%%/libgstasfmux.so.0
+lib/gstreamer-%%VERSION%%/libgstasf.so
 lib/gstreamer-%%VERSION%%/libgstaudioconvert.so
 lib/gstreamer-%%VERSION%%/libgstaudio.so
 %%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so
@@ -93,6 +91,7 @@ lib/gstreamer-%%VERSION%%/libgstmplex.a
 lib/gstreamer-%%VERSION%%/libgstmplex.so
 lib/gstreamer-%%VERSION%%/libgstmulaw.so
 lib/gstreamer-%%VERSION%%/libgstnavigationtest.so
+%%OGG%%lib/gstreamer-%%VERSION%%/libgstogg.so
 lib/gstreamer-%%VERSION%%/libgstoneton.so
 lib/gstreamer-%%VERSION%%/libgstoverlay.so
 %%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedecoder.so
@@ -122,7 +121,9 @@ lib/gstreamer-%%VERSION%%/libgstspeed.so
 %%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so
 lib/gstreamer-%%VERSION%%/libgststereo.so
 %%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so
+lib/gstreamer-%%VERSION%%/libgstswitch.so
 lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
+lib/gstreamer-%%VERSION%%/libgsttagediting.so
 lib/gstreamer-%%VERSION%%/libgsttcp.so
 lib/gstreamer-%%VERSION%%/libgsttextoverlay.so
 lib/gstreamer-%%VERSION%%/libgsttimeoverlay.so
@@ -151,13 +152,12 @@ lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so
 lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so.0
 lib/gstreamer-%%VERSION%%/libgsty4menc.so
 lib/gstreamer-%%VERSION%%/libmixmatrix.so
-lib/gtk-2.0/2.2.0/loaders/gst_loader.so
 lib/libgstgconf-%%VERSION%%.a
 lib/libgstgconf-%%VERSION%%.so
 lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%%
 lib/libgstinterfaces-%%VERSION%%.a
 lib/libgstinterfaces-%%VERSION%%.so
-lib/libgstinterfaces-%%VERSION%%.so.1
+lib/libgstinterfaces-%%VERSION%%.so.%%SHLIB_VERSION%%
 lib/libgstmedia-info-%%VERSION%%.a
 lib/libgstmedia-info-%%VERSION%%.so
 lib/libgstmedia-info-%%VERSION%%.so.0
@@ -191,5 +191,5 @@ libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer
 @unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true
 @unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
-@exec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null
-@unexec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null
+@exec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true
+@unexec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index f9f4318e2..1aee9cb4b 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.7.2
+PORTVERSION=	0.7.3
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gst-plugins/0.7
@@ -17,7 +17,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	GStreamer written collection of plugins handling several media types
 
-LIB_DEPENDS=	gstreamer-0.7.3:${PORTSDIR}/multimedia/gstreamer \
+LIB_DEPENDS=	gstreamer-0.7.5:${PORTSDIR}/multimedia/gstreamer \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_X_PREFIX=	yes
@@ -60,7 +60,7 @@ XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
 GST_VERSION=${PORTVERSION:C/..$//}
 
 # library minor number
-SHLIB_VERSION=  1
+SHLIB_VERSION=  2
 
 post-patch:
 # as of this writing, FreeBSD does not support lrint* C99 math functions
@@ -100,16 +100,13 @@ post-configure:
 	@${ECHO_CMD} "CC=${CC}" >> \
 		${WRKSRC}/gst-libs/ext/ffmpeg/ffmpeg/config.mak
 	@${MKDIR} ${WRKSRC}/gst-libs/ext/ffmpeg/.deps
-
-.include <bsd.port.pre.mk>
+	@${RM} -f ${WRKSRC}/gst-libs/ext/ffmpeg/patch/*.bak
 
 post-install:
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
 # register plugins
-	@-${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null
-.else
-	@${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null
-.endif
+	-@${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null
+
+.include <bsd.port.pre.mk>
 
 # Fix build on ia64.  This patch breaks other archs, so include it
 # conditionally
@@ -122,6 +119,8 @@ EXTRA_PATCHES=	${FILESDIR}/ia64-patch-ffmpeg::configure
 WITH_HERMES=	yes
 # gnomevfs is required for gstreamer-player to work
 WITH_GNOMEVFS=	yes
+# Add default MAD support.  This is required for rhythmbox to work.
+WITH_MAD=	yes
 
 ##
 ## auto detect possible plugins
@@ -248,6 +247,11 @@ WITH_LIBSIDPLAY=yes
 WITH_MAD=yes
 .endif
 
+# ogg
+.if exists(${LOCALBASE}/lib/libogg.a)
+WITH_OGG=yes
+.endif
+
 # openquicktime
 .if exists(${LOCALBASE}/lib/libopenquicktime.so)
 WITH_OPENQUICKTIME=yes
@@ -554,6 +558,16 @@ LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
 PLIST_SUB+=	LIBMAD=""
 .endif
 
+# ogg
+.ifndef(WITH_OGG)
+CONFIGURE_ARGS+=	--disable-ogg \
+			--disable-oggtest
+PLIST_SUB+=	OGG="@comment "
+.else
+LIB_DEPENDS+=	ogg.4:${PORTSDIR}/audio/libogg
+PLIST_SUB+=	OGG=""
+.endif
+
 # openquicktime
 .ifndef(WITH_OPENQUICKTIME)
 CONFIGURE_ARGS+=	--disable-openquicktime
diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo
index ad52ff817..2a1467345 100644
--- a/multimedia/gstreamer-plugins80/distinfo
+++ b/multimedia/gstreamer-plugins80/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gst-plugins-0.7.2.tar.bz2) = 3f3b29146f7a8e12aa367caf6dbb0fb6
+MD5 (gnome2/gst-plugins-0.7.3.tar.bz2) = 2d7ddd33a0bd53302a3d515da19aa944
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_mad_gstid3tag.c b/multimedia/gstreamer-plugins80/files/patch-ext_mad_gstid3tag.c
new file mode 100644
index 000000000..288478b29
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-ext_mad_gstid3tag.c
@@ -0,0 +1,13 @@
+--- ext/mad/gstid3tag.c.orig	Fri Dec 19 15:09:09 2003
++++ ext/mad/gstid3tag.c	Fri Dec 19 15:09:33 2003
+@@ -474,8 +474,9 @@
+ 	  tmp = strtoul (utf8, &check, 10);
+ 	  if (*check != '\0') break;
+ 	  if (strcmp (tag_name, GST_TAG_DATE) == 0) {
++	    GDate *d;
+ 	    if (tmp == 0) break;
+-	    GDate *d = g_date_new_dmy (1, 1, tmp);
++	    d = g_date_new_dmy (1, 1, tmp);
+ 	    tmp = g_date_get_julian (d);
+ 	    g_date_free (d);
+ 	  }
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_shout_gstshout.c b/multimedia/gstreamer-plugins80/files/patch-ext_shout_gstshout.c
deleted file mode 100644
index d03e18cde..000000000
--- a/multimedia/gstreamer-plugins80/files/patch-ext_shout_gstshout.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/shout/gstshout.c.orig	Tue Nov 25 19:09:41 2003
-+++ ext/shout/gstshout.c	Tue Nov 25 20:11:54 2003
-@@ -109,7 +109,7 @@
-   if (!icecastsend_type) {
-     static const GTypeInfo icecastsend_info = {
-       sizeof (GstIcecastSendClass),
--      (GBaseInitFunc gst_icecastsend_base_init, NULL,
-+      (GBaseInitFunc) gst_icecastsend_base_init, NULL,
-       (GClassInitFunc) gst_icecastsend_class_init, NULL, NULL,
-       sizeof (GstIcecastSend), 0,
-       (GInstanceInitFunc) gst_icecastsend_init,
diff --git a/multimedia/gstreamer-plugins80/files/patch-ffmpeg::simple_idct_alpha.c b/multimedia/gstreamer-plugins80/files/patch-ffmpeg::simple_idct_alpha.c
deleted file mode 100644
index 8149c3981..000000000
--- a/multimedia/gstreamer-plugins80/files/patch-ffmpeg::simple_idct_alpha.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c.orig	Fri Apr 25 22:06:13 2003
-+++ gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c	Fri Apr 25 23:19:39 2003
-@@ -24,8 +24,14 @@
-  *                     and Falk Hueffner <falk@debian.org>
-  */
- 
-+#include <sys/param.h>
-+
- #include "asm.h"
- #include "../dsputil.h"
-+
-+#if defined(__FreeBSD__) && __FreeBSD_version < 500000
-+typedef __int32_t int_fast32_t;
-+#endif
- 
- extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
-                                         int line_size);
diff --git a/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in b/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in
index 2cc654fbf..22f6d71f7 100644
--- a/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in
+++ b/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in
@@ -1,6 +1,6 @@
---- gst-libs/ext/ffmpeg/Makefile.in.orig	Tue Nov 25 02:24:22 2003
-+++ gst-libs/ext/ffmpeg/Makefile.in	Tue Nov 25 02:24:35 2003
-@@ -809,7 +809,7 @@
+--- gst-libs/ext/ffmpeg/Makefile.in.orig	Fri Dec 19 14:31:01 2003
++++ gst-libs/ext/ffmpeg/Makefile.in	Fri Dec 19 14:40:11 2003
+@@ -866,7 +866,7 @@
  	libavformat_la-file.lo libavformat_la-flvdec.lo \
  	libavformat_la-flvenc.lo libavformat_la-framehook.lo \
  	libavformat_la-gif.lo libavformat_la-gifdec.lo \
@@ -9,3 +9,12 @@
  	libavformat_la-idroq.lo libavformat_la-img.lo \
  	libavformat_la-ipmovie.lo libavformat_la-jpeg.lo \
  	libavformat_la-mov.lo libavformat_la-movenc.lo \
+@@ -5659,7 +5659,7 @@
+ 
+ patches:
+ 	@echo -n Patching ffmpeg if necessary ...
+-	@patch -p0 -N -r rejects <$(srcdir)/patch/function.patch > /dev/null || true
++#	@patch -p0 -N -r rejects <$(srcdir)/patch/function.patch > /dev/null || true
+ 	@rm -f rejects || true
+ 	@echo done.
+ 
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index bf78e1635..ff3272ef5 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -16,10 +16,13 @@ include/gstreamer-%%VERSION%%/gst/media-info/media-info.h
 include/gstreamer-%%VERSION%%/gst/mixer/mixer.h
 include/gstreamer-%%VERSION%%/gst/mixer/mixertrack.h
 include/gstreamer-%%VERSION%%/gst/navigation/navigation.h
-include/gstreamer-%%VERSION%%/gst/play/play.h
+include/gstreamer-%%VERSION%%/gst/play/gstplay.h
 include/gstreamer-%%VERSION%%/gst/propertyprobe/propertyprobe.h
 include/gstreamer-%%VERSION%%/gst/resample/resample.h
-include/gstreamer-%%VERSION%%/gst/riff/riff.h
+include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h
+include/gstreamer-%%VERSION%%/gst/riff/riff-media.h
+include/gstreamer-%%VERSION%%/gst/riff/riff-read.h
+include/gstreamer-%%VERSION%%/gst/tag/tag.h
 include/gstreamer-%%VERSION%%/gst/tuner/tuner.h
 include/gstreamer-%%VERSION%%/gst/tuner/tunerchannel.h
 include/gstreamer-%%VERSION%%/gst/tuner/tunernorm.h
@@ -33,12 +36,7 @@ lib/gstreamer-%%VERSION%%/libgstac3parse.so
 lib/gstreamer-%%VERSION%%/libgstadder.so
 lib/gstreamer-%%VERSION%%/libgstalaw.so
 %%ARTS%%lib/gstreamer-%%VERSION%%/libgstartsdsink.so
-lib/gstreamer-%%VERSION%%/libgstasfdemux.a
-lib/gstreamer-%%VERSION%%/libgstasfdemux.so
-lib/gstreamer-%%VERSION%%/libgstasfdemux.so.0
-lib/gstreamer-%%VERSION%%/libgstasfmux.a
-lib/gstreamer-%%VERSION%%/libgstasfmux.so
-lib/gstreamer-%%VERSION%%/libgstasfmux.so.0
+lib/gstreamer-%%VERSION%%/libgstasf.so
 lib/gstreamer-%%VERSION%%/libgstaudioconvert.so
 lib/gstreamer-%%VERSION%%/libgstaudio.so
 %%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so
@@ -93,6 +91,7 @@ lib/gstreamer-%%VERSION%%/libgstmplex.a
 lib/gstreamer-%%VERSION%%/libgstmplex.so
 lib/gstreamer-%%VERSION%%/libgstmulaw.so
 lib/gstreamer-%%VERSION%%/libgstnavigationtest.so
+%%OGG%%lib/gstreamer-%%VERSION%%/libgstogg.so
 lib/gstreamer-%%VERSION%%/libgstoneton.so
 lib/gstreamer-%%VERSION%%/libgstoverlay.so
 %%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedecoder.so
@@ -122,7 +121,9 @@ lib/gstreamer-%%VERSION%%/libgstspeed.so
 %%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so
 lib/gstreamer-%%VERSION%%/libgststereo.so
 %%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so
+lib/gstreamer-%%VERSION%%/libgstswitch.so
 lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
+lib/gstreamer-%%VERSION%%/libgsttagediting.so
 lib/gstreamer-%%VERSION%%/libgsttcp.so
 lib/gstreamer-%%VERSION%%/libgsttextoverlay.so
 lib/gstreamer-%%VERSION%%/libgsttimeoverlay.so
@@ -151,13 +152,12 @@ lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so
 lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so.0
 lib/gstreamer-%%VERSION%%/libgsty4menc.so
 lib/gstreamer-%%VERSION%%/libmixmatrix.so
-lib/gtk-2.0/2.2.0/loaders/gst_loader.so
 lib/libgstgconf-%%VERSION%%.a
 lib/libgstgconf-%%VERSION%%.so
 lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%%
 lib/libgstinterfaces-%%VERSION%%.a
 lib/libgstinterfaces-%%VERSION%%.so
-lib/libgstinterfaces-%%VERSION%%.so.1
+lib/libgstinterfaces-%%VERSION%%.so.%%SHLIB_VERSION%%
 lib/libgstmedia-info-%%VERSION%%.a
 lib/libgstmedia-info-%%VERSION%%.so
 lib/libgstmedia-info-%%VERSION%%.so.0
@@ -191,5 +191,5 @@ libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer
 @unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true
 @unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
-@exec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null
-@unexec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null
+@exec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true
+@unexec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true