Version bumped.

5 files changed, 189 insertions, 18 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 0ea389598aaf..bddb5e66e89d 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.77 2003/11/29 23:12:13 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.78 2003/12/17 23:13:28 mholzer Exp $
+
+*xine-lib-1_rc3 (18 Dec 2003)
+
+  18 Dec 2003; Martin Holzer <mholzer@gentoo.org> xine-lib-1_rc3.ebuild:
+  Version bumped.
 
   26 Nov 2003; Martin Holzer <mholzer@gentoo.org> xine-lib-1_rc2.ebuild:
   marking x86 stable.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 74b65d725e65..2f025a1ef86d 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,25 +1,27 @@
-MD5 4f50496e3cab1ea68533a6de616ac7e6 ChangeLog 14774
-MD5 ae4bc626a0e60a274f0edcd798d9ad7f metadata.xml 252
-MD5 e5f3c44f7623ca8935cfb036f659d60c xine-lib-0.9.13-r3.ebuild 3656
-MD5 512b8ccb65630b7d1401a20066d9b25d xine-lib-1_beta12-r1.ebuild 4168
+MD5 20cc2f02deed5d4e88f7c2d6fa28db98 xine-lib-1_rc3.ebuild 4205
 MD5 7f49f48a39c11bd0858b9ce75d5069e0 xine-lib-1_beta12.ebuild 3734
+MD5 3e6a76efacdb1d66aeab5618c2d5cbb9 xine-lib-1_rc2.ebuild 4373
+MD5 512b8ccb65630b7d1401a20066d9b25d xine-lib-1_beta12-r1.ebuild 4168
 MD5 5f685f685db7b1ad3bd3c4e4c03bfec7 xine-lib-1_rc0-r3.ebuild 4206
+MD5 e5f3c44f7623ca8935cfb036f659d60c xine-lib-0.9.13-r3.ebuild 3656
+MD5 ae4bc626a0e60a274f0edcd798d9ad7f metadata.xml 252
 MD5 995b1b6e63c221206a37d86b9aaf8fbe xine-lib-1_rc1.ebuild 4361
-MD5 3e6a76efacdb1d66aeab5618c2d5cbb9 xine-lib-1_rc2.ebuild 4373
-MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
-MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12 70
+MD5 4f50496e3cab1ea68533a6de616ac7e6 ChangeLog 14774
 MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12-r1 70
+MD5 8eb4910b4744e8b723e3ebf22c292efc files/digest-xine-lib-1_rc3 67
+MD5 31ab44d87982996031a1074d289fb9f6 files/protect-CFLAGS.patch-1_rc2 691
+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 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12 70
+MD5 27835f984dc34d114e3792366c361f21 files/protect-CFLAGS.patch 628
+MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.12 601
+MD5 6e79367c32da81354d36e68fd1a24ae2 files/xineconfig.patch 699
 MD5 6be0e52978dd6b72e1626d6fe0053a24 files/digest-xine-lib-1_rc0-r3 68
+MD5 8c8cd02ba98cd652fce9ca5e56af5482 files/xine-lib-1_rc0-gcc2_fix.patch 4424
 MD5 d8ddf1012c20d50f994f27da61fa7fcd files/digest-xine-lib-1_rc1 67
-MD5 27835f984dc34d114e3792366c361f21 files/protect-CFLAGS.patch 628
 MD5 fde9b1781cda75ca37749fa471d80346 files/protect-CFLAGS.patch-1_rc1 691
 MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 8c8cd02ba98cd652fce9ca5e56af5482 files/xine-lib-1_rc0-gcc2_fix.patch 4424
-MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
-MD5 6e79367c32da81354d36e68fd1a24ae2 files/xineconfig.patch 699
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.12 601
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
-MD5 31ab44d87982996031a1074d289fb9f6 files/protect-CFLAGS.patch-1_rc2 691
+MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc3 b/media-libs/xine-lib/files/digest-xine-lib-1_rc3
new file mode 100644
index 000000000000..72e542ca37cc
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1_rc3
@@ -0,0 +1 @@
+MD5 7c167874a3f9f4c025acc6432c073fd9 xine-lib-1-rc3.tar.gz 6121843
diff --git a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc3 b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc3
new file mode 100644
index 000000000000..cb24cdae098c
--- /dev/null
+++ b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc3
@@ -0,0 +1,22 @@
+--- xine-lib-1-rc3/configure.orig	2003-12-15 11:28:29.000000000 +0100
++++ xine-lib-1-rc3/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/xine-lib-1_rc3.ebuild b/media-libs/xine-lib/xine-lib-1_rc3.ebuild
new file mode 100644
index 000000000000..c75dc67ec280
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1_rc3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2003 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_rc3.ebuild,v 1.1 2003/12/17 23:13:28 mholzer Exp $
+
+inherit eutils flag-o-matic
+
+# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
+# Commenting this out in this ebuild, because CFLAGS and CXXFLAGS are unset
+# at make time any way.
+# Brandon Low (29 Apr 2003)
+# inherit flag-o-matic
+filter-flags "-maltivec -mabi=altivec"
+# replace-flags k6-3 i686
+# replace-flags k6-2 i686
+# replace-flags k6   i686
+
+#fix build errors with -march/mcpu=pentium4
+if [ "$COMPILER" == "gcc3" ]; then
+	if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then
+		append-flags -mno-sse2
+	fi
+fi
+
+#13 Jul 2003: drobbins: build failure using -j5 on a dual Xeon in 1_beta12
+MAKEOPTS="$MAKEOPTS -j1"
+
+# 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"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64"
+IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl"
+
+RDEPEND="oggvorbis? ( media-libs/libvorbis )
+	X? ( virtual/x11 )
+	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 )
+	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
+	media-libs/speex"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+#sys-devel/gcc-3.2 fixes -march=pentium4 compile issue
+
+S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
+
+src_unpack() {
+
+	unpack ${A}
+
+	# 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} || die
+}
+
+src_compile() {
+	# Make sure that the older libraries are not installed (bug #15081).
+	if [ -f /usr/lib/libxine.so.0 ]
+	then
+		einfo "Please uninstall older xine libraries.";
+		einfo "The compilation cannot proceed.";
+		die
+	fi
+
+	# Use the built-in dvdnav plugin.
+	local myconf="--with-included-dvdnav"
+
+	# Most of these are not working currently, but are here for completeness
+	# don't use the --disable-XXXtest because that defaults to ON not OFF
+	use X \
+		|| myconf="${myconf} --disable-x11"
+	use esd	\
+		|| myconf="${myconf} --disable-esd"
+	use nls	\
+		|| myconf="${myconf} --disable-nls"
+	use alsa \
+		|| myconf="${myconf} --disable-alsa"
+	use arts \
+		|| myconf="${myconf} --disable-arts"
+	use aalib \
+		|| myconf="${myconf} --disable-aalib"
+	use oggvorbis \
+		|| myconf="${myconf} --disable-ogg --disable-vorbis"
+
+	use avi	\
+		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
+		|| myconf="${myconf} --disable-asf"
+	use sdl \
+		|| myconf="${myconf} --with-sdl-prefix=/null"
+
+	econf ${myconf} || die "Configure failed"
+
+	emake || 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
+}