Fixed bug# 45393 and 55460. Compilation-errors when using Altivec.

3 files changed, 39 insertions, 37 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 8fb5c9f55cdc..24b92069aa06 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.130 2004/06/29 14:58:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.131 2004/06/29 22:47:00 hansmi Exp $
+
+  30 Jun 2004; Michael Hanselmann <hansmi@gentoo.org>
+  xine-lib-1_rc5-r2.ebuild:
+  Fixed compilation errors when using Altivec. Bug# 45393 and 55460.
 
 *xine-lib-1_rc5-r2 (29 Jun 2004)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index db34d4e6db9f..6ce2fff16aa7 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,43 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a95754895d70ac38ef78eb245887af8a ChangeLog 22399
+MD5 342f5acc8a2e99672e90f384dc6abf8e xine-lib-1_rc4.ebuild 4462
+MD5 1bb6b8212dd040e9486991b4ee4ad2e2 xine-lib-1_rc4-r1.ebuild 4863
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 21f16ff9e27523f78078b77e1bd41c54 xine-lib-1_rc3-r1.ebuild 4042
+MD5 24744855c2705284a492b1923be3bd1e ChangeLog 22550
+MD5 062106d966a0903ff7008d3ae49d9e8f xine-lib-1_rc5-r2.ebuild 5099
 MD5 3d849500b17b5ad075102cf70d75b7c4 xine-lib-0.9.13-r3.ebuild 3354
 MD5 c639cbd78aac77ed3cff247df68d2608 xine-lib-1_rc2.ebuild 3934
-MD5 21f16ff9e27523f78078b77e1bd41c54 xine-lib-1_rc3-r1.ebuild 4042
-MD5 1bb6b8212dd040e9486991b4ee4ad2e2 xine-lib-1_rc4-r1.ebuild 4863
-MD5 342f5acc8a2e99672e90f384dc6abf8e xine-lib-1_rc4.ebuild 4462
-MD5 7d0d15a77de800b91d9ae10d78826ae0 xine-lib-1_rc5-r2.ebuild 4868
-MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
-MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
-MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 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 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 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc5 597
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
-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 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
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc5 597
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
-MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r2 67
 MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
+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 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r2 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 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
+MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
 MD5 e87a4ce6246db7db0d3cf0d967cb62d2 files/protect-CFLAGS.patch-1_rc5-r2 641
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA4cQLHTu7gpaalycRAhaOAKC9tate/klkfg0KrQl2vG7mdhl8KQCfUwuH
-LWU0pZBHw4bTmDSvLB7hXpo=
-=QtUg
------END PGP SIGNATURE-----
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
+MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67
+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
diff --git a/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild b/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
index 38535fd88d8b..774c1ad2a79e 100644
--- a/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc5-r2.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_rc5-r2.ebuild,v 1.5 2004/06/29 19:33:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild,v 1.6 2004/06/29 22:47:00 hansmi Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -14,7 +14,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"
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6"
+IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec"
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	!amd64? ( X? ( virtual/x11 ) )
@@ -109,6 +109,14 @@ src_compile() {
 	use amd64 \
 		&& myconf="${myconf} --with-xv-path=/usr/X11R6/lib"
 
+	# Fix compilation-errors on PowerPC
+	# Bugs: 45393 and 55460
+	if use ppc; then
+		append-flags -U__ALTIVEC__
+		use altivec && myconf="${myconf} --enable-altivec" \
+		            || myconf="${myconf} --disable-altivec"
+	fi
+
 	# The default CFLAGS (-O) is the only thing working on hppa.
 	if use hppa && [ "`gcc-version`" != "3.4" ] ; then
 		unset CFLAGS