Added new upstream version 1.0.1, with new configure patch. Dropped patches applied upstream. Made speex useflag be honoured.

Package-Manager: portage-2.0.51.20-r4

4 files changed, 262 insertions, 3 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index f6bc9e584e17..95d4fd3c5d36 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.213 2005/04/25 16:49:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.214 2005/04/26 13:17:45 flameeyes Exp $
+
+*xine-lib-1.0.1 (26 Apr 2005)
+
+  26 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> +xine-lib-1.0.1.ebuild:
+  Added new upstream version 1.0.1, with new configure patch. Dropped patches
+  applied upstream. Made speex useflag be honoured.
 
 *xine-lib-1_rc6-r2 (25 Apr 2005)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index cc5cd731bbd4..365d8d810a88 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -6,8 +6,9 @@ MD5 60f92c0bf2f960ee5fe72cfd8b60e60b xine-lib-1_rc8-r1.ebuild 5688
 MD5 85910e7a6aab4d7728ccdd55c1f0664b xine-lib-1.0-r2.ebuild 7506
 MD5 9415e56720946429be1cd7c6142f4351 xine-lib-1.0-r3.ebuild 7578
 MD5 79cd4ff146e065a636eae4001b6d0b6a xine-lib-1.0-r4.ebuild 7845
-MD5 1406a002f16e83afedca5c76703f29e6 ChangeLog 5067
+MD5 a75ab7810b28d78a4c9aafe6f24fa372 ChangeLog 5306
 MD5 d55745ddf67346fde75c395be629afe0 xine-lib-1_rc6-r2.ebuild 5698
+MD5 adcea5f4bf522daca64270e63f43f01a xine-lib-1.0.1.ebuild 7652
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
 MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
 MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r1 65
@@ -36,7 +37,6 @@ MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
 MD5 3704271d4339b919569b4ea416a4c34e files/xine-lib-1_rc8-configure.ac.patch 2825
 MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
 MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
-MD5 08c1c3433fe4230c788156a2e625962a files/xine-lib-configure-checks.patch 11823
 MD5 d0a2aa9bcd1263077cd8e3fe974b6910 files/xine-lib-configure-xvmc-header.patch 901
 MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926
 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
@@ -53,3 +53,5 @@ MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r4 65
 MD5 665e9af72fa8604db8d82231f484c230 files/xine-lib-1.0-wma.patch 1741
 MD5 2af79240f045a98737726ddca302c374 files/xine-lib-1_rc6-XSA-2004-8.patch 1515
 MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r2 68
+MD5 ede6afa1de160c2e6511c4075013d216 files/digest-xine-lib-1.0.1 151
+MD5 08c1c3433fe4230c788156a2e625962a files/xine-lib-configure-checks.patch 11823
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.0.1 b/media-libs/xine-lib/files/digest-xine-lib-1.0.1
new file mode 100644
index 000000000000..adeba592b3f2
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.0.1
@@ -0,0 +1,2 @@
+MD5 9be804b337c6c3a2e202c5a7237cb0f8 xine-lib-1.0.1.tar.gz 7774954
+MD5 1f9cfafa77379c30720616718e139010 xine-lib-1.0.1-configure-checks.patch.bz2 3018
diff --git a/media-libs/xine-lib/xine-lib-1.0.1.ebuild b/media-libs/xine-lib/xine-lib-1.0.1.ebuild
new file mode 100644
index 000000000000..dff7fd8d33cb
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.0.1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2005 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.0.1.ebuild,v 1.1 2005/04/26 13:17:45 flameeyes Exp $
+
+inherit eutils flag-o-matic gcc libtool
+
+# This should normally be empty string, unless a release has a suffix.
+MY_PKG_SUFFIX=""
+MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/distfiles/${P}-configure-checks.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib libcaca arts cle266 esd win32codecs nls dvd X directfb vorbis alsa
+gnome sdl speex theora ipv6 altivec opengl aac fbcon ffmpeg xv xvmc nvidia i8x0
+samba dxr3 vidix png mng flac oss v4l xinerama vcd"
+RESTRICT="nostrip"
+
+RDEPEND="vorbis? ( media-libs/libvorbis )
+	X? ( virtual/x11 )
+	win32codecs? ( >=media-libs/win32codecs-0.50 )
+	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 )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	flac? ( >=media-libs/flac-1.0.4 )
+	sdl? ( >=media-libs/libsdl-1.1.5 )
+	>=media-libs/libfame-0.9.0
+	theora? ( media-libs/libtheora )
+	speex? ( media-libs/speex )
+	libcaca? ( media-libs/libcaca )
+	samba? ( net-fs/samba )
+	png? ( media-libs/libpng )
+	mng? ( media-libs/libmng )
+	vcd? ( media-video/vcdimager )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
+	!=media-libs/xine-lib-0.9.13*"
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.59
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Adds --disable- params
+	epatch ${DISTDIR}/${P}-configure-checks.patch.bz2
+
+	# plasmaroo: Kernel 2.6 headers patch
+	epatch ${FILESDIR}/${PN}-1_rc7-2.6.patch
+
+	epatch ${FILESDIR}/${PN}-1_rc7-pic.patch
+
+	# Fix detection of sparc64 systems
+	use sparc && epatch ${FILESDIR}/xine-lib-1_rc7-configure-sparc.patch
+
+	# Fix support for gcc 4
+	epatch ${FILESDIR}/${PN}-gcc4.patch
+
+	elibtoolize
+
+	# Makefile.ams and configure.ac get patched, so we need to rerun
+	# autotools
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.7
+	aclocal -I m4 || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake -afc || die "automake failed"
+	autoconf || die "autoconf failed"
+
+	# Fix detection of hppa2.0 and hppa1.1 CHOST
+	use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure
+
+	libtoolize --copy --force || die "libtoolize failed"
+}
+
+src_compile() {
+
+	#filter dangerous compile CFLAGS
+	strip-flags
+
+	#prevent quicktime crashing
+	append-flags -frename-registers
+
+	use x86 && has_pic && append-flags -UHAVE_MMX
+
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+		append-flags -fno-web #49509
+		filter-flags -fno-unit-at-a-time #55202
+		append-flags -funit-at-a-time #55202
+	fi
+
+	is-flag -O? || append-flags -O1 #31243
+
+	# fix build errors with sse2 #49482
+	if use x86 ; then
+		if [ `gcc-major-version` -eq 3 ] ; then
+			append-flags -mno-sse2 `test_flag -mno-sse3`
+			filter-mfpmath sse
+		fi
+	fi
+
+	local myconf
+
+	# the win32 codec path should ignore $(get_libdir) and always use lib
+	use win32codecs \
+		&& myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
+		|| myconf="${myconf} --disable-asf"
+
+	use sparc \
+		&& myconf="${myconf} --build=${CHOST}"
+
+	# enable/disable appropiate optimizations on sparc
+	[ "${PROFILE_ARCH}" == "sparc64" ] \
+		&& myconf="${myconf} --enable-vis"
+	[ "${PROFILE_ARCH}" == "sparc" ] \
+		&& myconf="${myconf} --disable-vis"
+
+	# Fix compilation-errors on PowerPC #45393 & #55460 & #68251
+	if use ppc || use ppc64 ; then
+		append-flags -U__ALTIVEC__
+		myconf="${myconf} `use_enable altivec`"
+	fi
+
+	# The default CFLAGS (-O) is the only thing working on hppa.
+	if use hppa && [ "`gcc-version`" != "3.4" ] ; then
+		unset CFLAGS
+	else
+		append-flags -ffunction-sections
+	fi
+
+	if use xvmc; then
+		count="0"
+		use nvidia && count="`expr ${count} + 1`"
+		use i8x0 && count="`expr ${count} + 1`"
+		use cle266 && count="`expr ${count} + 1`"
+		if [ "${count}" -gt "1" ]; then
+			eerror "Invalid combination of USE flags"
+			eerror "When building support for xvmc, you may only"
+			eerror "include support for one video card:"
+			eerror "   nvidia, i8x0, cle266"
+			eerror ""
+			die "emerge again with different USE flags"
+		fi
+
+		use nvidia && xvmclib="XvMCNVIDIA"
+		use i8x0 && xvmclib="I810XvmC"
+		use cle266 && xvmclib="viaXvMC"
+
+		if [ -n "${xvmclib}" ]; then
+			if [ -f "${ROOT}/usr/$(get_libdir)/libXvMC.so" -o -f "${ROOT}/usr/$(get_libdir)/libXvMC.a" ]; then
+				myconf="${myconf} --with-xvmc-path=${ROOT}/usr/$(get_libdir) --with-xxmc-path=${ROOT}/usr/$(get_libdir) --with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
+			elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXvMC.so" -o -f "${ROOT}/usr/X11R6/$(get_libdir)/libXvMC.a" ]; then
+				myconf="${myconf} --with-xvmc-path=${ROOT}/usr/X11R6/$(get_libdir) --with-xxmc-path=${ROOT}/usr/X11R6/$(get_libdir) --with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
+			else
+				ewarn "Couldn't find libXvMC.  Disabling xvmc support."
+			fi
+		fi
+	fi
+
+	if use xv; then
+		if [ -f "${ROOT}/usr/$(get_libdir)/libXv.so" ]; then
+			myconf="${myconf} --with-xv-path=${ROOT}/usr/$(get_libdir)"
+		elif [ -f "${ROOT}/usr/$(get_libdir)/libXv.a" ]; then
+			myconf="${myconf} --enable-static-xv --with-xv-path=${ROOT}/usr/$(get_libdir)"
+		elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXv.so" ]; then
+			myconf="${myconf} --with-xv-path=${ROOT}/usr/X11R6/$(get_libdir)"
+		elif [ -f "${ROOT}/usr/X11R6/$(get_libdir)/libXv.a" ]; then
+			myconf="${myconf} --enable-static-xv --with-xv-path=${ROOT}/usr/X11R6/$(get_libdir)"
+		else
+			eerror "Couldn't find your libXv.  Did you set USE=\"xv\" when you emerged xorg-x11?"
+			die "Couldn't find libXv."
+		fi
+	fi
+
+	use ffmpeg && myconf="${myconf} --with-external-ffmpeg=/usr"
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_enable samba) \
+		\
+		$(use_enable mng) \
+		$(use_enable png) \
+		\
+		$(use_enable aac faad) \
+		$(use_enable flac) \
+		$(use_with vorbis ogg) $(use_with vorbis) \
+		$(use_enable speex) \
+		\
+		$(use_with X x) \
+		$(use_enable xinerama) \
+		$(use_enable vidix) \
+		$(use_enable dxr3) \
+		$(use_enable directfb) \
+		$(use_enable fbcon fb) \
+		$(use_enable opengl) \
+		$(use_enable aalib) \
+		$(use_enable libcaca caca) \
+		$(use_enable sdl) \
+		\
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable esd) \
+		$(use_enable vcd) --without-internal-vcdlibs \
+		--disable-polypaudio \
+		${myconf} \
+		--disable-dependency-tracking || die "Configure failed"
+
+		#$(use_with dvdnav external-dvdnav) \
+		#$(use_enable macos macosx-video) $(use_enable macos coreaudio) \
+		# This will be added when polypaudio will be added to portage.
+		# $(use_enable polypaudio)
+
+	emake -j1 || die "Parallel make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || 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 ChangeLog README TODO dataflow.dia doc/README* doc/faq/faq.txt
+	dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png
+
+	rm -rf ${D}/usr/share/doc/xine
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Make sure to remove your ~/.xine if upgrading from a pre-1.0 version."
+	einfo
+}