Version bumped. Closes 54913

6 files changed, 221 insertions, 32 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 4b381b44d9b2..95d50d6a7ade 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 Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.124 2004/06/21 04:58:06 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.125 2004/06/24 14:40:29 mholzer Exp $
+
+*xine-lib-1_rc5 (24 Jun 2004)
+
+  24 Jun 2004; Martin Holzer <mholzer@gentoo.org> xine-lib-1_rc5.ebuild,
+  files/protect-CFLAGS.patch-1_rc5,
+  files/xine-lib-1_rc5-configure-sparc.patch:
+  Version bumped. Closes 54913
 
   21 Jun 2004; Brad Laue <brad@gentoo.org> xine-lib-1_rc4-r1.ebuild:
   Stable on x86.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index d7799fc65b3c..8a80e58caaba 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,41 +1,35 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 978e695d2bad5bd4d557b70670e26de1 ChangeLog 21426
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 c2750c139598cc3fd323b46d064a85bd xine-lib-0.9.13-r3.ebuild 3404
+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 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 83b7e79e248bf94ce81ab503cbdf4c7c xine-lib-1_rc3-r2.ebuild 3896
-MD5 f822564287a1fff840444a38eaa40dc5 xine-lib-1_rc3-r3.ebuild 4191
-MD5 a6a18d1803bfe8fc4c3a33a41f28ae9d xine-lib-1_rc4-r1.ebuild 4930
+MD5 f9a772fe75a04dc573ade1d22cbf1a05 ChangeLog 21647
 MD5 885e277078c977fdaa4d8feef850327a xine-lib-1_rc4.ebuild 4490
-MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
-MD5 3824a3bb0c207c34e9bec101cac52a91 files/digest-xine-lib-1_rc3-r2 68
-MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
-MD5 d24969404b35f029bf203da4b53a3c3d files/digest-xine-lib-1_rc3-r3 68
+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 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 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 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc5 597
+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 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+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 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
+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 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA2hs7HTu7gpaalycRAiMKAKCaf9RwJkFHlE4juqDYqA3nD4Rw1QCgvrFn
-BZTLD+QTAaT/uLV++jVgufk=
-=PhCV
------END PGP SIGNATURE-----
+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/files/digest-xine-lib-1_rc5 b/media-libs/xine-lib/files/digest-xine-lib-1_rc5
new file mode 100644
index 000000000000..538dc38af828
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1_rc5
@@ -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 b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc5
new file mode 100644
index 000000000000..c42e6a87cf1a
--- /dev/null
+++ b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc5
@@ -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="$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/files/xine-lib-1_rc5-configure-sparc.patch b/media-libs/xine-lib/files/xine-lib-1_rc5-configure-sparc.patch
new file mode 100644
index 000000000000..e9c943f7c980
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1_rc5-configure-sparc.patch
@@ -0,0 +1,15 @@
+--- xine-lib-1-rc3/configure.ac.org	2003-12-29 14:44:22.000000000 +0100
++++ xine-lib-1-rc3/configure.ac	2003-12-29 14:47:43.000000000 +0100
+@@ -1505,9 +1505,9 @@
+     ;;
+ 
+   sparc*-*-linux*)
+-    case $host_alias in
+-    sparc-*)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
+-    sparc64-*)
++    case `uname -m` in
++    sparc)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
++    sparc64)
+       cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc"
+       if test x$enable_vis = xyes; then
+         AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
diff --git a/media-libs/xine-lib/xine-lib-1_rc5.ebuild b/media-libs/xine-lib/xine-lib-1_rc5.ebuild
new file mode 100644
index 000000000000..7b6af4507918
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1_rc5.ebuild
@@ -0,0 +1,150 @@
+# 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 $
+
+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-${PV}
+	# 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
+
+	# 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
+}