Trying this.. again... Fixed the strange patch error and got this HAVE_XV thing fixed (hopefully...).

4 files changed, 19 insertions, 38 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index f7765d93337c..d2519697e6d8 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.160 2004/12/23 04:42:07 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.161 2004/12/23 06:33:30 chriswhite Exp $
+
+  23 Dec 2004; Chris White <chriswhite@gentoo.org> files/djb_demux_aiff.patch,
+  xine-lib-1_rc8-r1.ebuild:
+  Trying this.. again... Fixed the strange patch error and got this HAVE_XV
+  thing fixed (hopefully...).
 
 *xine-lib-1_rc8-r1 (23 Dec 2004)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 786d3b11e27d..6f6a35f5ab5a 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9740df42d8dbd8e909e3f8ad82b1c67f ChangeLog 27433
 MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
 MD5 b25152bddc933afdf390149b07f2ff43 xine-lib-1_rc5-r3.ebuild 5473
 MD5 a53b6f55661ef41e343932ceb7108cc3 xine-lib-1_rc6.ebuild 5358
 MD5 d2d62f59048715eaf85d88a90842729d xine-lib-1_rc7.ebuild 5327
 MD5 d9591aa743f1cbe61c93c98846b139b2 xine-lib-1_rc8.ebuild 5380
-MD5 582d6a8d46bace46d492ba3625b2f8b9 xine-lib-1_rc8-r1.ebuild 5518
+MD5 1a1e29e02fe533261b512b826cb6dc14 xine-lib-1_rc8-r1.ebuild 5505
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
 MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
 MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68
@@ -38,13 +35,6 @@ MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
 MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
 MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8 67
-MD5 ac52c296e2e57d6db7924875edea635e files/djb_demux_aiff.patch 1008
+MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
 MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
 MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBykyuFdQwWVoAgN4RAkPOAJ98F1t7OxCsCVDSfLp4SzgjL24iuACg2XtM
-3BhLC34AanOLNjETs5i8hF8=
-=8hTC
------END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/djb_demux_aiff.patch b/media-libs/xine-lib/files/djb_demux_aiff.patch
index 19cdb3d62818..25722a15f513 100644
--- a/media-libs/xine-lib/files/djb_demux_aiff.patch
+++ b/media-libs/xine-lib/files/djb_demux_aiff.patch
@@ -1,29 +1,15 @@
-===================================================================
-RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_aiff.c,v
-retrieving revision 1.39
-retrieving revision 1.40
-diff -u -r1.39 -r1.40
---- xine/xine-lib/src/demuxers/demux_aiff.c	2004/06/13 21:28:52	1.39
-+++ xine/xine-lib/src/demuxers/demux_aiff.c	2004/12/15 21:03:02	1.40
-@@ -21,7 +21,7 @@
- /*
-  * AIFF File Demuxer by Mike Melanson (melanson@pcisys.net)
-  *
-- * $Id: djb_demux_aiff.patch,v 1.1 2004/12/23 04:42:07 chriswhite Exp $
-+ * $Id: djb_demux_aiff.patch,v 1.1 2004/12/23 04:42:07 chriswhite Exp $
-  *
-  */
- 
-@@ -120,6 +120,12 @@
-     }
+--- src/demuxers/demux_aiff.old	2004-12-23 14:53:15.442028184 +0900
++++ src/demuxers/demux_aiff.c	2004-12-23 14:54:00.007253240 +0900
+@@ -121,6 +121,12 @@
      chunk_type = BE_32(&preamble[0]);
      chunk_size = BE_32(&preamble[4]);
-+    
+ 
 +    if (chunk_size > sizeof(buffer) / sizeof(buffer[0])) {
-+      /* the chunk is too large to fit in the buffer -> this cannot be an aiff chunk */
-+      this->status = DEMUX_FINISHED;
-+      return 0;
++    /* the chunk is too large to fit in the buffer -> this cannot be an aiff chunk */
++	this->status = DEMUX_FINISHED;
++	return 0;
 +    }
- 
++
      if (chunk_type == COMM_TAG) {
        if (this->input->read(this->input, buffer, chunk_size) !=
+         chunk_size) {
diff --git a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
index 30efa1ccc05d..df1b31c474b6 100644
--- a/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.1 2004/12/23 04:42:07 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.2 2004/12/23 06:33:30 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -119,7 +119,7 @@ src_compile() {
 	[ "${PROFILE_ARCH}" == "sparc" ] \
 		&& myconf="${myconf} --disable-vis"
 
-	use amd64 && myconf="${myconf} --with-xv-path=/usr/X11R6/$(get_libdir)"
+	myconf="${myconf} --with-xv-path=/usr/X11R6/$(get_libdir)"
 
 	# Fix compilation-errors on PowerPC #45393 & #55460 & #68251
 	if use ppc || use ppc64 ; then