Re-fix bug #706220 with a correct patch for xine-lib_rc8-r1. Thanks to James Stockton for the patch.

4 files changed, 140 insertions, 32 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 9d4baf411cc0..c06502f35dca 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.185 2005/01/04 10:32:02 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.186 2005/01/04 17:41:02 chriswhite Exp $
+
+  05 Jan 2005; Chris White <chriswhite@gentoo.org>
+  +files/xine-lib-1_rc8-configure.ac.patch, xine-lib-1_rc8-r1.ebuild:
+  Re-fix bug #706220 with a correct patch for xine-lib_rc8-r1. Thanks to James
+  Stockton for the patch.
 
   04 Jan 2005; Hardave Riar <hardave@gentoo.org> xine-lib-1_rc8-r1.ebuild:
   Stable on mips, bug #74475.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 8f9e043f7ca6..7fffc6727c9a 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,44 +1,55 @@
-MD5 f9634de2e799d22a319aa81a2b38bd1d xine-lib-1_rc7.ebuild 5370
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9d3ab3fe1fb6d53eca56ffd5fdae5495 ChangeLog 31462
+MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
 MD5 ecc75a8fa2b8be0fdf376ca2bc1a655f xine-lib-1.0.ebuild 8088
 MD5 4052265429970e0a67ed0d039d770515 xine-lib-1_rc5-r3.ebuild 5473
-MD5 27fb8ef84b5b93af31bb3caefae47247 xine-lib-1_rc8-r1.ebuild 6466
 MD5 9b1839aa704083ac8bc733e78fe15bd2 xine-lib-1_rc6.ebuild 5401
+MD5 f9634de2e799d22a319aa81a2b38bd1d xine-lib-1_rc7.ebuild 5370
+MD5 9f2c1755efbee2e9605f6fba4db54c69 xine-lib-1_rc8-r1.ebuild 6468
 MD5 d7d43244f336b4e0826eedf8a3d3dbc1 xine-lib-1_rc8.ebuild 5423
-MD5 8fd9ac288dcc52180229d7068d22da42 ChangeLog 31232
-MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
-MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
-MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
+MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
+MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68
+MD5 98e135f240fada719668b012c77b40be files/digest-xine-lib-1_rc7 67
+MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8 67
+MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
+MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
 MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
 MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
-MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
-MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
+MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
+MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
+MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
+MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
+MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
 MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
-MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
+MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
-MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
-MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
+MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
 MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
-MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68
-MD5 98e135f240fada719668b012c77b40be files/digest-xine-lib-1_rc7 67
-MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8 67
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
-MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
-MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
+MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
 MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926
-MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
+MD5 3704271d4339b919569b4ea416a4c34e files/xine-lib-1_rc8-configure.ac.patch 2825
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB2tQxFdQwWVoAgN4RAtdsAKDmT3Pbc2N1LfLVOs9erbMgpbQquACgoTXd
+ZhECFbhpXeABmTDoSA8FXHM=
+=AQUU
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/xine-lib-1_rc8-configure.ac.patch b/media-libs/xine-lib/files/xine-lib-1_rc8-configure.ac.patch
new file mode 100644
index 000000000000..5dc2a3316ef4
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1_rc8-configure.ac.patch
@@ -0,0 +1,92 @@
+--- xine-lib-1-rc8/configure.ac	2004-12-14 22:06:47.000000000 +0000
++++ xine-lib/configure.ac	2004-12-30 09:55:16.000000000 +0000
+@@ -18,6 +18,11 @@
+ XINE_MINOR=0
+ XINE_SUB=0
+ 
++if test $XINE_SUB -eq 0 ; then
++  XINE_SUBPART="";
++else
++  XINE_SUBPART=".$XINE_SUB"
++fi
+ 
+ dnl The libtool version numbers (LT_*); Don't even think about faking this!
+ dnl 
+@@ -45,14 +50,14 @@
+ dnl    libname.so.(LT_CURRENT - LT_AGE).LT_AGE.LT_REVISION
+ 
+ LT_CURRENT=12
+-LT_REVISION=0
++LT_REVISION=1
+ LT_AGE=11
+ 
+ dnl for a release tarball do "rm .cvsversion" before "make dist"
+ if test -f .cvsversion; then
+   XINE_PRE="cvs"
+ else
+-  XINE_PRE="rc8"
++  XINE_PRE=""
+ fi
+ 
+ AC_SUBST(XINE_MAJOR)
+@@ -69,10 +74,10 @@
+ AC_SUBST(LT_REVISION)
+ AC_SUBST(LT_AGE)
+ 
+-dnl TAR_NAME="xine-lib-"$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE
+-dnl SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE
+-TAR_NAME="xine-lib-"$XINE_MAJOR-$XINE_PRE
+-SPEC_VERSION=${XINE_MAJOR}_$XINE_PRE
++SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR${XINE_SUBPART}$XINE_PRE
++TAR_NAME="xine-lib-"$SPEC_VERSION
++dnl TAR_NAME="xine-lib-"$XINE_MAJOR-$XINE_PRE
++dnl SPEC_VERSION=${XINE_MAJOR}_$XINE_PRE
+ 
+ AC_SUBST(TAR_NAME)
+ AC_SUBST(SPEC_VERSION)
+@@ -84,8 +89,8 @@
+ AC_CANONICAL_TARGET
+ 
+ dnl
+-dnl AM_INIT_AUTOMAKE("xine-lib", $XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE)
+-AM_INIT_AUTOMAKE("xine-lib", $XINE_MAJOR-$XINE_PRE)
++AM_INIT_AUTOMAKE("xine-lib", $SPEC_VERSION)
++dnl AM_INIT_AUTOMAKE("xine-lib", $XINE_MAJOR-$XINE_PRE)
+ 
+ 
+ dnl ---------------------------------------------
+@@ -487,28 +492,21 @@
+ dnl Check for Xv and XvMC support (iconv is also tested here?)
+ dnl ----------------------------------------------
+ 
+-dnl static linking is preferred!
+-dnl but only dynamic linking is possible when using libtool < 1.4.0
++dnl With recent XFree86 or Xorg, dynamic linking is preferred!
++dnl Only dynamic linking is possible when using libtool < 1.4.0
+ 
+-dnl ----------------------------------------------
+-dnl SECTION: Check for Xv and XvMC support (iconv is also tested here?)
+-dnl ----------------------------------------------
+ AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [where libXv is installed]),
+             xv_path="$withval",)
+ 
+ AC_ARG_ENABLE(shared-xv,
+-        AC_HELP_STRING([--enable-shared-xv],[Enable this to force linking against libXv.so]),
+-        xv_prefer_shared="yes",
+-        xv_prefer_shared="no")
++        AC_HELP_STRING([--enable-static-xv],[Enable this to force linking against libXv.a]),
++        xv_prefer_shared="no",
++        xv_prefer_shared="yes")
+ 
+ if test x"$no_x" != "xyes"; then
+-
+-  dnl -----------------------------------------------
+-  dnl   Finding install Xv library
+-  dnl -----------------------------------------------
+   AC_FIND_LIBXV
+-
+ fi
++AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
+ 
+ 
+ host_or_hostalias="$host"
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 3a8e92331cd7..7b2da6eae899 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-2005 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.15 2005/01/04 10:32:02 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r1.ebuild,v 1.16 2005/01/04 17:41:02 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -64,7 +64,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-x11.patch
 
 	# fixes bad xv checking
-	epatch ${FILESDIR}/${PN}-configure.ac.patch
+	epatch ${FILESDIR}/${P}-configure.ac.patch
 
 	# Fix building on amd64, #49569
 	#use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch