forward port fixes mholzer dropped for some stupid reason

7 files changed, 32 insertions, 31 deletions

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index d86dffc5f074..7cb75e16cb79 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -3,12 +3,12 @@ Hash: SHA1
 
 MD5 a95754895d70ac38ef78eb245887af8a ChangeLog 22399
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 4eebdf82dbee6f70cee8e77cd07573e6 xine-lib-0.9.13-r3.ebuild 3396
-MD5 b81434d09564e9c4442330ebc628a0de xine-lib-1_rc2.ebuild 3976
-MD5 0f15eac2c13ae3b4e82609e2a4817691 xine-lib-1_rc3-r1.ebuild 4064
-MD5 e5ea29af2d6d5e6f7b4f9e34ecf78e87 xine-lib-1_rc4-r1.ebuild 4924
-MD5 b53ba89865f9735d9ebc10630345c917 xine-lib-1_rc4.ebuild 4484
-MD5 b9d2ca99b55ea6ccb9c53b5cc524e282 xine-lib-1_rc5-r2.ebuild 4654
+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 1f3f5280a9f3cf03b49587b108d27545 xine-lib-1_rc4-r1.ebuild 4956
+MD5 342f5acc8a2e99672e90f384dc6abf8e xine-lib-1_rc4.ebuild 4462
+MD5 98ac6f43c9976f277e45eb710c0d6848 xine-lib-1_rc5-r2.ebuild 4961
 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
@@ -37,7 +37,7 @@ MD5 e87a4ce6246db7db0d3cf0d967cb62d2 files/protect-CFLAGS.patch-1_rc5-r2 641
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.8 (GNU/Linux)
 
-iD8DBQFA4b0bHTu7gpaalycRAnzqAKCrBTMSAQXuqBYyau0fTqdezkWHBQCgkrmQ
-7QPH6TZkck+ZOBFAWKgiZa4=
-=GZlo
+iD8DBQFA4b47HTu7gpaalycRAvNwAKDB47+trGHn6TivUzuj32pwTKckGQCfUqm/
+nmTw1M091GpP7NzOBpuOJAI=
+=9aYt
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild b/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild
index 721a2dd9899e..0cbe05d56856 100644
--- a/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.13-r3.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-0.9.13-r3.ebuild,v 1.12 2004/06/24 23:25:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild,v 1.13 2004/06/29 19:08:20 vapier Exp $
 
 
 inherit libtool flag-o-matic eutils gcc
@@ -8,13 +8,11 @@ inherit libtool flag-o-matic eutils gcc
 DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc"
 IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
-RESTRICT="nomirror"
 
 DEPEND="oggvorbis? ( media-libs/libvorbis )
 	X? ( virtual/x11 )
diff --git a/media-libs/xine-lib/xine-lib-1_rc2.ebuild b/media-libs/xine-lib/xine-lib-1_rc2.ebuild
index 1ce4c9abd644..b12bf607b759 100644
--- a/media-libs/xine-lib/xine-lib-1_rc2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc2.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_rc2.ebuild,v 1.17 2004/06/24 23:25:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc2.ebuild,v 1.18 2004/06/29 19:08:20 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -10,13 +10,11 @@ MY_PKG_SUFFIX=""
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="x86 ~ppc hppa ~sparc amd64 alpha ia64"
 IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex"
-RESTRICT="nomirror"
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	X? ( virtual/x11 )
diff --git a/media-libs/xine-lib/xine-lib-1_rc3-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc3-r1.ebuild
index ff42341257c6..bdcf8166e688 100644
--- a/media-libs/xine-lib/xine-lib-1_rc3-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc3-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_rc3-r1.ebuild,v 1.17 2004/06/24 23:25:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc3-r1.ebuild,v 1.18 2004/06/29 19:08:20 vapier Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -10,7 +10,6 @@ MY_PKG_SUFFIX="a"
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="1"
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 e61327d5189e..a323d8eee106 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 Foundation
 # 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.14 2004/06/24 23:25:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild,v 1.15 2004/06/29 19:08:20 vapier Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -82,6 +82,7 @@ src_compile() {
 	filter-flags -fstack-protector -fPIC
 	filter-flags -fforce-addr
 	filter-flags -momit-leaf-frame-pointer #46339
+	filter-flags -fno-unit-at-a-time
 	[ "`gcc-fullversion`" == "3.4.0" ] && append-flags -fno-web #49509
 
 	is-flag -O? || append-flags -O1 #31243
diff --git a/media-libs/xine-lib/xine-lib-1_rc4.ebuild b/media-libs/xine-lib/xine-lib-1_rc4.ebuild
index 8488405fdbaf..dd47aafc2879 100644
--- a/media-libs/xine-lib/xine-lib-1_rc4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc4.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_rc4.ebuild,v 1.10 2004/06/24 23:25:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc4.ebuild,v 1.11 2004/06/29 19:08:20 vapier Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -10,7 +10,6 @@ MY_PKG_SUFFIX=""
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="1"
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 9c04bc397b37..6538c632f6d7 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 Technologies, Inc.
+# 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.1 2004/06/29 14:58:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild,v 1.2 2004/06/29 19:08:20 vapier Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -78,17 +78,20 @@ src_unpack() {
 }
 
 src_compile() {
-	filter-flags -maltivec -mabi=altivec -fstack-protector
-	filter-flags -fPIC
+	filter-flags -maltivec -mabi=altivec
+	filter-flags -fstack-protector -fPIC
 	filter-flags -fforce-addr
+	filter-flags -momit-leaf-frame-pointer #46339
 	filter-flags -fno-unit-at-a-time
 	[ "`gcc-fullversion`" == "3.4.0" ] && append-flags -fno-web #49509
 
-	# fix build errors with sse2
+	is-flag -O? || append-flags -O1 #31243
+
+	# fix build errors with sse2 #49482
 	if use x86 ; then
-		[ "`gcc-version`" == "3.2" ] && append-flags -mno-sse2
-		[ "`gcc-version`" == "3.3" ] && append-flags -mno-sse2
-		[ "`gcc-version`" == "3.4" ] && append-flags -mno-sse2
+		[ "`gcc-version`" == "3.2" ] && append-flags -mno-sse2 && filter-mfpmath sse
+		[ "`gcc-version`" == "3.3" ] && append-flags -mno-sse2 -mno-sse3 && filter-mfpmath sse
+		[ "`gcc-version`" == "3.4" ] && append-flags -mno-sse2 -mno-sse3 && filter-mfpmath sse
 	fi
 
 	# Use the built-in dvdnav plugin.
@@ -105,11 +108,14 @@ src_compile() {
 		&& myconf="${myconf} --with-xv-path=/usr/X11R6/lib"
 
 	# The default CFLAGS (-O) is the only thing working on hppa.
-	use hppa \
-		&& unset CFLAGS
+	if use hppa && [ "`gcc-version`" != "3.4" ] ; then
+		unset CFLAGS
+	else
+		append-flags -ffunction-sections
+	fi
 
 	econf \
-		`use_enable X x11` \
+		`use_enable X x11` `use_with X x` `use_enable X shm` `use_enable X xft` \
 		`use_enable esd` \
 		`use_enable nls` \
 		`use_enable alsa` \