added patch

8 files changed, 189 insertions, 106 deletions

diff --git a/media-libs/gst-plugins/ChangeLog b/media-libs/gst-plugins/ChangeLog
index 50791312927c..91f99d47f18a 100644
--- a/media-libs/gst-plugins/ChangeLog
+++ b/media-libs/gst-plugins/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for media-libs/gst-plugins
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.27 2003/02/24 14:37:02 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.28 2003/02/27 12:41:07 foser Exp $
+
+*gst-plugins-0.6.0-r4 (27 Feb 2003)
+
+  27 Feb 2003; foser <foser@gentoo.org> gst-plugins-0.6.0-r4.ebuild :
+  Added mpeg detection disabling patch to ffmpeg plugin
+  Patch by <foser@gentoo.org>
 
 *gst-plugins-0.6.0-r3 (24 Feb 2003)
 
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.5.2 b/media-libs/gst-plugins/files/digest-gst-plugins-0.5.2
deleted file mode 100644
index d765ce3a8a7c..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0983ad64705b38b02a0c266a94bb4d5 gst-plugins-0.5.2.tar.bz2 1859340
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r4 b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r4
new file mode 100644
index 000000000000..8195a933e515
--- /dev/null
+++ b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r4
@@ -0,0 +1 @@
+MD5 6548e5cde239dff066f1eb5b9f62fec5 gst-plugins-0.6.0.tar.bz2 1876447
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.4.0-configure.patch b/media-libs/gst-plugins/files/gst-plugins-0.4.0-configure.patch
deleted file mode 100644
index 97eddbb8f66a..000000000000
--- a/media-libs/gst-plugins/files/gst-plugins-0.4.0-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Mon Jul  8 07:28:37 2002
-+++ configure	Mon Jul  8 07:32:39 2002
-@@ -12022,7 +12022,7 @@
-   if test "$AALIB_CONFIG" = "no" ; then
-     no_aalib=yes
-   else
--    AALIB_CFLAGS=`$AALIB_CONFIG $aalibconf_args --cflags`
-+    AALIB_CFLAGS=`$AALIB_CONFIG $aalibconf_args --cflags|sed s:-I/usr/include::`
-     AALIB_LIBS=`$AALIB_CONFIG $aalibconf_args --libs`
- 
-     aalib_major_version=`$AALIB_CONFIG $aalib_args --version | \
-@@ -14099,7 +14099,7 @@
-     HAVE_DVDNAV=no
-   else
-     DVDNAV_LIBS=`dvdnav-config --libs `
--    DVDNAV_CFLAGS=`dvdnav-config --cflags `
-+    DVDNAV_CFLAGS=`dvdnav-config --cflags |sed s:-I/usr/include::`
-     HAVE_DVDNAV=yes
-   fi
- 
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.5.0-never-return-on-oss-busy.patch b/media-libs/gst-plugins/files/gst-plugins-0.5.0-never-return-on-oss-busy.patch
deleted file mode 100644
index 9ec6a5545651..000000000000
--- a/media-libs/gst-plugins/files/gst-plugins-0.5.0-never-return-on-oss-busy.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- gst-plugins-0.5.0/sys/oss/gstosscommon.c.orig	2002-12-27 08:58:32.000000000 +0200
-+++ gst-plugins-0.5.0/sys/oss/gstosscommon.c	2002-12-27 09:01:44.000000000 +0200
-@@ -279,9 +279,23 @@
-   GST_INFO (GST_CAT_PLUGIN_INFO, "common: attempting to open sound device");
- 
-   /* first try to open the sound card */
--  /* FIXME: this code is dubious, why do we need to open and close this ?*/
-+  /* FIXME: This code is dubious, why do we need to open and close this ?
-+   *        For linux at least this causes the second open to never return
-+   *        if the device was already in use .. */
-+#ifndef __linux__
-   if (mode == GST_OSSCOMMON_WRITE) {
-+#endif
-     common->fd = open (common->device, O_WRONLY | O_NONBLOCK);
-+#ifdef __linux__
-+	if (common->fd >= 0) {
-+	  /* remove the non-blocking flag */
-+	  if(fcntl (common->fd, F_SETFL, 0) < 0) {
-+		*error = g_strdup_printf ("osscommon: Can't make filedescriptor blocking for %s",
-+				   common->device);
-+		return FALSE;
-+	  }
-+	}
-+#else
-     if (errno == EBUSY) {
-       g_warning ("osscommon: unable to open the sound device (in use ?)\n");
-     }
-@@ -295,9 +309,14 @@
-   else {
-     common->fd = open (common->device, O_RDONLY);
-   }
-+#endif
- 
-   if (common->fd < 0) {
-     switch (errno) {
-+	  case EBUSY:
-+	*error = g_strdup_printf ("osscommon: Unable to open %s (in use ?)",
-+			   common->device);
-+	break;
-       case EISDIR:
- 	*error = g_strdup_printf ("osscommon: Device %s is a directory",
- 			   common->device);
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.5.1-never-return-on-oss-busy.patch b/media-libs/gst-plugins/files/gst-plugins-0.5.1-never-return-on-oss-busy.patch
deleted file mode 100644
index 9ec6a5545651..000000000000
--- a/media-libs/gst-plugins/files/gst-plugins-0.5.1-never-return-on-oss-busy.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- gst-plugins-0.5.0/sys/oss/gstosscommon.c.orig	2002-12-27 08:58:32.000000000 +0200
-+++ gst-plugins-0.5.0/sys/oss/gstosscommon.c	2002-12-27 09:01:44.000000000 +0200
-@@ -279,9 +279,23 @@
-   GST_INFO (GST_CAT_PLUGIN_INFO, "common: attempting to open sound device");
- 
-   /* first try to open the sound card */
--  /* FIXME: this code is dubious, why do we need to open and close this ?*/
-+  /* FIXME: This code is dubious, why do we need to open and close this ?
-+   *        For linux at least this causes the second open to never return
-+   *        if the device was already in use .. */
-+#ifndef __linux__
-   if (mode == GST_OSSCOMMON_WRITE) {
-+#endif
-     common->fd = open (common->device, O_WRONLY | O_NONBLOCK);
-+#ifdef __linux__
-+	if (common->fd >= 0) {
-+	  /* remove the non-blocking flag */
-+	  if(fcntl (common->fd, F_SETFL, 0) < 0) {
-+		*error = g_strdup_printf ("osscommon: Can't make filedescriptor blocking for %s",
-+				   common->device);
-+		return FALSE;
-+	  }
-+	}
-+#else
-     if (errno == EBUSY) {
-       g_warning ("osscommon: unable to open the sound device (in use ?)\n");
-     }
-@@ -295,9 +309,14 @@
-   else {
-     common->fd = open (common->device, O_RDONLY);
-   }
-+#endif
- 
-   if (common->fd < 0) {
-     switch (errno) {
-+	  case EBUSY:
-+	*error = g_strdup_printf ("osscommon: Unable to open %s (in use ?)",
-+			   common->device);
-+	break;
-       case EISDIR:
- 	*error = g_strdup_printf ("osscommon: Device %s is a directory",
- 			   common->device);
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.6-disable_ffmpeg_mpeg_typefind.patch b/media-libs/gst-plugins/files/gst-plugins-0.6-disable_ffmpeg_mpeg_typefind.patch
new file mode 100644
index 000000000000..4e014feee0da
--- /dev/null
+++ b/media-libs/gst-plugins/files/gst-plugins-0.6-disable_ffmpeg_mpeg_typefind.patch
@@ -0,0 +1,14 @@
+diff -ur gst-plugins-0.6.0/ext/ffmpeg/gstffmpegtypes.c gst-plugins-0.6.0.patched/ext/ffmpeg/gstffmpegtypes.c
+--- gst-plugins-0.6.0/ext/ffmpeg/gstffmpegtypes.c	2003-01-26 12:56:37.000000000 +0100
++++ gst-plugins-0.6.0.patched/ext/ffmpeg/gstffmpegtypes.c	2003-02-27 01:38:53.000000000 +0100
+@@ -77,8 +77,8 @@
+   global_types = g_hash_table_new (g_str_hash, g_str_equal);
+ 
+   ADD_TYPE ("avi",    	GST_CAPS_NEW ("ffmpeg_type_avi",  "video/avi", NULL));
+-  ADD_TYPE ("mpeg",   	GST_CAPS_NEW ("ffmpeg_type_mpeg", "video/mpeg", 
+-			  		"systemstream", GST_PROPS_BOOLEAN (TRUE)));
++/*  ADD_TYPE ("mpeg",   	GST_CAPS_NEW ("ffmpeg_type_mpeg", "video/mpeg", 
++			  		"systemstream", GST_PROPS_BOOLEAN (TRUE)));*/
+   ADD_TYPE ("mpegts", 	GST_CAPS_NEW ("ffmpeg_type_mpegts", "video/x-mpegts", 
+ 			  		"systemstream", GST_PROPS_BOOLEAN (TRUE)));
+   ADD_TYPE ("rm",    	GST_CAPS_NEW ("ffmpeg_type_rm",  "audio/x-pn-realaudio", NULL));
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.0-r4.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.0-r4.ebuild
new file mode 100644
index 000000000000..7a5425015bd6
--- /dev/null
+++ b/media-libs/gst-plugins/gst-plugins-0.6.0-r4.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.0-r4.ebuild,v 1.1 2003/02/27 12:41:07 foser Exp $
+
+inherit eutils libtool gnome2 flag-o-matic
+
+# Create a major/minor combo for our SLOT and executables suffix
+PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
+
+IUSE="encode quicktime mpeg jpeg esd gnome mikmod sdl png alsa arts dvd aalib oggvorbis mmx"
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Additional plugins for gstreamer - streaming media framework"
+HOMEPAGE="http://gstreamer.sourceforge.net"
+
+SLOT=${PV_MAJ_MIN}
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~sparc ~ppc"
+
+# required packages
+# there are many many optional libraries. features are compiled if the libraries
+# are present. most optional libraries are from gnome.
+
+# TODO: I think we should split up these plugins in seperate ebuilds
+
+RDEPEND="=media-libs/gstreamer-${PV}*
+
+	media-sound/mad
+	media-libs/hermes
+
+	oggvorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	encode? ( media-sound/lame )
+	quicktime? ( media-libs/openquicktime )
+	mpeg? (	>=media-libs/libmpeg2-0.3.1 )
+	esd? ( media-sound/esound )
+	gnome? ( >=gnome-base/gnome-vfs-2.0.1 )
+	mikmod? ( media-libs/libmikmod )
+	sdl? ( media-libs/libsdl )
+	jpeg? ( mmx? ( media-video/mjpegtools ) )
+	jpeg? ( media-libs/jpeg )
+	png? ( >=media-libs/libpng-1.2.3 )
+	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
+	arts? ( >=kde-base/arts-1.0.2 )
+	dvd? ( 	media-libs/libdvdnav 
+		media-libs/libdvdread )
+	aalib? ( media-libs/aalib )"
+
+# Some ditched minor plugins to bring number of deps down
+#	>=media-libs/flac-1.0.3
+#	virtual/jack 
+#	media-libs/ladspa-sdk" 
+#	>=media-libs/libdv-0.9.5
+#	media-sound/cdparanoia
+
+DEPEND="${RDEPEND}
+	>=gnome-base/gconf-1.2.0
+	>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	unpack ${A}
+
+	# ffmpeg libs fix
+	use oggvorbis && epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-ffmpeg_ldflags.patch
+	# ogg with id3 tag detection fix by <foser@gentoo.org>
+	epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-ogg_detection_fix.patch
+	# disable ffmpeg mpeg typefind, to fix mp3 misdetection by <foser@gentoo.org>
+	epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-disable_ffmpeg_mpeg_typefind.patch
+
+	# fix the scripts
+	cd ${S}/tools
+	mv gst-launch-ext gst-launch-ext.old
+	sed -e "s:gst-launch :gst-launch-${PV_MAJ_MIN} :" \
+		-e "s:gst-launch-ext:gst-launch-ext-${PV_MAJ_MIN}:" gst-launch-ext.old > gst-launch-ext
+	chmod +x gst-launch-ext
+
+	mv gst-visualise gst-visualise.old
+	sed -e "s:gst-launch :gst-launch-${PV_MAJ_MIN} :" \
+		-e "s:gst-visualise:gst-visualise-${PV_MAJ_MIN}:" gst-visualise.old > gst-visualise
+	chmod +x gst-visualise
+}
+
+src_compile() {
+	elibtoolize
+
+	# gst doesnt handle optimisations well
+	strip-flags
+	replace-flags "-O3" "-O2"
+
+	local myconf=""
+
+	# temp disable (#15989)
+	myconf="--disable-v4l --disable-v4l2"
+
+	# FIXME : do this for _all_ IUSE flags
+	use aalib \
+		&& myconf="${myconf} --enable-aalib" \
+		|| myconf="${myconf} --disable-aalib"
+	use dvd \
+		&& myconf="${myconf} --enable-dvdread --enable-dvdnav" \
+		|| myconf="${myconf} --disable-dvdread --disable-dvdnav"
+	use esd \
+		&& myconf="${myconf} --enable-esd" \
+		|| myconf="${myconf} --disable-esd"
+	use alsa \
+		&& myconf="${myconf} --enable-alsa" \
+		|| myconf="${myconf} --disable-alsa"
+	use arts \
+		&& myconf="${myconf} --enable-arts --enable-artsc" \
+		|| myconf="${myconf} --disable-arts --enable-artsc"
+	use encode \
+		&& myconf="${myconf} --enable-lame" \
+		|| myconf="${myconf} --disable-lame"
+	use jpeg \
+		&& myconf="${myconf} --enable-jpeg" \
+		|| myconf="${myconf} --disable-jpeg"
+	use jpeg && use mmx \
+		&& myconf="${myconf} --enable-mjpegtools" \
+		|| myconf="${myconf} --disable-mjpegtools"
+	use png \
+		&& myconf="${myconf} --enable-png" \
+		|| myconf="${myconf} --disable-png"
+	use gnome \
+		&& myconf="${myconf} --enable-gnome_vfs" \
+		|| myconf="${myconf} --disable-gnome_vfs"
+	use encode \
+		&& myconf="${myconf} --enable-lame" \
+		|| myconf="${myconf} --disable-lame"
+	use quicktime \
+		&& myconf="${myconf} --enable-openquicktime" \
+		|| myconf="${myconf} --disable-openquicktime"
+	use mpeg \
+		&& myconf="${myconf} --enable-mpeg2dec" \
+		|| myconf="${myconf} --disable-mpeg2dec"
+	use sdl \
+		&& myconf="${myconf} --enable-sdl --enable-sdltest" \
+		|| myconf="${myconf} --disable-sdl --disable-sdltest"
+	use oggvorbis \
+		&& myconf="${myconf} --enable-vorbis --enable-vorbistest" \
+		|| myconf="${myconf} --disable-vorbis --disable-vorbistest"
+	use mikmod \
+		&& myconf="${myconf} --enable-mikmod --enable-libmikmodtest" \
+		|| myconf="${myconf} --disable-mikmod --disable-libmikmodtest"	
+	
+ 	# qcam doesn't work on PPC
+	use ppc && myconf="${myconf} --disable-qcam"
+	
+	econf ${myconf} \
+		--program-suffix=-${PV_MAJ_MIN} \
+		|| die "./configure failed"
+		
+	emake || make || die
+}
+
+src_install () {
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"		
+	make DESTDIR=${D} install || die
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+	dodoc AUTHORS COPYING INSTALL README RELEASE TODO 
+}
+
+pkg_postinst () {
+	gnome2_gconf_install
+	gst-register-${PV_MAJ_MIN}
+}