Version bumped. closes 45113.

4 files changed, 150 insertions, 6 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 58fe8431f716..541c8770fd4d 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.92 2004/02/19 08:51:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.93 2004/03/21 15:20:12 mholzer Exp $
+
+*xine-lib-1_rc3-r2 (21 Mar 2004)
+
+  21 Mar 2004; Martin Holzer <mholzer@gentoo.org> xine-lib-1_rc3-r2.ebuild:
+  Version bumped. closes 45113.
 
   19 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> xine-lib-1_rc2.ebuild:
   cd to ${S} in unpack so the patch works
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 821acc78b2e5..8147b887a5b6 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,17 +1,19 @@
-MD5 712d9cf350624093c8d405e30f625297 ChangeLog 17155
+MD5 10d8f16650afe0615e96272097abfdcc ChangeLog 17296
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 74eefa329c52e465c889ab8d509843bc xine-lib-0.9.13-r3.ebuild 3461
-MD5 13eec76b0a026a7a210c914bebb5bbd1 xine-lib-1_rc3-r1.ebuild 4126
 MD5 2d8af992b607144689ef99e1482005cd xine-lib-1_rc2.ebuild 4038
+MD5 13eec76b0a026a7a210c914bebb5bbd1 xine-lib-1_rc3-r1.ebuild 4126
+MD5 3fe090cfb852dc744203800a1f4ff573 xine-lib-1_rc3-r2.ebuild 3973
 MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
+MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
 MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
+MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
 MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
 MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
 MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 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 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
-MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
+MD5 3824a3bb0c207c34e9bec101cac52a91 files/digest-xine-lib-1_rc3-r2 68
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc3-r2 b/media-libs/xine-lib/files/digest-xine-lib-1_rc3-r2
new file mode 100644
index 000000000000..3202a29106f0
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1_rc3-r2
@@ -0,0 +1 @@
+MD5 20d90ab83b52711c1f60060b52571230 xine-lib-1-rc3b.tar.gz 6422089
diff --git a/media-libs/xine-lib/xine-lib-1_rc3-r2.ebuild b/media-libs/xine-lib/xine-lib-1_rc3-r2.ebuild
new file mode 100644
index 000000000000..49f88f56d22e
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1_rc3-r2.ebuild
@@ -0,0 +1,136 @@
+# 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_rc3-r2.ebuild,v 1.1 2004/03/21 15:20:12 mholzer Exp $
+
+inherit eutils flag-o-matic gcc libtool
+
+# This should normally be empty string, unless a release has a suffix.
+MY_PKG_SUFFIX="b"
+
+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 ~ia64"
+IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6"
+
+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 )
+	!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
+	[ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch
+
+	elibtoolize #40317
+}
+
+src_compile() {
+	filter-flags -maltivec -mabi=altivec -fstack-protector
+	has_version sys-devel/hardened-gcc && filter-flags -fPIC
+
+	# fix build errors with sse2
+	if [ "`gcc-version`" == "3.2" ]; then
+		use x86 && append-flags -mno-sse2
+	fi
+
+	if [ "`gcc-version`" == "3.3" ]; then
+		use x86 && 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"
+
+	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 theora theoratest` \
+		`use_enable speex speextest` \
+		`use_enable sdl sdltest` \
+		`use_enable ipv6` \
+		`use_enable aalib aalibtest` \
+		`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
+}