add gcc2 compilation fixing patch

4 files changed, 181 insertions, 19 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index f218ad3c33c8..3e45dda13d27 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.65 2003/08/18 18:02:01 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.66 2003/08/24 20:46:05 foser Exp $
 
 *xine-lib-1_rc0-r3 (18 Aug 2003)
 
+  24 Aug 2003; foser <foser@gentoo.org> xine-lib-1_rc0-r3.ebuild :
+  Add patch to workaround possible compile problems with gcc2 (#26534)
+  fixed the (R)DEPEND order while i was at it
+
   18 Aug 2003; Arcady Genkin <agenkin@gentoo.org> :
   Obey "sdl" USE flag (patch by aethyr7@hotmail.com, bug #24519).
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index f5e6b6440cfa..0552ac60ed94 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,20 +1,21 @@
+MD5 52c7b44608472c795d16e4ff11c773a1 xine-lib-1_beta12-r1.ebuild 4153
+MD5 f02769d40b64a6e1abf21a822dcd00b7 xine-lib-0.9.13-r3.ebuild 3649
+MD5 8dd0e88bade327d8da97a308ab051016 xine-lib-1_beta11.ebuild 3616
+MD5 4eb5ecf5af10ecd18570a013ce43b68e xine-lib-1_rc0-r3.ebuild 4156
+MD5 abda4a5d6c7a53cc72949bd871ba6605 xine-lib-1_beta10.ebuild 3446
+MD5 17535845a8dbdec5a4ef8b52c2f25ff2 ChangeLog 12952
+MD5 e8d469034af4d1af9a8de1577d076d85 xine-lib-1_beta12.ebuild 3717
+MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 af33e921f7041fafac652c324d3984c1 files/digest-xine-lib-1_beta10 70
 MD5 5903fa4c80658b8265910c8745913dae files/digest-xine-lib-1_beta11 70
 MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12 70
-MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12-r1 70
-MD5 6be0e52978dd6b72e1626d6fe0053a24 files/digest-xine-lib-1_rc0-r3 68
-MD5 af33e921f7041fafac652c324d3984c1 files/digest-xine-lib-1_beta10 70
-MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
-MD5 6e79367c32da81354d36e68fd1a24ae2 files/xineconfig.patch 699
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.12 601
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
+MD5 8c8cd02ba98cd652fce9ca5e56af5482 files/xine-lib-1_rc0-gcc2_fix.patch 4424
+MD5 6be0e52978dd6b72e1626d6fe0053a24 files/digest-xine-lib-1_rc0-r3 68
+MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12-r1 70
+MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
+MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
 MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
-MD5 e8d469034af4d1af9a8de1577d076d85 xine-lib-1_beta12.ebuild 3717
-MD5 52c7b44608472c795d16e4ff11c773a1 xine-lib-1_beta12-r1.ebuild 4153
-MD5 abda4a5d6c7a53cc72949bd871ba6605 xine-lib-1_beta10.ebuild 3446
-MD5 8dd0e88bade327d8da97a308ab051016 xine-lib-1_beta11.ebuild 3616
-MD5 f02769d40b64a6e1abf21a822dcd00b7 xine-lib-0.9.13-r3.ebuild 3649
-MD5 cd71fec0344045b909d40826f5aec048 xine-lib-1_rc0-r3.ebuild 4003
-MD5 2ba1ef108041695028f186d1a6c441a1 ChangeLog 12769
+MD5 6e79367c32da81354d36e68fd1a24ae2 files/xineconfig.patch 699
diff --git a/media-libs/xine-lib/files/xine-lib-1_rc0-gcc2_fix.patch b/media-libs/xine-lib/files/xine-lib-1_rc0-gcc2_fix.patch
new file mode 100644
index 000000000000..9b35b9362ffc
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1_rc0-gcc2_fix.patch
@@ -0,0 +1,145 @@
+diff -ur xine-lib-1-rc0a.orig/src/input/input_gnome_vfs.c xine-lib-1-rc0a/src/input/input_gnome_vfs.c
+--- xine-lib-1-rc0a.orig/src/input/input_gnome_vfs.c	2003-07-27 12:42:49.000000000 -0400
++++ xine-lib-1-rc0a/src/input/input_gnome_vfs.c	2003-08-18 09:40:46.000000000 -0400
+@@ -33,7 +33,7 @@
+ 
+ #include <libgnomevfs/gnome-vfs.h>
+ 
+-#define D(...)
++/* #define D(...) */
+ /* #define D(...) g_message (__VA_ARGS__) */
+ /* #define LOG */
+ 
+@@ -73,7 +73,7 @@
+ 	gnomevfs_input_t *this = (gnomevfs_input_t *) this_gen;
+ 	off_t n, num_bytes;
+ 
+-	D("gnomevfs_plugin_read: %ld", (long int) len);
++	/* D("gnomevfs_plugin_read: %ld", (long int) len); */
+ 
+ 	num_bytes = 0;
+ 
+@@ -85,15 +85,15 @@
+ 				(GnomeVFSFileSize) (len - num_bytes),
+ 				(GnomeVFSFileSize *)&n);
+ 
+-		D("gnomevfs_plugin_read: read %ld from gnome-vfs",
+-				(long int) n);
++		/* D("gnomevfs_plugin_read: read %ld from gnome-vfs", 
++				(long int) n); */
+ 		if (res != GNOME_VFS_OK && res != GNOME_VFS_ERROR_EOF)
+ 		{
+-			D("gnomevfs_plugin_read: gnome_vfs_read returns %s",
+-					gnome_vfs_result_to_string (res));
++			/* D("gnomevfs_plugin_read: gnome_vfs_read returns %s",
++					gnome_vfs_result_to_string (res)); */
+ 			return -1;
+ 		} else if (res == GNOME_VFS_ERROR_EOF) {
+-			D("gnomevfs_plugin_read: GNOME_VFS_ERROR_EOF");
++			/* D("gnomevfs_plugin_read: GNOME_VFS_ERROR_EOF"); */
+ 			return 0;
+ 		}
+ 
+@@ -138,7 +138,7 @@
+ 
+ 	if (gnome_vfs_seek (this->fh, origin, offset) == GNOME_VFS_OK)
+ 	{
+-		D ("gnomevfs_plugin_seek: %d", (int) (origin + offset));
++		/* D ("gnomevfs_plugin_seek: %d", (int) (origin + offset)); */
+ 		return (off_t) (origin + offset);
+ 	} else
+ 		return (off_t) gnomevfs_plugin_get_current_pos (this_gen);
+@@ -152,13 +152,13 @@
+ 
+ 	if (this->fh == NULL)
+ 	{
+-		D ("gnomevfs_plugin_get_current_pos: (this->fh == NULL)");
++		/* D ("gnomevfs_plugin_get_current_pos: (this->fh == NULL)"); */
+ 		return 0;
+ 	}
+ 
+ 	if (gnome_vfs_tell (this->fh, &offset) == GNOME_VFS_OK)
+ 	{
+-		D ("gnomevfs_plugin_get_current_pos: %d", (int) offset);
++		/* D ("gnomevfs_plugin_get_current_pos: %d", (int) offset); */
+ 		return (off_t) offset;
+ 	} else
+ 		return 0;
+@@ -172,7 +172,7 @@
+ 
+ 	if (this->fh == NULL)
+ 	{
+-		D ("gnomevfs_plugin_get_length: (this->fh == NULL)");
++		/* D ("gnomevfs_plugin_get_length: (this->fh == NULL)"); */
+ 		return 0;
+ 	}
+ 
+@@ -180,7 +180,7 @@
+ 				&info,
+ 				GNOME_VFS_FILE_INFO_DEFAULT) == GNOME_VFS_OK)
+ 	{
+-		D ("gnomevfs_plugin_get_length: %d", (int) info.size);
++		/* D ("gnomevfs_plugin_get_length: %d", (int) info.size); */
+ 		return (off_t) info.size;
+ 	} else
+ 		return 0;
+@@ -222,7 +222,7 @@
+ gnomevfs_plugin_get_optional_data (input_plugin_t *this_gen, 
+ 		void *data, int data_type)
+ {
+-	D ("input_gnomevfs: get optional data, type %08x\n", data_type);
++	/* D ("input_gnomevfs: get optional data, type %08x\n", data_type); */
+ 
+ 	return INPUT_OPTIONAL_UNSUPPORTED;
+ }
+@@ -246,10 +246,10 @@
+ {
+ 	gnomevfs_input_t *this = (gnomevfs_input_t *) this_gen;
+ 
+-	D("gnomevfs_klass_open: opening '%s'", this->mrl);
++	/* D("gnomevfs_klass_open: opening '%s'", this->mrl); */
+ 	if (gnome_vfs_open_uri (&this->fh, this->uri, GNOME_VFS_OPEN_READ) != GNOME_VFS_OK)
+ 	{
+-		D("gnomevfs_klass_open: failed to open '%s'", this->mrl);
++		/* D("gnomevfs_klass_open: failed to open '%s'", this->mrl); */
+ 		return 0;
+ 	}
+ 
+@@ -273,7 +273,7 @@
+ 	gnomevfs_input_t *this;
+ 	GnomeVFSURI *uri;
+ 
+-	D("gnomevfs_klass_get_instance: %s", mrl);
++	/* D("gnomevfs_klass_get_instance: %s", mrl); */
+ 
+ 	uri = gnome_vfs_uri_new (mrl);
+ 	if (uri == NULL)
+@@ -283,16 +283,16 @@
+ 	if (strncmp (mrl, "file:/", strlen ("file:/")) == 0
+ 			|| strstr (mrl, "://") == NULL)
+ 	{
+-		D("gnomevfs_klass_open: '%s' is a file:///", mrl);
++		/* D("gnomevfs_klass_open: '%s' is a file:///", mrl); */
+ 		gnome_vfs_uri_unref (uri);
+ 		return NULL;
+ 	} else if (strncmp (gnome_vfs_uri_get_scheme (uri), "http", 4) == 0) {
+-		D("gnomevfs_klass_open: '%s' is http://", mrl);
++		/* D("gnomevfs_klass_open: '%s' is http://", mrl); */
+ 		gnome_vfs_uri_unref (uri);
+ 		return NULL;
+ 	}
+ 
+-	D("Creating the structure for stream '%s'", mrl);
++	/* D("Creating the structure for stream '%s'", mrl); */
+ 	this = g_new0 (gnomevfs_input_t, 1);
+ 	this->stream = stream;
+ 	this->fh = NULL;
+@@ -321,7 +321,7 @@
+ {
+ 	gnomevfs_input_class_t *this;
+ 
+-	D("init_input_class");
++	/* D("init_input_class"); */
+ 
+ 	if (gnome_vfs_initialized () == FALSE)
+ 		if (gnome_vfs_init () == FALSE)
diff --git a/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild b/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild
index 9e423d171ef4..59633e18324a 100644
--- a/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild,v 1.1 2003/08/18 18:02:01 agenkin Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild,v 1.2 2003/08/24 20:46:05 foser Exp $ 
+
+inherit eutils
 
 # this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
 # Commenting this out in this ebuild, because CFLAGS and CXXFLAGS are unset
@@ -27,7 +29,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~hppa ~sparc"
 IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl"
 
-DEPEND="oggvorbis? ( media-libs/libvorbis )
+RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	X? ( virtual/x11 )
 	avi? ( x86? ( >=media-libs/win32codecs-0.50 
 	       media-libs/divx4linux ) )
@@ -45,11 +47,21 @@ DEPEND="oggvorbis? ( media-libs/libvorbis )
 	>=media-libs/libfame-0.9.0
 	>=media-libs/xvid-0.9.0
 	media-libs/speex"
-RDEPEND="${DEPEND}
+
+DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
 
+src_unpack() {
+
+	unpack ${A}
+
+	# gcc2 fixes provided by <T.Henderson@cs.ucl.ac.uk> in #26534
+	epatch ${FILESDIR}/${P}-gcc2_fix.patch
+
+}
+
 src_compile() {
 	# Make sure that the older libraries are not installed (bug #15081).
 	if [ -f /usr/lib/libxine.so.0 ]