new protect-CFLAGS patch. closes 55534

7 files changed, 190 insertions, 3 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index b84a5cd57bf6..8fb5c9f55cdc 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,13 @@
 # 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.129 2004/06/28 11:03:03 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.130 2004/06/29 14:58:38 mholzer Exp $
+
+*xine-lib-1_rc5-r2 (29 Jun 2004)
+
+  29 Jun 2004; Martin Holzer <mholzer@gentoo.org>
+  +files/protect-CFLAGS.patch-1_rc5-r2, xine-lib-1_rc5-r1.ebuild,
+  +xine-lib-1_rc5-r2.ebuild, xine-lib-1_rc5.ebuild:
+  new protect-CFLAGS patch. closes 55534
 
 *xine-lib-1_rc5-r1 (28 Jun 2004)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 97eed870d45f..f5633f7a38c6 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -8,6 +8,7 @@ MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 0f15eac2c13ae3b4e82609e2a4817691 xine-lib-1_rc3-r1.ebuild 4064
 MD5 284f6836dd3bd980216e78d0474d8344 xine-lib-1_rc3-r2.ebuild 3892
 MD5 27144c3ef5438b82515510c250d40d35 ChangeLog 22155
+MD5 65d1a89dd0c540c0f971b3ecf36e4235 xine-lib-1_rc5-r2.ebuild 4586
 MD5 b53ba89865f9735d9ebc10630345c917 xine-lib-1_rc4.ebuild 4484
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
 MD5 4927f9e562e68f539a5f3a6e4711d873 files/digest-xine-lib-1_rc4-r1 68
@@ -26,11 +27,13 @@ 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 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 e87a4ce6246db7db0d3cf0d967cb62d2 files/protect-CFLAGS.patch-1_rc5-r2 641
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
 MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r1 67
 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 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r2 67
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
 MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
 MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc5-r2 b/media-libs/xine-lib/files/digest-xine-lib-1_rc5-r2
new file mode 100644
index 000000000000..538dc38af828
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1_rc5-r2
@@ -0,0 +1 @@
+MD5 703c3e68d60524598d4d9e527fe38286 xine-lib-1-rc5.tar.gz 7052663
diff --git a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc5-r2 b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc5-r2
new file mode 100644
index 000000000000..9b21f8e0fd05
--- /dev/null
+++ b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc5-r2
@@ -0,0 +1,22 @@
+--- configure.orig	2003-12-15 11:28:29.000000000 +0100
++++ configure	2003-12-17 23:26:25.000000000 +0100
+@@ -39143,7 +39143,7 @@
+         k7cpu="i686"
+     fi
+ 
+-		CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions $CFLAGS"
++		CFLAGS="$f_af $f_al $f_aj $m_wm $m_psb $f_si $f_nsa $CFLAGS"
+ 
+ 	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
+ 
+@@ -39195,10 +39195,6 @@
+ 		;;
+ 
+ 	    esac
+-	    if test x"$archopt_val" != x; then
+-		CFLAGS="$sarchopt=$archopt_val $CFLAGS"
+-		DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
+-	    fi
+ 
+ 	fi
+       else
diff --git a/media-libs/xine-lib/xine-lib-1_rc5-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc5-r1.ebuild
index 316ded9d28e8..d8036e55209d 100644
--- a/media-libs/xine-lib/xine-lib-1_rc5-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc5-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_rc5-r1.ebuild,v 1.2 2004/06/28 11:07:21 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r1.ebuild,v 1.3 2004/06/29 14:58:38 mholzer Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -82,6 +82,7 @@ src_compile() {
 	filter-flags -fPIC
 	filter-flags -fforce-addr
 	filter-flags -fno-unit-at-a-time
+	[ "`gcc-fullversion`" == "3.4.0" ] && append-flags -fno-web #49509
 
 	# fix build errors with sse2
 	if use x86 ; then
diff --git a/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild b/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
new file mode 100644
index 000000000000..9c04bc397b37
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
@@ -0,0 +1,152 @@
+# 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-r2.ebuild,v 1.1 2004/06/29 14:58:38 mholzer Exp $
+
+inherit eutils flag-o-matic gcc libtool
+
+# This should normally be empty string, unless a release has a suffix.
+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"
+
+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"
+
+RDEPEND="oggvorbis? ( media-libs/libvorbis )
+	!amd64? ( X? ( virtual/x11 ) )
+	amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
+	avi? ( x86? ( >=media-libs/win32codecs-0.50
+	       media-libs/divx4linux ) )
+	esd? ( media-sound/esound )
+	dvd? ( >=media-libs/libdvdcss-1.2.7 )
+	arts? ( kde-base/arts )
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	!sparc? ( directfb? ( >=dev-libs/DirectFB-0.9.9
+		    dev-util/pkgconfig ) )
+	gnome? ( >=gnome-base/gnome-vfs-2.0
+			dev-util/pkgconfig )
+	>=media-libs/flac-1.0.4
+	sdl? ( >=media-libs/libsdl-1.1.5 )
+	>=media-libs/libfame-0.9.0
+	>=media-libs/xvid-0.9.0
+	theora? ( media-libs/libtheora )
+	speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
+
+pkg_setup() {
+	# Make sure that the older libraries are not installed (bug #15081).
+	if [ `has_version =media-libs/xine-lib-0.9.13*` ]
+	then
+		eerror "Please uninstall older xine libraries.";
+		eerror "The compilation cannot proceed.";
+		die
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# gcc2 fixes provided by <T.Henderson@cs.ucl.ac.uk> in #26534
+	#epatch ${FILESDIR}/${P}-gcc2_fix.patch
+	# preserve CFLAGS added by drobbins, -O3 isn't as good as -O2 most of the time
+	epatch ${FILESDIR}/protect-CFLAGS.patch-${PVR}
+	# plasmaroo: Kernel 2.6 headers patch
+	epatch ${FILESDIR}/${PN}-2.6.patch
+	# force 32 bit userland
+	[ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch
+
+	# always_inline means inline-or-fail, so it's no suprise that xine-lib
+	# fails to compile with gcc 3.4 when this one inline fails
+	#epatch ${FILESDIR}/xine-lib-gcc34.patch
+
+	elibtoolize #40317
+
+	# Fix building on amd64, #49569
+	#use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
+
+	# Fix detection of hppa2.0 and hppa1.1 CHOST
+	use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure
+}
+
+src_compile() {
+	filter-flags -maltivec -mabi=altivec -fstack-protector
+	filter-flags -fPIC
+	filter-flags -fforce-addr
+	filter-flags -fno-unit-at-a-time
+	[ "`gcc-fullversion`" == "3.4.0" ] && append-flags -fno-web #49509
+
+	# fix build errors with sse2
+	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
+	fi
+
+	# Use the built-in dvdnav plugin.
+	local myconf="--with-included-dvdnav"
+
+	use avi	&& use x86 \
+		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
+		|| myconf="${myconf} --disable-asf"
+
+	use sparc \
+		&& myconf="${myconf} --enable-vis --build=${CHOST}"
+
+	use amd64 \
+		&& myconf="${myconf} --with-xv-path=/usr/X11R6/lib"
+
+	# The default CFLAGS (-O) is the only thing working on hppa.
+	use hppa \
+		&& unset CFLAGS
+
+	econf \
+		`use_enable X x11` \
+		`use_enable esd` \
+		`use_enable nls` \
+		`use_enable alsa` \
+		`use_enable arts` \
+		`use_enable aalib` \
+		`use_enable oggvorbis ogg` `use_enable oggvorbis vorbis` \
+		`use_enable sdl sdltest` \
+		`use_enable ipv6` \
+		`use_enable directfb` \
+		${myconf} || die "Configure failed"
+
+	emake -j1 || die "Parallel make failed"
+}
+
+src_install() {
+	einstall || die "Install failed"
+
+	# Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
+	dodir /usr/share/xine/libxine1/fonts
+	mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
+	cd ${S}/doc
+	dodoc dataflow.dia README*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please note, a new version of xine-lib has been installed,"
+	einfo "for library consistency you need to unmerge old versions"
+	einfo "of xine-lib before merging xine-ui."
+	einfo
+	einfo "This library version 1 is incompatible with the plugins,"
+	einfo "designed for the prior library versions (such as xine-d4d,"
+	einfo "xine-d5d, xine-dmd, and xine-dvdnav."
+	einfo
+	einfo "Also make sure to remove your ~/.xine if upgrading from"
+	einfo "a previous version."
+	einfo
+}
diff --git a/media-libs/xine-lib/xine-lib-1_rc5.ebuild b/media-libs/xine-lib/xine-lib-1_rc5.ebuild
index 670e7f449bcd..13407d451563 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 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.ebuild,v 1.5 2004/06/26 20:15:17 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5.ebuild,v 1.6 2004/06/29 14:58:38 mholzer Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -81,6 +81,7 @@ src_compile() {
 	filter-flags -fstack-protector
 	filter-flags -fPIC
 	filter-flags -fforce-addr
+	[ "`gcc-fullversion`" == "3.4.0" ] && append-flags -fno-web #49509
 
 	# fix build errors with sse2
 	if use x86 ; then