* Update to 0.7.5

* Add a slew of new plug-in and feature support [1]

Submitted by:	Koop Mast <kwm@rainbow-runner.nl>
		Simon Barner <barner@in.tum.de> [1]


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

26 files changed, 892 insertions, 386 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 4288f827a..863acac1b 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.7.4
-PORTREVISION=	1
+PORTVERSION=	0.7.5
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gst-plugins/0.7
@@ -18,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.6:${PORTSDIR}/multimedia/gstreamer \
+LIB_DEPENDS=	gstreamer-0.7.7:${PORTSDIR}/multimedia/gstreamer \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_X_PREFIX=	yes
@@ -33,13 +32,32 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tests \
 		--disable-alsa \
-		--disable-cdrom \
+		--enable-cdrom \
 		--disable-mjpegtools \
+		--disable-divx \
+		--disable-dxr3 \
+		--disable-http \
 		--disable-qcam \
+		--disable-raw1394 \
 		--disable-v4l2 \
 		--disable-v4l \
+		--disable-vcd \
 		--disable-dependency-tracking \
+		--enable-xshm \
 		--enable-static
+
+# list of plugins that need some work in one way or the other to work
+# probable the lib needs to be ported, disable them for now.
+CONFIGURE_ARGS+=--disable-mas \
+		--disable-faac \
+		--disable-jack \
+		--disable-nas \
+		--disable-tarkin \
+		--disable-lcs \
+		--disable-mplex \
+		--disable-shout2 \
+		--disable-librfb
+
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
@@ -50,18 +68,17 @@ PLIST_SUB=	\
 		SHLIB_VERSION="${SHLIB_VERSION}"
 INSTALLS_SHLIB=	yes
 
-# for esound detection
+# for various GNOME-related component detection
 WANT_GNOME=	yes
 
 MAN1=	gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1
 
 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
 SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
-XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
 GST_VERSION=${PORTVERSION:C/..$//}
 
 # library minor number
-SHLIB_VERSION=  2
+SHLIB_VERSION=	2
 
 post-patch:
 # as of this writing, FreeBSD does not support lrint* C99 math functions
@@ -87,34 +104,17 @@ post-patch:
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|; \
 		s|stdint\.h|inttypes.h|'
-# use GMAKE, not MAKE
-	@${REINPLACE_CMD} -E -e \
-		's|make|${GMAKE}|' \
-		${WRKSRC}/gst-libs/ext/ffmpeg/Makefile.in
 # force libaudiofile detection
 	@${REINPLACE_CMD} -E -e \
 		's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
-post-configure:
-# CC safeness
-	@${ECHO_CMD} "CC=${CC}" >> \
-		${WRKSRC}/gst-libs/ext/ffmpeg/ffmpeg/config.mak
-	@${MKDIR} ${WRKSRC}/gst-libs/ext/ffmpeg/.deps
-	@${RM} -f ${WRKSRC}/gst-libs/ext/ffmpeg/patch/*.bak
-
 post-install:
 # register plugins
 	-@${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
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
-EXTRA_PATCHES=	${FILESDIR}/ia64-patch-ffmpeg::configure
-.endif
-
 # hermes is required for gstreamer-player to work
 # since it is currently the only colorspace plugin available
 WITH_HERMES=	yes
@@ -137,11 +137,6 @@ WITH_AALIB=yes
 WITH_ARTS=yes
 .endif
 
-# avifile
-.if exists(${LOCALBASE}/lib/libaviplay.a)
-WITH_AVIFILE=yes
-.endif
-
 # cdparanoia
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
 WITH_CDPARANOIA=yes
@@ -152,6 +147,11 @@ WITH_CDPARANOIA=yes
 WITH_ESOUND=yes
 .endif
 
+# faad
+.if exists(${LOCALBASE}/lib/libfaad.a)
+WITH_FAAD=yes
+.endif
+
 # flac
 .if exists(${LOCALBASE}/lib/libFLAC.a)
 WITH_FLAC=yes
@@ -162,6 +162,11 @@ WITH_FLAC=yes
 WITH_FREETYPE=yes
 .endif
 
+# gdkpixbuf
+.if ${HAVE_GNOME:Mgtk20}!=""
+WITH_GDKPIXBUF=yes
+.endif
+
 # lame
 .if exists(${LOCALBASE}/lib/libmp3lame.a)
 WITH_LAME=yes
@@ -172,6 +177,11 @@ WITH_LAME=yes
 WITH_GNOMEVFS=yes
 .endif
 
+# libcaca
+.if exists(${LOCALBASE}/lib/libcaca.a)
+WITH_LIBCACA=yes
+.endif
+
 # gsm
 .if exists(${LOCALBASE}/lib/libgsm.a)
 WITH_GSM=yes
@@ -232,8 +242,13 @@ WITH_LIBMIKMOD=yes
 WITH_LIBMPEG2=yes
 .endif
 
+# libmusicbrainz
+.if exists(${LOCALBASE}/lib/libmusicbrainz.a)
+WITH_LIBMUSICBRAINZ=yes
+.endif
+
 # libshout
-.if exists(${LOCALBASE}/lib/libshout.a)
+.if exists(${LOCALBASE}/lib/libshout.so.2)
 WITH_LIBSHOUT=yes
 .endif
 
@@ -242,6 +257,16 @@ WITH_LIBSHOUT=yes
 WITH_LIBSIDPLAY=yes
 .endif
 
+# libsndfile
+.if exists(${LOCALBASE}/lib/libsndfile.a)
+WITH_LIBSNDFILE=yes
+.endif
+
+# libtheora
+.if exists(${LOCALBASE}/lib/libtheora.a)
+WITH_LIBTHEORA=yes
+.endif
+
 # mad
 .if exists(${LOCALBASE}/lib/libmad.a)
 WITH_MAD=yes
@@ -252,9 +277,9 @@ WITH_MAD=yes
 WITH_OGG=yes
 .endif
 
-# openquicktime
-.if exists(${LOCALBASE}/lib/libopenquicktime.so)
-WITH_OPENQUICKTIME=yes
+# pango
+.if exists(${X11BASE}/lib/libpangoft2-1.0.a)
+WITH_PANGO=yes
 .endif
 
 # png
@@ -267,6 +292,16 @@ WITH_PNG=yes
 WITH_SDL=yes
 .endif
 
+# smoothwave
+.if exists(${X11BASE}/lib/libgtk-x11-2.0.a)
+WITH_SMOOTHWAVE=yes
+.endif
+
+# speex
+.if exists(${LOCALBASE}/lib/libspeex.a)
+WITH_SPEEX=yes
+.endif
+
 # swfdec
 .if exists(${X11BASE}/lib/libswfdec.a)
 WITH_SWFDEC=yes
@@ -277,9 +312,9 @@ WITH_SWFDEC=yes
 WITH_VORBIS=yes
 .endif
 
-# xmms
-.if exists(${X11BASE}/lib/libxmms.a)
-#WITH_XMMS=yes
+# vorbisidec
+.if exists(${LOCALBASE}/lib/libvorbisidec.a)
+WITH_VORBISIDEC=yes
 .endif
 
 # xvid
@@ -318,16 +353,6 @@ CONFIGURE_ARGS+=	--with-arts-prefix=${LOCALBASE} \
 PLIST_SUB+=	ARTS=""
 .endif
 
-# avifile
-.ifndef(WITH_AVIFILE)
-CONFIGURE_ARGS+=	--disable-avifile
-PLIST_SUB+=	AVIFILE="@comment "
-.else
-LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
-
-PLIST_SUB+=	AVIFILE=""
-.endif
-
 # cdparanoia
 .ifndef(WITH_CDPARANOIA)
 CONFIGURE_ARGS+=	--disable-cdparanoia
@@ -350,6 +375,15 @@ CONFIGURE_ARGS+=	--with-esd-prefix=${LOCALBASE}  \
 PLIST_SUB+=	ESOUND=""
 .endif
 
+# faad
+.ifndef(WITH_FAAD)
+CONFIGURE_ARGS+=	--disable-faad
+PLIST_SUB+=	FAAD="@comment "
+.else
+LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/libfaad
+PLIST_SUB+=	FAAD=""
+.endif
+
 # flac
 .ifndef(WITH_FLAC)
 CONFIGURE_ARGS+=	--disable-flac
@@ -372,6 +406,15 @@ CONFIGURE_ARGS+=	--with-ft-prefix=${LOCALBASE}  \
 PLIST_SUB+=	FREETYPE=""
 .endif
 
+# gdkpixbuf
+.ifndef(WITH_GDKPIXBUF)
+CONFIGURE_ARGS+=	--disable-gdk_pixbuf
+PLIST_SUB+=	GDKPIXBUF="@comment "
+.else
+USE_GNOME+=	gtk20
+PLIST_SUB+=	GDKPIXBUF=""
+.endif
+
 # gnomevfs
 .ifndef(WITH_GNOMEVFS)
 CONFIGURE_ARGS+=	--disable-gnome_vfs
@@ -460,6 +503,15 @@ LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 PLIST_SUB+=	LIBAUDIOFILE=""
 .endif
 
+# libcaca
+.ifndef(WITH_LIBCACA)
+CONFIGURE_ARGS+=	--disable-libcaca
+PLIST_SUB+=	LIBCACA="@comment "
+.else
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+PLIST_SUB+=	LIBCACA=""
+.endif
+
 # libdv
 .ifndef(WITH_LIBDV)
 CONFIGURE_ARGS+=	--disable-libdv
@@ -527,6 +579,17 @@ CONFIGURE_ARGS+=	--with-mpeg2dec-prefix=${LOCALBASE}
 PLIST_SUB+=	LIBMPEG2=""
 .endif
 
+# libmusicbrainz
+# the musicbrainz people need to release a new version to get this to work
+# .ifndef(WITH_LIBMUSICBRAINZ)
+CONFIGURE_ARGS+=	--disable-musicbrainz
+.undef WITH_LIBMUSICBRAINZ
+#PLIST_SUB+=	LIBMUSICBRAINZ="@comment "
+#.else
+#LIB_DEPENDS+=	libmusicbrainz.3:${PORTSDIR}/audio/libmusicbrainz
+#PLIST_SUB+=	LIBMUSICBRAINZ=""
+#.endif
+
 # libshout
 .ifndef(WITH_LIBSHOUT)
 CONFIGURE_ARGS+=	--disable-shout
@@ -547,6 +610,24 @@ LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
 PLIST_SUB+=	LIBSIDPLAY=""
 .endif
 
+# libsndfile
+.ifndef(WITH_LIBSNDFILE)
+CONFIGURE_ARGS+=	--disable-sndfile
+PLIST_SUB+=	LIBSNDFILE="@comment "
+.else
+LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+PLIST_SUB+=	LIBSNDFILE=""
+.endif
+
+# libtheora
+.ifndef(WITH_LIBTHEORA)
+CONFIGURE_ARGS+=	--disable-theora
+PLIST_SUB+=	LIBTHEORA="@comment "
+.else
+LIB_DEPENDS+=	theora.0:${PORTSDIR}/audio/libtheora
+PLIST_SUB+=	LIBTHEORA=""
+.endif
+
 # mad
 .ifndef(WITH_MAD)
 CONFIGURE_ARGS+=	--disable-mad
@@ -568,16 +649,6 @@ LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
 PLIST_SUB+=	OGG=""
 .endif
 
-# openquicktime
-.ifndef(WITH_OPENQUICKTIME)
-CONFIGURE_ARGS+=	--disable-openquicktime
-PLIST_SUB+=	OPENQUICKTIME="@comment "
-.else
-LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
-
-PLIST_SUB+=	OPENQUICKTIME=""
-.endif
-
 # oss
 .ifdef(WITHOUT_OSS)
 CONFIGURE_ARGS+=	--disable-oss
@@ -586,6 +657,15 @@ PLIST_SUB+=	OSS="@comment "
 PLIST_SUB+=	OSS=""
 .endif
 
+# pango
+.ifndef(WITH_PANGO)
+CONFIGURE_ARGS+=	--disable-pango
+PLIST_SUB+=	PANGO="@comment "
+.else
+USE_GNOME+=	pango
+PLIST_SUB+=	PANGO=""
+.endif
+
 # png
 .ifndef(WITH_PNG)
 CONFIGURE_ARGS+=	--disable-libpng
@@ -610,6 +690,15 @@ CONFIGURE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
 PLIST_SUB+=	SDL=""
 .endif
 
+# smoothwave
+.ifndef(WITH_SMOOTHWAVE)
+CONFIGURE_ARGS+=	--disable-smoothwave
+PLIST_SUB+=	SMOOTHWAVE="@comment "
+.else
+USE_GNOME+=	gtk20
+PLIST_SUB+=	SMOOTHWAVE=""
+.endif
+
 # speex
 .ifndef(WITH_SPEEX)
 CONFIGURE_ARGS+=	--disable-speex
@@ -644,17 +733,13 @@ CONFIGURE_ARGS+=	--with-vorbis=${LOCALBASE} \
 PLIST_SUB+=	VORBIS=""
 .endif
 
-# xmms
-.ifndef(WITH_XMMS)
-CONFIGURE_ARGS+=	--disable-xmms
-PLIST_SUB+=	XMMS="@comment "
+# vorbisidec
+.ifndef(WITH_VORBISIDEC)
+CONFIGURE_ARGS+=	--disable-ivorbis
+PLIST_SUB+=	IVORBIS="@comment "
 .else
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
-
-CONFIGURE_ARGS+=	--with-xmms-prefix=${X11BASE} \
-			--with-xmms-exec-prefix=${X11BASE}
-CONFIGURE_ENV+=		XMMS_CONFIG=${XMMS_CONFIG}
-PLIST_SUB+=	XMMS=""
+LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
+PLIST_SUB+=	IVORBIS=""
 .endif
 
 # xvid
@@ -678,10 +763,6 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_ARTS to enable aRts Audio plugin'
 .endif
-.ifndef(WITH_AVIFILE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin'
-.endif
 .ifndef(WITH_CDPARANOIA)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cdparanoia Audio plugin'
@@ -690,6 +771,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin'
 .endif
+.ifndef(WITH_FAAD)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_FAAD to enable faad Audio plugin'
+.endif
 .ifndef(WITH_FLAC)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_FLAC to enable flac Audio plugin'
@@ -698,6 +783,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_FREETYPE to enable freetype support'
 .endif
+.ifndef(WITH_GDKPIXBUF)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_GDKPIXBUF to enable gdk-pixbuf plugin'
+.endif
 .ifndef(WITH_GSM)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_GSM to enable gsm Audio plugin'
@@ -734,6 +823,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_LIBAUDIOFILE to enable libaudiofile Audio plugin'
 .endif
+.ifndef(WITH_LIBCACA)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_LIBCACA to enable libcaca Video plugin'
+.endif
 .ifndef(WITH_LIBDV)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_LIBDV to enable libdv Video plugin'
@@ -758,6 +851,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_LIBMPEG2 to enable libmpeg2 Video plugin'
 .endif
+.ifndef(WITH_LIBMUSICBRAINZ)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_LIBMUSICBRAINZ to enable libmusicbrainz Audio plugin'
+.endif
 .ifndef(WITH_LIBSHOUT)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_LIBSHOUT to enable libshout Audio plugin'
@@ -766,18 +863,26 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_LIBSIDPLAY to enable libsidplay Audio plugin'
 .endif
-.ifndef(WITH_MAD)
+.ifndef(WITH_LIBSNDFILE)
 	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin'
+	@${ECHO_MSG} '===> Define WITH_LIBSNDFILE to enable libsndfile Audio plugin'
 .endif
-.ifndef(WITH_OPENQUICKTIME)
+.ifndef(WITH_LIBTHEORA)
 	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_OPENQUICKTIME to enable openquicktime Video plugin'
+	@${ECHO_MSG} '===> Define WITH_LIBTHEORA to enable libtheora Video plugin'
+.endif
+.ifndef(WITH_MAD)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin'
 .endif
 .ifndef(WITHOUT_OSS)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITHOUT_OSS to disable OSS Audio plugin'
 .endif
+.ifndef(WITH_PANGO)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_PANGO to enable pango textoverlay plugin'
+.endif
 .ifndef(WITH_PNG)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_PNG to enable png Video plugin'
@@ -786,6 +891,14 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_SDL to enable SDL Video plugin'
 .endif
+.ifndef(WITH_SMOOTHWAVE)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_SMOOTHWAVE to enable Smoothwave Video plugin'
+.endif
+.ifndef(WITH_SPEEX)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_SPEEX to enable Speex Video plugin'
+.endif
 .ifndef(WITH_SWFDEC)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_SWFDEC to enable Flash Video plugin'
@@ -794,9 +907,9 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_VORBIS to enable vorbis Audio plugin'
 .endif
-.ifndef(WITH_XMMS)
+.ifndef(WITH_VORBISIDEC)
 	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_XMMS to enable xmms Audio plugin'
+	@${ECHO_MSG} '===> Define WITH_VORBISIDEC to enable vorbisidec Audio plugin'
 .endif
 .ifndef(WITH_XVID)
 	@${ECHO_MSG} '===>'
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 9a049a98c..71d570edc 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gst-plugins-0.7.4.tar.bz2) = 7df9f07a7766cec2184b394565dd1381
-SIZE (gnome2/gst-plugins-0.7.4.tar.bz2) = 2548004
+MD5 (gnome2/gst-plugins-0.7.5.tar.bz2) = c2185234eeedab53547d57e030d902fc
+SIZE (gnome2/gst-plugins-0.7.5.tar.bz2) = 1742064
diff --git a/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure b/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure
deleted file mode 100644
index f4c1cb8ae..000000000
--- a/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- gst-libs/ext/ffmpeg/ffmpeg/configure.bak	Sat Sep 27 18:39:42 2003
-+++ gst-libs/ext/ffmpeg/ffmpeg/configure	Sat Sep 27 19:53:52 2003
-@@ -119,6 +119,7 @@
- v4l="no"
- audio_oss="yes"
- make="gmake"
-+CFLAGS="$CFLAGS -fPIC -DPIC"
- LDFLAGS="$LDFLAGS -export-dynamic"
- ;;
- BSD/OS)
diff --git a/multimedia/gstreamer-plugins/files/patch-configure b/multimedia/gstreamer-plugins/files/patch-configure
new file mode 100644
index 000000000..de19ee0c6
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Feb 11 19:13:23 2004
++++ configure	Wed Feb 11 19:13:58 2004
+@@ -44295,7 +44295,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltheora  $LIBS"
++LIBS="-ltheora  -logg $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
diff --git a/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h b/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h
new file mode 100644
index 000000000..90d39a1a2
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h
@@ -0,0 +1,103 @@
+--- /dev/null	Thu Feb 12 22:22:00 2004
++++ ext/ivorbis/vorbisenc.h	Thu Feb 12 22:24:08 2004
+@@ -0,0 +1,100 @@
++/* GStreamer
++ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++
++#ifndef __VORBISENC_H__
++#define __VORBISENC_H__
++
++
++#include <gst/gst.h>
++
++#include <tremor/ivorbiscodec.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++#define GST_TYPE_VORBISENC \
++  (vorbisenc_get_type())
++#define GST_VORBISENC(obj) \
++  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc))
++#define GST_VORBISENC_CLASS(klass) \
++  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass))
++#define GST_IS_VORBISENC(obj) \
++  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC))
++#define GST_IS_VORBISENC_CLASS(obj) \
++  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC))
++
++typedef struct _VorbisEnc VorbisEnc;
++typedef struct _VorbisEncClass VorbisEncClass;
++
++struct _VorbisEnc {
++  GstElement 	   element;
++
++  GstPad          *sinkpad,
++                  *srcpad;
++
++  ogg_stream_state os; /* take physical pages, weld into a logical
++			                              stream of packets */
++  ogg_page         og; /* one Ogg bitstream page.  Vorbis packets are inside */
++  ogg_packet       op; /* one raw packet of data for decode */
++
++  vorbis_info      vi; /* struct that stores all the static vorbis bitstream
++				                            settings */
++  vorbis_comment   vc; /* struct that stores all the user comments */
++
++  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
++  vorbis_block     vb; /* local working space for packet->PCM decode */
++
++  gboolean         eos;
++
++  gboolean         managed;
++  gint             bitrate;
++  gint             min_bitrate;
++  gint             max_bitrate;
++  gfloat           quality;
++  gboolean	   quality_set;
++  gint             serial;
++
++  gint             channels;
++  gint             frequency;
++
++  guint64	   samples_in;
++  guint64	   bytes_out;
++
++  GstCaps         *metadata;
++
++  gboolean         setup;
++  gboolean         flush_header;
++  gchar		  *last_message;
++};
++
++struct _VorbisEncClass {
++  GstElementClass parent_class;
++};
++
++GType vorbisenc_get_type(void);
++
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++
++#endif /* __VORBISENC_H__ */
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_ffmpeg_gstffmpegcodecmap.c b/multimedia/gstreamer-plugins/files/patch-ext_ffmpeg_gstffmpegcodecmap.c
deleted file mode 100644
index 180258708..000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext_ffmpeg_gstffmpegcodecmap.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- ext/ffmpeg/gstffmpegcodecmap.c.orig	Fri Feb  6 15:29:09 2004
-+++ ext/ffmpeg/gstffmpegcodecmap.c	Fri Feb  6 15:40:14 2004
-@@ -44,13 +44,13 @@
- 	"width",     G_TYPE_INT,   context->width,	      	\
- 	"height",    G_TYPE_INT,   context->height,	  	\
- 	"framerate", G_TYPE_DOUBLE, 1. * context->frame_rate /  \
--				   context->frame_rate_base,    \
-+				   context->frame_rate_base ,    \
- 	##props, NULL)	  					\
-     :	  							\
-     gst_caps_new_simple (mimetype,			      	\
- 	"width",     GST_TYPE_INT_RANGE, 16, 4096,      	\
- 	"height",    GST_TYPE_INT_RANGE, 16, 4096,	      	\
--	"framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE,	\
-+	"framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE ,	\
- 	##props, NULL)
- 
- /* same for audio - now with channels/sample rate
-@@ -60,10 +60,10 @@
-     (context != NULL) ?					      	\
-     gst_caps_new_simple (mimetype,	      			\
- 	"rate", G_TYPE_INT, context->sample_rate,		\
--	"channels", G_TYPE_INT, context->channels,		\
-+	"channels", G_TYPE_INT, context->channels ,		\
- 	##props, NULL)						\
-     :								\
--    gst_caps_new_simple (mimetype,	      			\
-+    gst_caps_new_simple (mimetype ,	      			\
- 	##props, NULL)
- 
- /* Convert a FFMPEG codec ID and optional AVCodecContext
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_flac_gstflacenc.c b/multimedia/gstreamer-plugins/files/patch-ext_flac_gstflacenc.c
deleted file mode 100644
index b42b35cb7..000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext_flac_gstflacenc.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/flac/gstflacenc.c.orig	Fri Feb  6 15:43:38 2004
-+++ ext/flac/gstflacenc.c	Fri Feb  6 16:15:23 2004
-@@ -575,7 +575,7 @@
-     gst_flacenc_set_metadata (flacenc);
-     state = FLAC__seekable_stream_encoder_init (flacenc->encoder);
-     if (state != FLAC__STREAM_ENCODER_OK) {
--      GST_ELEMENT_ERROR (flacenc, LIBRARY, INIT, NULL,
-+      GST_ELEMENT_ERROR (flacenc, LIBRARY, INIT, (NULL),
- 		         ("could not initialize encoder (wrong parameters?)"));
-       return;
-     }
-@@ -610,7 +610,7 @@
-   flacenc->data = NULL;
- 
-   if (!res) {
--    GST_ELEMENT_ERROR (flacenc, STREAM, ENCODE, NULL, NULL);
-+    GST_ELEMENT_ERROR (flacenc, STREAM, ENCODE, (NULL), (NULL));
-   }
- }
- 
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
deleted file mode 100644
index 3b293cd85..000000000
--- a/multimedia/gstreamer-plugins/files/patch-gst-libs_ext_ffmpeg_Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
---- gst-libs/ext/ffmpeg/Makefile.in.orig	Sat Feb 21 18:56:31 2004
-+++ gst-libs/ext/ffmpeg/Makefile.in	Sat Feb 21 19:04:32 2004
-@@ -532,15 +532,12 @@
-  $(defs_powerpc) \
-  -DTUNECPU=generic \
-  -DHAVE_STRPTIME=1 \
-- -DHAVE_LRINTF=1 \
-  -DCONFIG_ENCODERS=1 \
-  -DCONFIG_DECODERS=1 \
-  -DCONFIG_PP=1 \
-  -DCONFIG_MPEGAUDIO_HP=1 \
-  -DCONFIG_HAVE_DLOPEN=1 \
-  -DCONFIG_HAVE_DLFCN=1 \
-- -DHAVE_MALLOC_H=1 \
-- -DHAVE_MEMALIGN=1 \
-  -DSIMPLE_IDCT=1 \
-  -DCONFIG_RISKY=1
- 
-@@ -904,7 +901,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 \
--	libavformat_la-grab.lo libavformat_la-idcin.lo \
-+	libavformat_la-idcin.lo \
- 	libavformat_la-idroq.lo libavformat_la-img.lo \
- 	libavformat_la-ipmovie.lo libavformat_la-jpeg.lo \
- 	libavformat_la-mov.lo libavformat_la-movenc.lo \
-@@ -5697,7 +5694,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/files/patch-gst_audioconvert_gstaudioconvert.c b/multimedia/gstreamer-plugins/files/patch-gst_audioconvert_gstaudioconvert.c
new file mode 100644
index 000000000..8689da3dd
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-gst_audioconvert_gstaudioconvert.c
@@ -0,0 +1,11 @@
+--- gst/audioconvert/gstaudioconvert.c.orig	Thu Feb 26 19:35:40 2004
++++ gst/audioconvert/gstaudioconvert.c	Thu Feb 26 19:36:33 2004
+@@ -242,7 +242,7 @@
+ 
+   if (!gst_pad_is_negotiated (this->sink))
+   {
+-    GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL,
++    GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, (NULL),
+                        ("Sink pad not negotiated before chain function"));
+     return;
+   }
diff --git a/multimedia/gstreamer-plugins/files/patch-gst_interleave_deinterleave.c b/multimedia/gstreamer-plugins/files/patch-gst_interleave_deinterleave.c
new file mode 100644
index 000000000..7ca0cf7e8
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-gst_interleave_deinterleave.c
@@ -0,0 +1,11 @@
+--- gst/interleave/deinterleave.c.orig	Thu Feb 26 19:41:29 2004
++++ gst/interleave/deinterleave.c	Thu Feb 26 19:41:38 2004
+@@ -379,7 +379,7 @@
+   }
+ 
+   if (this->channels == 0) {
+-    GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL,
++    GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, (NULL),
+                        ("format wasn't negotiated before chain function"));
+     return;
+   } else if (this->channels == 1) {
diff --git a/multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c b/multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c
new file mode 100644
index 000000000..2997fd823
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c
@@ -0,0 +1,29 @@
+--- gst/interleave/interleave.c.orig	Thu Feb 26 19:40:04 2004
++++ gst/interleave/interleave.c	Thu Feb 26 19:40:44 2004
+@@ -25,7 +25,7 @@
+ #include "config.h"
+ #endif
+ 
+-#include <alloca.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <gst/gst.h>
+ #include <gst/audio/audio.h>
+@@ -414,7 +414,7 @@
+   data_in = alloca (this->numchannels * sizeof (gpointer));
+   
+   if (!this->channels) {
+-    GST_ELEMENT_ERROR (element, CORE, PAD, NULL,
++    GST_ELEMENT_ERROR (element, CORE, PAD, (NULL),
+                        ("interleave: at least one sink pad needs to be connected"));
+     return;
+   }
+@@ -487,7 +487,7 @@
+ static void
+ interleave_bytestream_loop (GstElement *element)
+ {
+-  GST_ELEMENT_ERROR (element, CORE, NOT_IMPLEMENTED, NULL,
++  GST_ELEMENT_ERROR (element, CORE, NOT_IMPLEMENTED, (NULL),
+                      ("interleave: unbuffered mode is not yet implemented"));
+ 
+   /* Should look the same as the buffered loop, except that getting the data is
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
new file mode 100644
index 000000000..d6d605dea
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
@@ -0,0 +1,72 @@
+--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig	Mon Dec  8 21:01:50 2003
++++ sys/cdrom/gstcdplayer_ioctl_bsd.h	Mon Dec  8 23:13:54 2003
+@@ -139,6 +139,7 @@
+ {
+ 	struct ioc_toc_header toc_header;
+ 	struct ioc_read_toc_entry toc_entry;
++	struct cd_toc_entry toc_entry_data;
+ 	guint i;
+ 
+ 	cd->fd = open(device,O_RDONLY | O_NONBLOCK);
+@@ -148,7 +149,7 @@
+ 	}
+ 
+ 	/* get the toc header information */
+-	if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) {
++	if (ioctl(cd->fd,CDIOREADTOCHEADER,&toc_header) != 0) {
+ 		close(cd->fd);
+ 		cd->fd = -1;
+ 		return FALSE;
+@@ -158,6 +159,8 @@
+ 	for (i = 1; i <= toc_header.ending_track; i++) {
+ 		toc_entry.address_format = CD_MSF_FORMAT;
+ 		toc_entry.starting_track = i;
++		toc_entry.data = &toc_entry_data;
++		toc_entry.data_len = sizeof(toc_entry_data);
+ 
+ 		if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) {
+ 			close(cd->fd);
+@@ -165,9 +168,9 @@
+ 			return FALSE;
+ 		}
+ 
+-		cd->tracks[i].minute = toc_entry.entry.addr.msf.minute;
+-		cd->tracks[i].second = toc_entry.entry.addr.msf.second;
+-		cd->tracks[i].frame = toc_entry.entry.addr.msf.frame;
++		cd->tracks[i].minute = toc_entry.data->addr.msf.minute;
++		cd->tracks[i].second = toc_entry.data->addr.msf.second;
++		cd->tracks[i].frame = toc_entry.data->addr.msf.frame;
+ 		cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4;
+ 	}
+ 
+@@ -183,9 +186,9 @@
+ 		return FALSE;
+ 	}
+ 
+-	cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute;
+-	cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second;
+-	cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame;
++	cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute;
++	cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second;
++	cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame;
+ 
+ 	cd->num_tracks = toc_header.ending_track;
+ 
+@@ -221,6 +224,8 @@
+ 		return FALSE;
+ 	}
+ 
++	/* lets return TRUE and lets see what happes (may not be correct)*/
++	return TRUE;
+ }
+ 
+ gboolean cd_pause(struct cd *cd)
+@@ -318,7 +323,7 @@
+ 		return -1;
+ 	}
+ 
+-	return sub_channel.data->track_number;
++	return sub_channel.data->what.track_info.track_number;
+ }
+ 
+ gboolean cd_close(struct cd *cd)
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index c00706340..a913feb56 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -1,10 +1,10 @@
 bin/gst-launch-ext-%%VERSION%%
 bin/gst-visualise-%%VERSION%%
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/default/%gconf.xml
-etc/gconf/schemas/gstreamer.schemas
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/default/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/default/%gconf.xml
+etc/gconf/schemas/gstreamer-%%VERSION%%.schemas
 include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h
 include/gstreamer-%%VERSION%%/gst/audio/audioclock.h
 include/gstreamer-%%VERSION%%/gst/audio/audio.h
@@ -52,7 +52,9 @@ lib/gstreamer-%%VERSION%%/libgstaudio.so
 lib/gstreamer-%%VERSION%%/libgstaudioscale.so
 lib/gstreamer-%%VERSION%%/libgstauparse.so
 lib/gstreamer-%%VERSION%%/libgstavi.so
+%%LIBCACA%%lib/gstreamer-%%VERSION%%/libgstcacasink.so
 %%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so
+lib/gstreamer-0.7/libgstcdplayer.so
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
 lib/gstreamer-%%VERSION%%/libgstchart.so
 %%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so
@@ -64,21 +66,22 @@ lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
 lib/gstreamer-%%VERSION%%/libgstefence.so
 lib/gstreamer-%%VERSION%%/libgsteffectv.so
 %%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesd.so
+%%FAAD%%lib/gstreamer-%%VERSION%%/libgstfaad.so
 lib/gstreamer-%%VERSION%%/libgstfestival.so
-lib/gstreamer-%%VERSION%%/libgstffmpeg.so
 lib/gstreamer-%%VERSION%%/libgstfilter.so
 %%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so
 lib/gstreamer-%%VERSION%%/libgstflxdec.so
 lib/gstreamer-%%VERSION%%/libgstgamma.so
-lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so
+%%GDKPIXBUF%%lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so
 %%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfs.so
 lib/gstreamer-%%VERSION%%/libgstgoom.so
 %%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so
 %%HERMES%%lib/gstreamer-%%VERSION%%/libgsthermescolorspace.so
 %%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so
 lib/gstreamer-%%VERSION%%/libgstidct.so
-lib/gstreamer-%%VERSION%%/libgstintfloat.so
 lib/gstreamer-%%VERSION%%/libgstid3types.so
+lib/gstreamer-%%VERSION%%/libgstinterleave.so
+%%IVORBIS%%lib/gstreamer-0.7/libgstivorbis.so
 %%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so
 %%LADSPA%%lib/gstreamer-%%VERSION%%/libgstladspa.so
 %%LAME%%lib/gstreamer-%%VERSION%%/libgstlame.so
@@ -88,7 +91,6 @@ lib/gstreamer-%%VERSION%%/libgstlevel.so
 lib/gstreamer-%%VERSION%%/libgstmatroska.so
 lib/gstreamer-%%VERSION%%/libgstmedian.so
 %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so
-lib/gstreamer-%%VERSION%%/libgstmodplug.a
 lib/gstreamer-%%VERSION%%/libgstmodplug.so
 lib/gstreamer-%%VERSION%%/libgstmonoscope.so
 lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
@@ -101,11 +103,7 @@ lib/gstreamer-%%VERSION%%/libgstmpegstream.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
-%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedemux.so
-%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimetypes.so
 %%OSS%%lib/gstreamer-%%VERSION%%/libgstossaudio.so
 lib/gstreamer-%%VERSION%%/libgstpassthrough.so
 lib/gstreamer-%%VERSION%%/libgstplayondemand.so
@@ -121,10 +119,11 @@ lib/gstreamer-%%VERSION%%/libgstrtp.so
 %%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.so
 lib/gstreamer-%%VERSION%%/libgstsilence.so
 lib/gstreamer-%%VERSION%%/libgstsinesrc.so
-lib/gstreamer-%%VERSION%%/libgstsmoothwave.so
+%%SMOOTHWAVE%%lib/gstreamer-%%VERSION%%/libgstsmoothwave.so
 lib/gstreamer-%%VERSION%%/libgstsmooth.so
 lib/gstreamer-%%VERSION%%/libgstsmpte.so
 %%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so
+%%LIBSNDFILE%%lib/gstreamer-0.7/libgstsndfile.so
 lib/gstreamer-%%VERSION%%/libgstspectrum.so
 lib/gstreamer-%%VERSION%%/libgstspeed.so
 %%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so
@@ -135,6 +134,7 @@ lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
 lib/gstreamer-%%VERSION%%/libgsttagediting.so
 lib/gstreamer-%%VERSION%%/libgsttcp.so
 lib/gstreamer-%%VERSION%%/libgsttextoverlay.so
+%%LIBTHEORA%%lib/gstreamer-%%VERSION%%/libgsttheora.so
 lib/gstreamer-%%VERSION%%/libgsttimeoverlay.so
 lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so
 lib/gstreamer-%%VERSION%%/libgstudp.so
@@ -195,10 +195,10 @@ share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 @dirrm include/gstreamer-%%VERSION%%/gst/floatcast
 @dirrm include/gstreamer-%%VERSION%%/gst/colorbalance
 @dirrm include/gstreamer-%%VERSION%%/gst/audio
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/default
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer
+@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/default
+@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/default
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%
 @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 || true
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 4288f827a..863acac1b 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.7.4
-PORTREVISION=	1
+PORTVERSION=	0.7.5
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gst-plugins/0.7
@@ -18,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.6:${PORTSDIR}/multimedia/gstreamer \
+LIB_DEPENDS=	gstreamer-0.7.7:${PORTSDIR}/multimedia/gstreamer \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_X_PREFIX=	yes
@@ -33,13 +32,32 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tests \
 		--disable-alsa \
-		--disable-cdrom \
+		--enable-cdrom \
 		--disable-mjpegtools \
+		--disable-divx \
+		--disable-dxr3 \
+		--disable-http \
 		--disable-qcam \
+		--disable-raw1394 \
 		--disable-v4l2 \
 		--disable-v4l \
+		--disable-vcd \
 		--disable-dependency-tracking \
+		--enable-xshm \
 		--enable-static
+
+# list of plugins that need some work in one way or the other to work
+# probable the lib needs to be ported, disable them for now.
+CONFIGURE_ARGS+=--disable-mas \
+		--disable-faac \
+		--disable-jack \
+		--disable-nas \
+		--disable-tarkin \
+		--disable-lcs \
+		--disable-mplex \
+		--disable-shout2 \
+		--disable-librfb
+
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
@@ -50,18 +68,17 @@ PLIST_SUB=	\
 		SHLIB_VERSION="${SHLIB_VERSION}"
 INSTALLS_SHLIB=	yes
 
-# for esound detection
+# for various GNOME-related component detection
 WANT_GNOME=	yes
 
 MAN1=	gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1
 
 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
 SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
-XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
 GST_VERSION=${PORTVERSION:C/..$//}
 
 # library minor number
-SHLIB_VERSION=  2
+SHLIB_VERSION=	2
 
 post-patch:
 # as of this writing, FreeBSD does not support lrint* C99 math functions
@@ -87,34 +104,17 @@ post-patch:
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|; \
 		s|stdint\.h|inttypes.h|'
-# use GMAKE, not MAKE
-	@${REINPLACE_CMD} -E -e \
-		's|make|${GMAKE}|' \
-		${WRKSRC}/gst-libs/ext/ffmpeg/Makefile.in
 # force libaudiofile detection
 	@${REINPLACE_CMD} -E -e \
 		's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
-post-configure:
-# CC safeness
-	@${ECHO_CMD} "CC=${CC}" >> \
-		${WRKSRC}/gst-libs/ext/ffmpeg/ffmpeg/config.mak
-	@${MKDIR} ${WRKSRC}/gst-libs/ext/ffmpeg/.deps
-	@${RM} -f ${WRKSRC}/gst-libs/ext/ffmpeg/patch/*.bak
-
 post-install:
 # register plugins
 	-@${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
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
-EXTRA_PATCHES=	${FILESDIR}/ia64-patch-ffmpeg::configure
-.endif
-
 # hermes is required for gstreamer-player to work
 # since it is currently the only colorspace plugin available
 WITH_HERMES=	yes
@@ -137,11 +137,6 @@ WITH_AALIB=yes
 WITH_ARTS=yes
 .endif
 
-# avifile
-.if exists(${LOCALBASE}/lib/libaviplay.a)
-WITH_AVIFILE=yes
-.endif
-
 # cdparanoia
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
 WITH_CDPARANOIA=yes
@@ -152,6 +147,11 @@ WITH_CDPARANOIA=yes
 WITH_ESOUND=yes
 .endif
 
+# faad
+.if exists(${LOCALBASE}/lib/libfaad.a)
+WITH_FAAD=yes
+.endif
+
 # flac
 .if exists(${LOCALBASE}/lib/libFLAC.a)
 WITH_FLAC=yes
@@ -162,6 +162,11 @@ WITH_FLAC=yes
 WITH_FREETYPE=yes
 .endif
 
+# gdkpixbuf
+.if ${HAVE_GNOME:Mgtk20}!=""
+WITH_GDKPIXBUF=yes
+.endif
+
 # lame
 .if exists(${LOCALBASE}/lib/libmp3lame.a)
 WITH_LAME=yes
@@ -172,6 +177,11 @@ WITH_LAME=yes
 WITH_GNOMEVFS=yes
 .endif
 
+# libcaca
+.if exists(${LOCALBASE}/lib/libcaca.a)
+WITH_LIBCACA=yes
+.endif
+
 # gsm
 .if exists(${LOCALBASE}/lib/libgsm.a)
 WITH_GSM=yes
@@ -232,8 +242,13 @@ WITH_LIBMIKMOD=yes
 WITH_LIBMPEG2=yes
 .endif
 
+# libmusicbrainz
+.if exists(${LOCALBASE}/lib/libmusicbrainz.a)
+WITH_LIBMUSICBRAINZ=yes
+.endif
+
 # libshout
-.if exists(${LOCALBASE}/lib/libshout.a)
+.if exists(${LOCALBASE}/lib/libshout.so.2)
 WITH_LIBSHOUT=yes
 .endif
 
@@ -242,6 +257,16 @@ WITH_LIBSHOUT=yes
 WITH_LIBSIDPLAY=yes
 .endif
 
+# libsndfile
+.if exists(${LOCALBASE}/lib/libsndfile.a)
+WITH_LIBSNDFILE=yes
+.endif
+
+# libtheora
+.if exists(${LOCALBASE}/lib/libtheora.a)
+WITH_LIBTHEORA=yes
+.endif
+
 # mad
 .if exists(${LOCALBASE}/lib/libmad.a)
 WITH_MAD=yes
@@ -252,9 +277,9 @@ WITH_MAD=yes
 WITH_OGG=yes
 .endif
 
-# openquicktime
-.if exists(${LOCALBASE}/lib/libopenquicktime.so)
-WITH_OPENQUICKTIME=yes
+# pango
+.if exists(${X11BASE}/lib/libpangoft2-1.0.a)
+WITH_PANGO=yes
 .endif
 
 # png
@@ -267,6 +292,16 @@ WITH_PNG=yes
 WITH_SDL=yes
 .endif
 
+# smoothwave
+.if exists(${X11BASE}/lib/libgtk-x11-2.0.a)
+WITH_SMOOTHWAVE=yes
+.endif
+
+# speex
+.if exists(${LOCALBASE}/lib/libspeex.a)
+WITH_SPEEX=yes
+.endif
+
 # swfdec
 .if exists(${X11BASE}/lib/libswfdec.a)
 WITH_SWFDEC=yes
@@ -277,9 +312,9 @@ WITH_SWFDEC=yes
 WITH_VORBIS=yes
 .endif
 
-# xmms
-.if exists(${X11BASE}/lib/libxmms.a)
-#WITH_XMMS=yes
+# vorbisidec
+.if exists(${LOCALBASE}/lib/libvorbisidec.a)
+WITH_VORBISIDEC=yes
 .endif
 
 # xvid
@@ -318,16 +353,6 @@ CONFIGURE_ARGS+=	--with-arts-prefix=${LOCALBASE} \
 PLIST_SUB+=	ARTS=""
 .endif
 
-# avifile
-.ifndef(WITH_AVIFILE)
-CONFIGURE_ARGS+=	--disable-avifile
-PLIST_SUB+=	AVIFILE="@comment "
-.else
-LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
-
-PLIST_SUB+=	AVIFILE=""
-.endif
-
 # cdparanoia
 .ifndef(WITH_CDPARANOIA)
 CONFIGURE_ARGS+=	--disable-cdparanoia
@@ -350,6 +375,15 @@ CONFIGURE_ARGS+=	--with-esd-prefix=${LOCALBASE}  \
 PLIST_SUB+=	ESOUND=""
 .endif
 
+# faad
+.ifndef(WITH_FAAD)
+CONFIGURE_ARGS+=	--disable-faad
+PLIST_SUB+=	FAAD="@comment "
+.else
+LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/libfaad
+PLIST_SUB+=	FAAD=""
+.endif
+
 # flac
 .ifndef(WITH_FLAC)
 CONFIGURE_ARGS+=	--disable-flac
@@ -372,6 +406,15 @@ CONFIGURE_ARGS+=	--with-ft-prefix=${LOCALBASE}  \
 PLIST_SUB+=	FREETYPE=""
 .endif
 
+# gdkpixbuf
+.ifndef(WITH_GDKPIXBUF)
+CONFIGURE_ARGS+=	--disable-gdk_pixbuf
+PLIST_SUB+=	GDKPIXBUF="@comment "
+.else
+USE_GNOME+=	gtk20
+PLIST_SUB+=	GDKPIXBUF=""
+.endif
+
 # gnomevfs
 .ifndef(WITH_GNOMEVFS)
 CONFIGURE_ARGS+=	--disable-gnome_vfs
@@ -460,6 +503,15 @@ LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 PLIST_SUB+=	LIBAUDIOFILE=""
 .endif
 
+# libcaca
+.ifndef(WITH_LIBCACA)
+CONFIGURE_ARGS+=	--disable-libcaca
+PLIST_SUB+=	LIBCACA="@comment "
+.else
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+PLIST_SUB+=	LIBCACA=""
+.endif
+
 # libdv
 .ifndef(WITH_LIBDV)
 CONFIGURE_ARGS+=	--disable-libdv
@@ -527,6 +579,17 @@ CONFIGURE_ARGS+=	--with-mpeg2dec-prefix=${LOCALBASE}
 PLIST_SUB+=	LIBMPEG2=""
 .endif
 
+# libmusicbrainz
+# the musicbrainz people need to release a new version to get this to work
+# .ifndef(WITH_LIBMUSICBRAINZ)
+CONFIGURE_ARGS+=	--disable-musicbrainz
+.undef WITH_LIBMUSICBRAINZ
+#PLIST_SUB+=	LIBMUSICBRAINZ="@comment "
+#.else
+#LIB_DEPENDS+=	libmusicbrainz.3:${PORTSDIR}/audio/libmusicbrainz
+#PLIST_SUB+=	LIBMUSICBRAINZ=""
+#.endif
+
 # libshout
 .ifndef(WITH_LIBSHOUT)
 CONFIGURE_ARGS+=	--disable-shout
@@ -547,6 +610,24 @@ LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
 PLIST_SUB+=	LIBSIDPLAY=""
 .endif
 
+# libsndfile
+.ifndef(WITH_LIBSNDFILE)
+CONFIGURE_ARGS+=	--disable-sndfile
+PLIST_SUB+=	LIBSNDFILE="@comment "
+.else
+LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+PLIST_SUB+=	LIBSNDFILE=""
+.endif
+
+# libtheora
+.ifndef(WITH_LIBTHEORA)
+CONFIGURE_ARGS+=	--disable-theora
+PLIST_SUB+=	LIBTHEORA="@comment "
+.else
+LIB_DEPENDS+=	theora.0:${PORTSDIR}/audio/libtheora
+PLIST_SUB+=	LIBTHEORA=""
+.endif
+
 # mad
 .ifndef(WITH_MAD)
 CONFIGURE_ARGS+=	--disable-mad
@@ -568,16 +649,6 @@ LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
 PLIST_SUB+=	OGG=""
 .endif
 
-# openquicktime
-.ifndef(WITH_OPENQUICKTIME)
-CONFIGURE_ARGS+=	--disable-openquicktime
-PLIST_SUB+=	OPENQUICKTIME="@comment "
-.else
-LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
-
-PLIST_SUB+=	OPENQUICKTIME=""
-.endif
-
 # oss
 .ifdef(WITHOUT_OSS)
 CONFIGURE_ARGS+=	--disable-oss
@@ -586,6 +657,15 @@ PLIST_SUB+=	OSS="@comment "
 PLIST_SUB+=	OSS=""
 .endif
 
+# pango
+.ifndef(WITH_PANGO)
+CONFIGURE_ARGS+=	--disable-pango
+PLIST_SUB+=	PANGO="@comment "
+.else
+USE_GNOME+=	pango
+PLIST_SUB+=	PANGO=""
+.endif
+
 # png
 .ifndef(WITH_PNG)
 CONFIGURE_ARGS+=	--disable-libpng
@@ -610,6 +690,15 @@ CONFIGURE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
 PLIST_SUB+=	SDL=""
 .endif
 
+# smoothwave
+.ifndef(WITH_SMOOTHWAVE)
+CONFIGURE_ARGS+=	--disable-smoothwave
+PLIST_SUB+=	SMOOTHWAVE="@comment "
+.else
+USE_GNOME+=	gtk20
+PLIST_SUB+=	SMOOTHWAVE=""
+.endif
+
 # speex
 .ifndef(WITH_SPEEX)
 CONFIGURE_ARGS+=	--disable-speex
@@ -644,17 +733,13 @@ CONFIGURE_ARGS+=	--with-vorbis=${LOCALBASE} \
 PLIST_SUB+=	VORBIS=""
 .endif
 
-# xmms
-.ifndef(WITH_XMMS)
-CONFIGURE_ARGS+=	--disable-xmms
-PLIST_SUB+=	XMMS="@comment "
+# vorbisidec
+.ifndef(WITH_VORBISIDEC)
+CONFIGURE_ARGS+=	--disable-ivorbis
+PLIST_SUB+=	IVORBIS="@comment "
 .else
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
-
-CONFIGURE_ARGS+=	--with-xmms-prefix=${X11BASE} \
-			--with-xmms-exec-prefix=${X11BASE}
-CONFIGURE_ENV+=		XMMS_CONFIG=${XMMS_CONFIG}
-PLIST_SUB+=	XMMS=""
+LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
+PLIST_SUB+=	IVORBIS=""
 .endif
 
 # xvid
@@ -678,10 +763,6 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_ARTS to enable aRts Audio plugin'
 .endif
-.ifndef(WITH_AVIFILE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin'
-.endif
 .ifndef(WITH_CDPARANOIA)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cdparanoia Audio plugin'
@@ -690,6 +771,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin'
 .endif
+.ifndef(WITH_FAAD)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_FAAD to enable faad Audio plugin'
+.endif
 .ifndef(WITH_FLAC)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_FLAC to enable flac Audio plugin'
@@ -698,6 +783,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_FREETYPE to enable freetype support'
 .endif
+.ifndef(WITH_GDKPIXBUF)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_GDKPIXBUF to enable gdk-pixbuf plugin'
+.endif
 .ifndef(WITH_GSM)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_GSM to enable gsm Audio plugin'
@@ -734,6 +823,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_LIBAUDIOFILE to enable libaudiofile Audio plugin'
 .endif
+.ifndef(WITH_LIBCACA)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_LIBCACA to enable libcaca Video plugin'
+.endif
 .ifndef(WITH_LIBDV)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_LIBDV to enable libdv Video plugin'
@@ -758,6 +851,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_LIBMPEG2 to enable libmpeg2 Video plugin'
 .endif
+.ifndef(WITH_LIBMUSICBRAINZ)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_LIBMUSICBRAINZ to enable libmusicbrainz Audio plugin'
+.endif
 .ifndef(WITH_LIBSHOUT)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_LIBSHOUT to enable libshout Audio plugin'
@@ -766,18 +863,26 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_LIBSIDPLAY to enable libsidplay Audio plugin'
 .endif
-.ifndef(WITH_MAD)
+.ifndef(WITH_LIBSNDFILE)
 	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin'
+	@${ECHO_MSG} '===> Define WITH_LIBSNDFILE to enable libsndfile Audio plugin'
 .endif
-.ifndef(WITH_OPENQUICKTIME)
+.ifndef(WITH_LIBTHEORA)
 	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_OPENQUICKTIME to enable openquicktime Video plugin'
+	@${ECHO_MSG} '===> Define WITH_LIBTHEORA to enable libtheora Video plugin'
+.endif
+.ifndef(WITH_MAD)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin'
 .endif
 .ifndef(WITHOUT_OSS)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITHOUT_OSS to disable OSS Audio plugin'
 .endif
+.ifndef(WITH_PANGO)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_PANGO to enable pango textoverlay plugin'
+.endif
 .ifndef(WITH_PNG)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_PNG to enable png Video plugin'
@@ -786,6 +891,14 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_SDL to enable SDL Video plugin'
 .endif
+.ifndef(WITH_SMOOTHWAVE)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_SMOOTHWAVE to enable Smoothwave Video plugin'
+.endif
+.ifndef(WITH_SPEEX)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_SPEEX to enable Speex Video plugin'
+.endif
 .ifndef(WITH_SWFDEC)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_SWFDEC to enable Flash Video plugin'
@@ -794,9 +907,9 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_VORBIS to enable vorbis Audio plugin'
 .endif
-.ifndef(WITH_XMMS)
+.ifndef(WITH_VORBISIDEC)
 	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_XMMS to enable xmms Audio plugin'
+	@${ECHO_MSG} '===> Define WITH_VORBISIDEC to enable vorbisidec Audio plugin'
 .endif
 .ifndef(WITH_XVID)
 	@${ECHO_MSG} '===>'
diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo
index 9a049a98c..71d570edc 100644
--- a/multimedia/gstreamer-plugins80/distinfo
+++ b/multimedia/gstreamer-plugins80/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gst-plugins-0.7.4.tar.bz2) = 7df9f07a7766cec2184b394565dd1381
-SIZE (gnome2/gst-plugins-0.7.4.tar.bz2) = 2548004
+MD5 (gnome2/gst-plugins-0.7.5.tar.bz2) = c2185234eeedab53547d57e030d902fc
+SIZE (gnome2/gst-plugins-0.7.5.tar.bz2) = 1742064
diff --git a/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure b/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure
deleted file mode 100644
index f4c1cb8ae..000000000
--- a/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- gst-libs/ext/ffmpeg/ffmpeg/configure.bak	Sat Sep 27 18:39:42 2003
-+++ gst-libs/ext/ffmpeg/ffmpeg/configure	Sat Sep 27 19:53:52 2003
-@@ -119,6 +119,7 @@
- v4l="no"
- audio_oss="yes"
- make="gmake"
-+CFLAGS="$CFLAGS -fPIC -DPIC"
- LDFLAGS="$LDFLAGS -export-dynamic"
- ;;
- BSD/OS)
diff --git a/multimedia/gstreamer-plugins80/files/patch-configure b/multimedia/gstreamer-plugins80/files/patch-configure
new file mode 100644
index 000000000..de19ee0c6
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Feb 11 19:13:23 2004
++++ configure	Wed Feb 11 19:13:58 2004
+@@ -44295,7 +44295,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltheora  $LIBS"
++LIBS="-ltheora  -logg $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h b/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h
new file mode 100644
index 000000000..90d39a1a2
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h
@@ -0,0 +1,103 @@
+--- /dev/null	Thu Feb 12 22:22:00 2004
++++ ext/ivorbis/vorbisenc.h	Thu Feb 12 22:24:08 2004
+@@ -0,0 +1,100 @@
++/* GStreamer
++ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++
++#ifndef __VORBISENC_H__
++#define __VORBISENC_H__
++
++
++#include <gst/gst.h>
++
++#include <tremor/ivorbiscodec.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++#define GST_TYPE_VORBISENC \
++  (vorbisenc_get_type())
++#define GST_VORBISENC(obj) \
++  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc))
++#define GST_VORBISENC_CLASS(klass) \
++  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass))
++#define GST_IS_VORBISENC(obj) \
++  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC))
++#define GST_IS_VORBISENC_CLASS(obj) \
++  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC))
++
++typedef struct _VorbisEnc VorbisEnc;
++typedef struct _VorbisEncClass VorbisEncClass;
++
++struct _VorbisEnc {
++  GstElement 	   element;
++
++  GstPad          *sinkpad,
++                  *srcpad;
++
++  ogg_stream_state os; /* take physical pages, weld into a logical
++			                              stream of packets */
++  ogg_page         og; /* one Ogg bitstream page.  Vorbis packets are inside */
++  ogg_packet       op; /* one raw packet of data for decode */
++
++  vorbis_info      vi; /* struct that stores all the static vorbis bitstream
++				                            settings */
++  vorbis_comment   vc; /* struct that stores all the user comments */
++
++  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
++  vorbis_block     vb; /* local working space for packet->PCM decode */
++
++  gboolean         eos;
++
++  gboolean         managed;
++  gint             bitrate;
++  gint             min_bitrate;
++  gint             max_bitrate;
++  gfloat           quality;
++  gboolean	   quality_set;
++  gint             serial;
++
++  gint             channels;
++  gint             frequency;
++
++  guint64	   samples_in;
++  guint64	   bytes_out;
++
++  GstCaps         *metadata;
++
++  gboolean         setup;
++  gboolean         flush_header;
++  gchar		  *last_message;
++};
++
++struct _VorbisEncClass {
++  GstElementClass parent_class;
++};
++
++GType vorbisenc_get_type(void);
++
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++
++#endif /* __VORBISENC_H__ */
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_ffmpeg_gstffmpegcodecmap.c b/multimedia/gstreamer-plugins80/files/patch-ext_ffmpeg_gstffmpegcodecmap.c
deleted file mode 100644
index 180258708..000000000
--- a/multimedia/gstreamer-plugins80/files/patch-ext_ffmpeg_gstffmpegcodecmap.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- ext/ffmpeg/gstffmpegcodecmap.c.orig	Fri Feb  6 15:29:09 2004
-+++ ext/ffmpeg/gstffmpegcodecmap.c	Fri Feb  6 15:40:14 2004
-@@ -44,13 +44,13 @@
- 	"width",     G_TYPE_INT,   context->width,	      	\
- 	"height",    G_TYPE_INT,   context->height,	  	\
- 	"framerate", G_TYPE_DOUBLE, 1. * context->frame_rate /  \
--				   context->frame_rate_base,    \
-+				   context->frame_rate_base ,    \
- 	##props, NULL)	  					\
-     :	  							\
-     gst_caps_new_simple (mimetype,			      	\
- 	"width",     GST_TYPE_INT_RANGE, 16, 4096,      	\
- 	"height",    GST_TYPE_INT_RANGE, 16, 4096,	      	\
--	"framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE,	\
-+	"framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE ,	\
- 	##props, NULL)
- 
- /* same for audio - now with channels/sample rate
-@@ -60,10 +60,10 @@
-     (context != NULL) ?					      	\
-     gst_caps_new_simple (mimetype,	      			\
- 	"rate", G_TYPE_INT, context->sample_rate,		\
--	"channels", G_TYPE_INT, context->channels,		\
-+	"channels", G_TYPE_INT, context->channels ,		\
- 	##props, NULL)						\
-     :								\
--    gst_caps_new_simple (mimetype,	      			\
-+    gst_caps_new_simple (mimetype ,	      			\
- 	##props, NULL)
- 
- /* Convert a FFMPEG codec ID and optional AVCodecContext
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_flac_gstflacenc.c b/multimedia/gstreamer-plugins80/files/patch-ext_flac_gstflacenc.c
deleted file mode 100644
index b42b35cb7..000000000
--- a/multimedia/gstreamer-plugins80/files/patch-ext_flac_gstflacenc.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/flac/gstflacenc.c.orig	Fri Feb  6 15:43:38 2004
-+++ ext/flac/gstflacenc.c	Fri Feb  6 16:15:23 2004
-@@ -575,7 +575,7 @@
-     gst_flacenc_set_metadata (flacenc);
-     state = FLAC__seekable_stream_encoder_init (flacenc->encoder);
-     if (state != FLAC__STREAM_ENCODER_OK) {
--      GST_ELEMENT_ERROR (flacenc, LIBRARY, INIT, NULL,
-+      GST_ELEMENT_ERROR (flacenc, LIBRARY, INIT, (NULL),
- 		         ("could not initialize encoder (wrong parameters?)"));
-       return;
-     }
-@@ -610,7 +610,7 @@
-   flacenc->data = NULL;
- 
-   if (!res) {
--    GST_ELEMENT_ERROR (flacenc, STREAM, ENCODE, NULL, NULL);
-+    GST_ELEMENT_ERROR (flacenc, STREAM, ENCODE, (NULL), (NULL));
-   }
- }
- 
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
deleted file mode 100644
index 3b293cd85..000000000
--- a/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
---- gst-libs/ext/ffmpeg/Makefile.in.orig	Sat Feb 21 18:56:31 2004
-+++ gst-libs/ext/ffmpeg/Makefile.in	Sat Feb 21 19:04:32 2004
-@@ -532,15 +532,12 @@
-  $(defs_powerpc) \
-  -DTUNECPU=generic \
-  -DHAVE_STRPTIME=1 \
-- -DHAVE_LRINTF=1 \
-  -DCONFIG_ENCODERS=1 \
-  -DCONFIG_DECODERS=1 \
-  -DCONFIG_PP=1 \
-  -DCONFIG_MPEGAUDIO_HP=1 \
-  -DCONFIG_HAVE_DLOPEN=1 \
-  -DCONFIG_HAVE_DLFCN=1 \
-- -DHAVE_MALLOC_H=1 \
-- -DHAVE_MEMALIGN=1 \
-  -DSIMPLE_IDCT=1 \
-  -DCONFIG_RISKY=1
- 
-@@ -904,7 +901,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 \
--	libavformat_la-grab.lo libavformat_la-idcin.lo \
-+	libavformat_la-idcin.lo \
- 	libavformat_la-idroq.lo libavformat_la-img.lo \
- 	libavformat_la-ipmovie.lo libavformat_la-jpeg.lo \
- 	libavformat_la-mov.lo libavformat_la-movenc.lo \
-@@ -5697,7 +5694,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/files/patch-gst_audioconvert_gstaudioconvert.c b/multimedia/gstreamer-plugins80/files/patch-gst_audioconvert_gstaudioconvert.c
new file mode 100644
index 000000000..8689da3dd
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-gst_audioconvert_gstaudioconvert.c
@@ -0,0 +1,11 @@
+--- gst/audioconvert/gstaudioconvert.c.orig	Thu Feb 26 19:35:40 2004
++++ gst/audioconvert/gstaudioconvert.c	Thu Feb 26 19:36:33 2004
+@@ -242,7 +242,7 @@
+ 
+   if (!gst_pad_is_negotiated (this->sink))
+   {
+-    GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL,
++    GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, (NULL),
+                        ("Sink pad not negotiated before chain function"));
+     return;
+   }
diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_interleave_deinterleave.c b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_deinterleave.c
new file mode 100644
index 000000000..7ca0cf7e8
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_deinterleave.c
@@ -0,0 +1,11 @@
+--- gst/interleave/deinterleave.c.orig	Thu Feb 26 19:41:29 2004
++++ gst/interleave/deinterleave.c	Thu Feb 26 19:41:38 2004
+@@ -379,7 +379,7 @@
+   }
+ 
+   if (this->channels == 0) {
+-    GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL,
++    GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, (NULL),
+                        ("format wasn't negotiated before chain function"));
+     return;
+   } else if (this->channels == 1) {
diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c
new file mode 100644
index 000000000..2997fd823
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c
@@ -0,0 +1,29 @@
+--- gst/interleave/interleave.c.orig	Thu Feb 26 19:40:04 2004
++++ gst/interleave/interleave.c	Thu Feb 26 19:40:44 2004
+@@ -25,7 +25,7 @@
+ #include "config.h"
+ #endif
+ 
+-#include <alloca.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <gst/gst.h>
+ #include <gst/audio/audio.h>
+@@ -414,7 +414,7 @@
+   data_in = alloca (this->numchannels * sizeof (gpointer));
+   
+   if (!this->channels) {
+-    GST_ELEMENT_ERROR (element, CORE, PAD, NULL,
++    GST_ELEMENT_ERROR (element, CORE, PAD, (NULL),
+                        ("interleave: at least one sink pad needs to be connected"));
+     return;
+   }
+@@ -487,7 +487,7 @@
+ static void
+ interleave_bytestream_loop (GstElement *element)
+ {
+-  GST_ELEMENT_ERROR (element, CORE, NOT_IMPLEMENTED, NULL,
++  GST_ELEMENT_ERROR (element, CORE, NOT_IMPLEMENTED, (NULL),
+                      ("interleave: unbuffered mode is not yet implemented"));
+ 
+   /* Should look the same as the buffered loop, except that getting the data is
diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
new file mode 100644
index 000000000..d6d605dea
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
@@ -0,0 +1,72 @@
+--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig	Mon Dec  8 21:01:50 2003
++++ sys/cdrom/gstcdplayer_ioctl_bsd.h	Mon Dec  8 23:13:54 2003
+@@ -139,6 +139,7 @@
+ {
+ 	struct ioc_toc_header toc_header;
+ 	struct ioc_read_toc_entry toc_entry;
++	struct cd_toc_entry toc_entry_data;
+ 	guint i;
+ 
+ 	cd->fd = open(device,O_RDONLY | O_NONBLOCK);
+@@ -148,7 +149,7 @@
+ 	}
+ 
+ 	/* get the toc header information */
+-	if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) {
++	if (ioctl(cd->fd,CDIOREADTOCHEADER,&toc_header) != 0) {
+ 		close(cd->fd);
+ 		cd->fd = -1;
+ 		return FALSE;
+@@ -158,6 +159,8 @@
+ 	for (i = 1; i <= toc_header.ending_track; i++) {
+ 		toc_entry.address_format = CD_MSF_FORMAT;
+ 		toc_entry.starting_track = i;
++		toc_entry.data = &toc_entry_data;
++		toc_entry.data_len = sizeof(toc_entry_data);
+ 
+ 		if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) {
+ 			close(cd->fd);
+@@ -165,9 +168,9 @@
+ 			return FALSE;
+ 		}
+ 
+-		cd->tracks[i].minute = toc_entry.entry.addr.msf.minute;
+-		cd->tracks[i].second = toc_entry.entry.addr.msf.second;
+-		cd->tracks[i].frame = toc_entry.entry.addr.msf.frame;
++		cd->tracks[i].minute = toc_entry.data->addr.msf.minute;
++		cd->tracks[i].second = toc_entry.data->addr.msf.second;
++		cd->tracks[i].frame = toc_entry.data->addr.msf.frame;
+ 		cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4;
+ 	}
+ 
+@@ -183,9 +186,9 @@
+ 		return FALSE;
+ 	}
+ 
+-	cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute;
+-	cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second;
+-	cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame;
++	cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute;
++	cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second;
++	cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame;
+ 
+ 	cd->num_tracks = toc_header.ending_track;
+ 
+@@ -221,6 +224,8 @@
+ 		return FALSE;
+ 	}
+ 
++	/* lets return TRUE and lets see what happes (may not be correct)*/
++	return TRUE;
+ }
+ 
+ gboolean cd_pause(struct cd *cd)
+@@ -318,7 +323,7 @@
+ 		return -1;
+ 	}
+ 
+-	return sub_channel.data->track_number;
++	return sub_channel.data->what.track_info.track_number;
+ }
+ 
+ gboolean cd_close(struct cd *cd)
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index c00706340..a913feb56 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -1,10 +1,10 @@
 bin/gst-launch-ext-%%VERSION%%
 bin/gst-visualise-%%VERSION%%
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/default/%gconf.xml
-etc/gconf/schemas/gstreamer.schemas
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/default/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/default/%gconf.xml
+etc/gconf/schemas/gstreamer-%%VERSION%%.schemas
 include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h
 include/gstreamer-%%VERSION%%/gst/audio/audioclock.h
 include/gstreamer-%%VERSION%%/gst/audio/audio.h
@@ -52,7 +52,9 @@ lib/gstreamer-%%VERSION%%/libgstaudio.so
 lib/gstreamer-%%VERSION%%/libgstaudioscale.so
 lib/gstreamer-%%VERSION%%/libgstauparse.so
 lib/gstreamer-%%VERSION%%/libgstavi.so
+%%LIBCACA%%lib/gstreamer-%%VERSION%%/libgstcacasink.so
 %%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so
+lib/gstreamer-0.7/libgstcdplayer.so
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
 lib/gstreamer-%%VERSION%%/libgstchart.so
 %%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so
@@ -64,21 +66,22 @@ lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
 lib/gstreamer-%%VERSION%%/libgstefence.so
 lib/gstreamer-%%VERSION%%/libgsteffectv.so
 %%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesd.so
+%%FAAD%%lib/gstreamer-%%VERSION%%/libgstfaad.so
 lib/gstreamer-%%VERSION%%/libgstfestival.so
-lib/gstreamer-%%VERSION%%/libgstffmpeg.so
 lib/gstreamer-%%VERSION%%/libgstfilter.so
 %%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so
 lib/gstreamer-%%VERSION%%/libgstflxdec.so
 lib/gstreamer-%%VERSION%%/libgstgamma.so
-lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so
+%%GDKPIXBUF%%lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so
 %%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfs.so
 lib/gstreamer-%%VERSION%%/libgstgoom.so
 %%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so
 %%HERMES%%lib/gstreamer-%%VERSION%%/libgsthermescolorspace.so
 %%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so
 lib/gstreamer-%%VERSION%%/libgstidct.so
-lib/gstreamer-%%VERSION%%/libgstintfloat.so
 lib/gstreamer-%%VERSION%%/libgstid3types.so
+lib/gstreamer-%%VERSION%%/libgstinterleave.so
+%%IVORBIS%%lib/gstreamer-0.7/libgstivorbis.so
 %%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so
 %%LADSPA%%lib/gstreamer-%%VERSION%%/libgstladspa.so
 %%LAME%%lib/gstreamer-%%VERSION%%/libgstlame.so
@@ -88,7 +91,6 @@ lib/gstreamer-%%VERSION%%/libgstlevel.so
 lib/gstreamer-%%VERSION%%/libgstmatroska.so
 lib/gstreamer-%%VERSION%%/libgstmedian.so
 %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so
-lib/gstreamer-%%VERSION%%/libgstmodplug.a
 lib/gstreamer-%%VERSION%%/libgstmodplug.so
 lib/gstreamer-%%VERSION%%/libgstmonoscope.so
 lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
@@ -101,11 +103,7 @@ lib/gstreamer-%%VERSION%%/libgstmpegstream.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
-%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedemux.so
-%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimetypes.so
 %%OSS%%lib/gstreamer-%%VERSION%%/libgstossaudio.so
 lib/gstreamer-%%VERSION%%/libgstpassthrough.so
 lib/gstreamer-%%VERSION%%/libgstplayondemand.so
@@ -121,10 +119,11 @@ lib/gstreamer-%%VERSION%%/libgstrtp.so
 %%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.so
 lib/gstreamer-%%VERSION%%/libgstsilence.so
 lib/gstreamer-%%VERSION%%/libgstsinesrc.so
-lib/gstreamer-%%VERSION%%/libgstsmoothwave.so
+%%SMOOTHWAVE%%lib/gstreamer-%%VERSION%%/libgstsmoothwave.so
 lib/gstreamer-%%VERSION%%/libgstsmooth.so
 lib/gstreamer-%%VERSION%%/libgstsmpte.so
 %%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so
+%%LIBSNDFILE%%lib/gstreamer-0.7/libgstsndfile.so
 lib/gstreamer-%%VERSION%%/libgstspectrum.so
 lib/gstreamer-%%VERSION%%/libgstspeed.so
 %%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so
@@ -135,6 +134,7 @@ lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
 lib/gstreamer-%%VERSION%%/libgsttagediting.so
 lib/gstreamer-%%VERSION%%/libgsttcp.so
 lib/gstreamer-%%VERSION%%/libgsttextoverlay.so
+%%LIBTHEORA%%lib/gstreamer-%%VERSION%%/libgsttheora.so
 lib/gstreamer-%%VERSION%%/libgsttimeoverlay.so
 lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so
 lib/gstreamer-%%VERSION%%/libgstudp.so
@@ -195,10 +195,10 @@ share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 @dirrm include/gstreamer-%%VERSION%%/gst/floatcast
 @dirrm include/gstreamer-%%VERSION%%/gst/colorbalance
 @dirrm include/gstreamer-%%VERSION%%/gst/audio
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/default
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer
+@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%/default
+@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer-%%VERSION%%
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%/default
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer-%%VERSION%%
 @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 || true