Bump, see changelog

4 files changed, 138 insertions, 3 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 243e941c2aee..6ce3d0cd6fd8 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,17 @@
 # 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.52 2003/04/15 20:30:04 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.53 2003/04/29 07:30:30 lostlogic Exp $
+
+*xine-lib-1_beta11 (29 Apr 2003)
+
+  29 Apr 2003; Brandon Low <lostlogic@gentoo.org> xine-lib-1_beta11.ebuild:
+  A bump, and several ebuild changes. Specifically removed the use of
+  flag-o-matic since CFLAGS and CXXFLAGS are unset later in the ebuild to let
+  the configure script save us from ourselves, I'd like to find a better
+  solution to this eventually since the current setup isn't real good for
+  cross-compiling. Also set the ebuild to use emake instead of make, it looks as
+  if the xine folks have gotten parallel building fixed, but please test this
+  extensively, especially in SMP configurations to confirm.
 
 *xine-lib-1_beta10 (09 Apr 2003)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index cfe7adf0da06..bb6fcf428a6d 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,6 +1,6 @@
 MD5 1388f8c8e8516b9fa9888072abb566d8 xine-lib-0.9.13-r3.ebuild 3704
 MD5 55fe7dc6b1fe7fb9a2c108bc9a662341 xine-lib-1_beta9.ebuild 3480
-MD5 9d82ce9114c5e771ec3b52afcf78d5cc xine-lib-1_beta11.ebuild 3480
+MD5 a74a9c4f58364a7e61fa3678b5d2b9ac xine-lib-1_beta11.ebuild 3664
 MD5 218c18f42011f0fcac9f16da0a604bbb xine-lib-0.9.13.ebuild 3031
 MD5 d95ccacba6d8b7dc21015fa12027648a xine-lib-0.9.13-r2.ebuild 3687
 MD5 b8f5890f8d2570139de0617b699f4140 xine-lib-1_beta6.ebuild 3480
@@ -9,7 +9,7 @@ MD5 04c05d2a7d3a566d480b19235864a391 xine-lib-1_beta8.ebuild 3480
 MD5 1daf8b387966892b2f47ff7f63b8f00a xine-lib-0.9.12-r2.ebuild 3191
 MD5 9d82ce9114c5e771ec3b52afcf78d5cc xine-lib-1_beta10.ebuild 3480
 MD5 61dc38b2a4565b7953551380ffe49b30 xine-lib-0.9.13-r1.ebuild 3389
-MD5 fbd7ae97d4be724dc01819b25e666739 ChangeLog 10402
+MD5 13f3ecd0618f1176b0ba7fd9a60af48c ChangeLog 11029
 MD5 043c241269aaf0acd4dfd9a52ccac47c files/digest-xine-lib-1_beta6 69
 MD5 790f330d136eac4ab025b9f013e9cb07 files/digest-xine-lib-1_beta8 69
 MD5 06ed3dc39a0e981aa6b99cc007b74ccc files/digest-xine-lib-1_beta9 69
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_beta11 b/media-libs/xine-lib/files/digest-xine-lib-1_beta11
new file mode 100644
index 000000000000..570775e93bf3
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1_beta11
@@ -0,0 +1 @@
+MD5 da38e1f3be55a2f4818e53e9a42117cf xine-lib-1-beta11.tar.gz 3896944
diff --git a/media-libs/xine-lib/xine-lib-1_beta11.ebuild b/media-libs/xine-lib/xine-lib-1_beta11.ebuild
new file mode 100644
index 000000000000..1e7a0bf2086f
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1_beta11.ebuild
@@ -0,0 +1,123 @@
+# 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_beta11.ebuild,v 1.1 2003/04/29 07:30:30 lostlogic Exp $ 
+
+DESCRIPTION="Core libraries for Xine movie player."
+HOMEPAGE="http://xine.sourceforge.net/"
+LICENSE="GPL-2"
+
+DEPEND="oggvorbis? ( media-libs/libvorbis )
+	X? ( virtual/x11 )
+	avi? ( >=media-libs/win32codecs-0.50 
+	       media-libs/divx4linux )
+	esd? ( media-sound/esound )
+	dvd? ( >=media-libs/libdvdcss-0.0.3.3
+	       >=media-libs/libdvdread-0.9.2 )
+	arts? ( kde-base/arts )
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	directfb? ( >=dev-libs/DirectFB-0.9.9
+		    dev-util/pkgconfig )
+	>=media-libs/flac-1.0.4
+	>=media-libs/libsdl-1.1.5
+	>=media-libs/libfame-0.9.0
+	>=media-libs/xvid-0.9.0"
+
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
+IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+S=${WORKDIR}/${PN}-${PV/_/-}
+SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
+
+# 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  || die "I lost my inheritance"
+# filter-flags "-maltivec -mabi=altivec"
+# replace-flags k6-3 i686
+# replace-flags k6-2 i686
+# replace-flags k6   i686
+
+
+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 procede.";
+		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" # --disable-xv"
+	use esd	\
+		|| myconf="${myconf} --disable-esd" # --disable-esdtest"
+	use nls	\
+		|| myconf="${myconf} --disable-nls"
+	use alsa \
+		|| myconf="${myconf} --disable-alsa" # --disable-alsatest"
+	use arts \
+		|| myconf="${myconf} --disable-arts" # --disable-artstest"
+	use aalib \
+		|| myconf="${myconf} --disable-aalib" # --disable-aalibtest"
+	use oggvorbis \
+		|| myconf="${myconf} --disable-ogg --disable-vorbis"
+			   #--disable-oggtest --disable-vorbistest"
+	use avi	\
+		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
+		|| myconf="${myconf} --disable-asf"
+
+	einfo "myconf: ${myconf}"
+
+	# Very specific optimization is set by configure
+	# Should fix problems like the one found on bug #11779
+	# raker@gentoo.org (25 Dec 2002)
+	unset CFLAGS
+	unset CXXFLAGS
+
+	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
+
+}