Fixed a compilation-error on PowerPC when using CFLAGS who don't allow Altivec-code.

3 files changed, 36 insertions, 26 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 95d50d6a7ade..b1b76926b4bc 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.125 2004/06/24 14:40:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.126 2004/06/24 22:48:09 hansmi Exp $
+
+  25 Jun 2004; Michael Hanselmann <hansmi@gentoo.org> xine-lib-1_rc5.ebuild:
+  Fixed a compilation-error on PowerPC when CFLAGS don't allow Altivec-code.
+  Uses USE-flag "altivec".
 
 *xine-lib-1_rc5 (24 Jun 2004)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 8a80e58caaba..238339858eb0 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,35 +1,35 @@
-MD5 2949cb81b709e227309b7d9c38498eee xine-lib-1_rc5.ebuild 4548
-MD5 f822564287a1fff840444a38eaa40dc5 xine-lib-1_rc3-r3.ebuild 4191
-MD5 55495d9417f8b5cccf5a6a3f329e67ee xine-lib-1_rc2.ebuild 3981
+MD5 885e277078c977fdaa4d8feef850327a xine-lib-1_rc4.ebuild 4490
 MD5 a6a18d1803bfe8fc4c3a33a41f28ae9d xine-lib-1_rc4-r1.ebuild 4930
-MD5 c2750c139598cc3fd323b46d064a85bd xine-lib-0.9.13-r3.ebuild 3404
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 85e9a285be5f9a8e2921c0ca302219df xine-lib-1_rc3-r1.ebuild 4069
+MD5 03190d4052b2870bba00adc0e088a413 ChangeLog 21828
+MD5 1f341a0ae91b820f5d77ca5fab50f932 xine-lib-1_rc5.ebuild 4701
+MD5 c2750c139598cc3fd323b46d064a85bd xine-lib-0.9.13-r3.ebuild 3404
 MD5 83b7e79e248bf94ce81ab503cbdf4c7c xine-lib-1_rc3-r2.ebuild 3896
-MD5 f9a772fe75a04dc573ade1d22cbf1a05 ChangeLog 21647
-MD5 885e277078c977fdaa4d8feef850327a xine-lib-1_rc4.ebuild 4490
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
-MD5 4927f9e562e68f539a5f3a6e4711d873 files/digest-xine-lib-1_rc4-r1 68
-MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
-MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
-MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
+MD5 55495d9417f8b5cccf5a6a3f329e67ee xine-lib-1_rc2.ebuild 3981
+MD5 f822564287a1fff840444a38eaa40dc5 xine-lib-1_rc3-r3.ebuild 4191
+MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
+MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5 67
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc5 597
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
 MD5 d24969404b35f029bf203da4b53a3c3d files/digest-xine-lib-1_rc3-r3 68
-MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5 67
 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 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
+MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
+MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
+MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
 MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
-MD5 3824a3bb0c207c34e9bec101cac52a91 files/digest-xine-lib-1_rc3-r2 68
+MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
 MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
 MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67
-MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
+MD5 3824a3bb0c207c34e9bec101cac52a91 files/digest-xine-lib-1_rc3-r2 68
+MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
+MD5 4927f9e562e68f539a5f3a6e4711d873 files/digest-xine-lib-1_rc4-r1 68
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
-MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
diff --git a/media-libs/xine-lib/xine-lib-1_rc5.ebuild b/media-libs/xine-lib/xine-lib-1_rc5.ebuild
index 7b6af4507918..5c5787d1060d 100644
--- a/media-libs/xine-lib/xine-lib-1_rc5.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc5.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_rc5.ebuild,v 1.1 2004/06/24 14:40:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5.ebuild,v 1.2 2004/06/24 22:48:09 hansmi Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -78,7 +78,7 @@ src_unpack() {
 }
 
 src_compile() {
-	filter-flags -maltivec -mabi=altivec -fstack-protector
+	filter-flags -fstack-protector
 	filter-flags -fPIC
 	filter-flags -fforce-addr
 
@@ -102,10 +102,16 @@ src_compile() {
 	use amd64 \
 		&& myconf="${myconf} --with-xv-path=/usr/X11R6/lib"
 
+	# Disable compiling of altivec-code if it's not in the
+	# USE-flags
+	use ppc && use altivec \
+		&& myconf="${myconf} --enable-altivec" \
+		|| CFLAGS="${CFLAGS} -U__ALTIVEC__"
+
 	# The default CFLAGS (-O) is the only thing working on hppa.
 	use hppa \
 		&& unset CFLAGS
-
+	
 	econf \
 		`use_enable X x11` \
 		`use_enable esd` \