Fix building on amd64

4 files changed, 34 insertions, 16 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index fa4e4ee842fb..a63363303224 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.119 2004/05/15 19:52:05 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.120 2004/05/18 01:03:25 avenj Exp $
+
+  17 May 2004; Jon Portnoy <avenj@gentoo.org> xine-lib-1_rc4-r1.ebuild :
+  Fix building on AMD64. Bug 49569. Fix from Herbie Hopkins.
 
   15 May 2004; Jason Wever <weeve@gentoo.org> xine-lib-1_rc4-r1.ebuild:
   Removed a couple sparc fixes since they are present in the vendor tarball in
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 5388156eff77..3f0cf313ecd3 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,30 +1,31 @@
-MD5 0ea6d43c94c802029a69c9a99538be5d ChangeLog 20921
+MD5 9f55e3b2c35c7fe7fa7a41c6843c1b9f ChangeLog 21056
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 2ee30061bc9d39fe8d1c0fdb9de54317 xine-lib-0.9.13-r3.ebuild 3408
-MD5 d284c0f2dfa6753ab3d8cb085486d2ac xine-lib-1_rc2.ebuild 3982
-MD5 0b7f856fae11d36f4bffbf8bfe005761 xine-lib-1_rc3-r1.ebuild 4070
 MD5 66a771ec0c561a23af0abdd5d305397c xine-lib-1_rc3-r2.ebuild 3897
+MD5 0b7f856fae11d36f4bffbf8bfe005761 xine-lib-1_rc3-r1.ebuild 4070
 MD5 b304642fe1b9924c69805348043989d2 xine-lib-1_rc3-r3.ebuild 4192
+MD5 d284c0f2dfa6753ab3d8cb085486d2ac xine-lib-1_rc2.ebuild 3982
 MD5 9d80107e6eaae8750bbc0f86f0fae18e xine-lib-1_rc4.ebuild 4490
-MD5 91d47ce32ea121922b54feea9735fc66 xine-lib-1_rc4-r1.ebuild 4251
+MD5 f0a8ba23f0047c8f052082cb1d59fc7b xine-lib-1_rc4-r1.ebuild 4347
 MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
-MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
-MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
 MD5 3824a3bb0c207c34e9bec101cac52a91 files/digest-xine-lib-1_rc3-r2 68
-MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
+MD5 d24969404b35f029bf203da4b53a3c3d files/digest-xine-lib-1_rc3-r3 68
+MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
+MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
+MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
 MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
 MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
+MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67
 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
 MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 d24969404b35f029bf203da4b53a3c3d files/digest-xine-lib-1_rc3-r3 68
-MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
-MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
+MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
 MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc4-configure-sparc.patch 587
 MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
 MD5 4927f9e562e68f539a5f3a6e4711d873 files/digest-xine-lib-1_rc4-r1 68
+MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
diff --git a/media-libs/xine-lib/files/configure-64bit-define.patch b/media-libs/xine-lib/files/configure-64bit-define.patch
new file mode 100644
index 000000000000..1647a471ee17
--- /dev/null
+++ b/media-libs/xine-lib/files/configure-64bit-define.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2004-05-17 17:06:13.646459416 +0100
++++ configure	2004-05-17 17:06:38.812633576 +0100
+@@ -38238,7 +38238,7 @@
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define FPM_INTEL 1
++#define FPM_64BIT 1
+ _ACEOF
+ 
+     ;;
diff --git a/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild
index f3f2c0fc1dd7..36246bf5cb2d 100644
--- a/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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_rc4-r1.ebuild,v 1.2 2004/05/15 19:52:05 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild,v 1.3 2004/05/18 01:03:25 avenj Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~x86 ~ppc -hppa ~sparc -amd64 -ia64 ~alpha"
+KEYWORDS="~x86 ~ppc -hppa ~sparc ~amd64 -ia64 ~alpha"
 IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6"
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
@@ -69,6 +69,9 @@ src_unpack() {
 	epatch ${FILESDIR}/xine-lib-gcc34.patch
 
 	elibtoolize #40317
+
+	# Fix building on amd64, #49569
+	use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
 }
 
 src_compile() {