New snapshot, with quite a bit of fixes from upstream.

Package-Manager: portage-2.1.1

4 files changed, 205 insertions, 8 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index b591f36ae877..961e284d953a 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.400 2006/09/10 00:05:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.401 2006/09/14 18:57:55 flameeyes Exp $
+
+*xine-lib-1.1.3_pre20060914 (14 Sep 2006)
+
+  14 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +xine-lib-1.1.3_pre20060914.ebuild:
+  New snapshot, with quite a bit of fixes from upstream.
 
   10 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   xine-lib-1.1.3_pre20060831.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index e14e41f1ff82..814ac4c45d41 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 DIST xine-lib-1.1.2.tar.bz2 6457108 RMD160 21322d6d7e085237926741495d70f5ce7764910b SHA1 07e454e2287e34414b598faf78ae6d8ab8ffbb69 SHA256 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226
 DIST xine-lib-1.1.3_pre20060831.tar.bz2 6645591 RMD160 f5708d2186c378882c0d3776fad7b24649a8d3c5 SHA1 358025f0f2fc50932bce262213c11acf297059a6 SHA256 4ac3626947daad59f3736cd487453f44b27d61c106cac5664abfe108c782d862
+DIST xine-lib-1.1.3_pre20060914.tar.bz2 6672808 RMD160 32ee0b19b5eb477572d9370e6f7f1147173591ad SHA1 6549ab65260aedbacb8848281735e675a808f071 SHA256 b43e07648739c45109f4263afd6edba78787d0698d4a5de2cafc30e03e057896
 DIST xine-lib-patches-61.tar.bz2 9701 RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac SHA1 0d749e3c46ea58e961d48f86aca997b16e72803b SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2
 DIST xine-lib-patches-63.tar.bz2 22862 RMD160 1aa3c0541e9d739968f6f62c09567caa2a646414 SHA1 ac1a6a40c8b783c40d823905e8db69f5139784d4 SHA256 7e7a137a27605addad5c4e96c46984293c5febdfa08eec976600be8b206448f6
 EBUILD xine-lib-1.1.2-r2.ebuild 7086 RMD160 757c2a2b13998402f601ccd100d420f612f139c5 SHA1 181040c6af25ae28114cc2fd3f6a636f16663fac SHA256 c283be3cb6aeb3bb015ddaf4b7c9645286d7530a9c3ecc3bdc000bfbf823f826
@@ -13,10 +14,14 @@ EBUILD xine-lib-1.1.3_pre20060831.ebuild 4798 RMD160 9d4b8c82680cda620752772c5ab
 MD5 05735dc23ad3bf0fb3df32ea569829d1 xine-lib-1.1.3_pre20060831.ebuild 4798
 RMD160 9d4b8c82680cda620752772c5aba36d6845329aa xine-lib-1.1.3_pre20060831.ebuild 4798
 SHA256 b59231855e3e0604ed665d68f2b861df32ca273ba0cd8bc6d959d27c3adcc7f9 xine-lib-1.1.3_pre20060831.ebuild 4798
-MISC ChangeLog 39928 RMD160 031c9b0657f167edaf4ceb91aaa08b55f592d0e0 SHA1 1293f484e198456b8321f1c2ff3da4a134f8ad5e SHA256 8d3a6244e85c73e1f644ddbeeaae7f7c5bb5b960d0addebc4dad008c6e39f9fb
-MD5 c56f815a7c385de26647a5d190f739e0 ChangeLog 39928
-RMD160 031c9b0657f167edaf4ceb91aaa08b55f592d0e0 ChangeLog 39928
-SHA256 8d3a6244e85c73e1f644ddbeeaae7f7c5bb5b960d0addebc4dad008c6e39f9fb ChangeLog 39928
+EBUILD xine-lib-1.1.3_pre20060914.ebuild 5062 RMD160 50b8de1ddd7043d67e0f99dcbf72811e8688e788 SHA1 a6817b3c19e4e0552bbe52e9a2f1750c7ff238a1 SHA256 8b375f20c747c23c6291b0a679f0079b9e7cefcd1eaff0014836424d4b59cf75
+MD5 5102be17929897ef29361579d3f7a5af xine-lib-1.1.3_pre20060914.ebuild 5062
+RMD160 50b8de1ddd7043d67e0f99dcbf72811e8688e788 xine-lib-1.1.3_pre20060914.ebuild 5062
+SHA256 8b375f20c747c23c6291b0a679f0079b9e7cefcd1eaff0014836424d4b59cf75 xine-lib-1.1.3_pre20060914.ebuild 5062
+MISC ChangeLog 40120 RMD160 d3aa0ced05a14ef90173f007fa77ebbf1ee75adf SHA1 2087e4af439fe7684d406f60feaf62c4b531fc46 SHA256 fd8232ea8f64e62c5603b07381915b850a563ec0e941b98c46181c3b91c5b4e4
+MD5 b47a8c4a081fb7ceceb75a557545199d ChangeLog 40120
+RMD160 d3aa0ced05a14ef90173f007fa77ebbf1ee75adf ChangeLog 40120
+SHA256 fd8232ea8f64e62c5603b07381915b850a563ec0e941b98c46181c3b91c5b4e4 ChangeLog 40120
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -27,10 +32,13 @@ SHA256 9c987dc9ad1a1fa5fbaf02ce0e17493f4f77aa500ab3881dc62736325de62acb files/di
 MD5 2d64af2242ba6ee57d26c5599e81e68f files/digest-xine-lib-1.1.3_pre20060831 542
 RMD160 486805613b457a1862026b0ea392d198b47ea221 files/digest-xine-lib-1.1.3_pre20060831 542
 SHA256 33be919aed524c7cba046c73538e0c27366d57105e76a6cc72088cecead40624 files/digest-xine-lib-1.1.3_pre20060831 542
+MD5 4796c2b29bff5b6f199ea159bce1a354 files/digest-xine-lib-1.1.3_pre20060914 542
+RMD160 bda2502a25fc71356994b9d90a47ebd886f49f1b files/digest-xine-lib-1.1.3_pre20060914 542
+SHA256 f88f3c87be3786e540839888dc157cdf80e45572aed13cedcacfc55c5fa4f8e5 files/digest-xine-lib-1.1.3_pre20060914 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFA1b0AiZjviIA2XgRAjRdAJ9amA7P0K15mPWO0w5tP6Zf8SgRGgCdEFGa
-9BK18JApPcRwAPlPXmDVWa4=
-=8xM1
+iD8DBQFFCaY7AiZjviIA2XgRAgBRAJ9156QZGzmSFQqM0GftJnbKJ09EkACg1hEL
+aAFWJFHJtNij31HfodXIzxA=
+=Pgy3
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20060914 b/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20060914
new file mode 100644
index 000000000000..50350e3b26c6
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20060914
@@ -0,0 +1,6 @@
+MD5 c9ca31eba62b27f99d71e85513a44fd8 xine-lib-1.1.3_pre20060914.tar.bz2 6672808
+RMD160 32ee0b19b5eb477572d9370e6f7f1147173591ad xine-lib-1.1.3_pre20060914.tar.bz2 6672808
+SHA256 b43e07648739c45109f4263afd6edba78787d0698d4a5de2cafc30e03e057896 xine-lib-1.1.3_pre20060914.tar.bz2 6672808
+MD5 ae3f09d77faf7e31ca78e9ebc79463ce xine-lib-patches-61.tar.bz2 9701
+RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac xine-lib-patches-61.tar.bz2 9701
+SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2 xine-lib-patches-61.tar.bz2 9701
diff --git a/media-libs/xine-lib/xine-lib-1.1.3_pre20060914.ebuild b/media-libs/xine-lib/xine-lib-1.1.3_pre20060914.ebuild
new file mode 100644
index 000000000000..381396be4f45
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.3_pre20060914.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2006 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.1.3_pre20060914.ebuild,v 1.1 2006/09/14 18:57:55 flameeyes Exp $
+
+inherit eutils flag-o-matic toolchain-funcs libtool autotools
+
+# This should normally be empty string, unless a release has a suffix.
+if [[ "${P/_pre/}" != "${P}" ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else
+	MY_PKG_SUFFIX=""
+	MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
+	S="${WORKDIR}/${MY_P}"
+
+	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2"
+fi
+
+PATCHLEVEL="61"
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="aalib libcaca arts esd win32codecs nls dvd X directfb vorbis alsa
+gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc
+samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts
+debug modplug gtk pulseaudio"
+
+RDEPEND="
+	X? ( x11-libs/libXext
+		 x11-libs/libX11 )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+	xinerama? ( x11-libs/libXinerama )
+	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 )
+	dxr3? ( >=media-libs/libfame-0.9.0 )
+	vorbis? ( media-libs/libogg media-libs/libvorbis )
+	theora? ( media-libs/libogg media-libs/libvorbis media-libs/libtheora )
+	speex? ( media-libs/libogg media-libs/libvorbis media-libs/speex )
+	libcaca? ( >=media-libs/libcaca-0.99_beta1 )
+	samba? ( net-fs/samba )
+	mng? ( media-libs/libmng )
+	vcd? ( media-video/vcdimager )
+	a52? ( >=media-libs/a52dec-0.7.4-r5 )
+	mad? ( media-libs/libmad )
+	imagemagick? ( media-gfx/imagemagick )
+	dts? ( media-libs/libdts )
+	>=media-video/ffmpeg-0.4.9_p20060816
+	modplug? ( media-libs/libmodplug )
+	nls? ( virtual/libintl )
+	gtk? ( =x11-libs/gtk+-2* )
+	pulseaudio? ( media-sound/pulseaudio )
+	virtual/libiconv
+	!=media-libs/xine-lib-0.9.13*"
+
+DEPEND="${RDEPEND}
+	X? ( x11-libs/libXt
+		 x11-proto/xextproto
+		 x11-proto/xproto
+		 x11-proto/videoproto
+		 x11-proto/xf86vidmodeproto
+		 xinerama? ( x11-proto/xineramaproto ) )
+	v4l? ( virtual/os-headers )
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${WORKDIR}/patches/120"*
+
+	# AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	#prevent quicktime crashing
+	append-flags -frename-registers -ffunction-sections
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ $(tc-arch) == "x86" ]]; then
+		filter-flags -fforce-addr
+		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
+		is-flag -O? || append-flags -O2
+	fi
+
+	# debug useflag used to emulate debug make targets. See bug #112980 and the
+	# xine maintainers guide.
+	use debug && append-flags -UNDEBUG -DDEBUG
+
+	local myconf
+
+	# enable/disable appropiate optimizations on sparc
+	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
+	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
+
+	# The default CFLAGS (-O) is the only thing working on hppa.
+	use hppa && unset CFLAGS
+
+	econf \
+		$(use_enable gnome) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_enable samba) \
+		$(use_enable altivec) \
+		$(use_enable v4l) \
+		\
+		$(use_enable mng) \
+		$(use_with imagemagick) \
+		$(use_enable gtk gdkpxibuf) \
+		\
+		$(use_enable aac faad) \
+		$(use_enable flac) \
+		$(use_with vorbis) \
+		$(use_with speex) \
+		$(use_with theora) \
+		$(use_enable a52) --with-external-a52dec \
+		$(use_enable mad) --with-external-libmad \
+		$(use_enable dts) --with-external-libdts \
+		\
+		$(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_with libcaca caca) \
+		$(use_with sdl) \
+		$(use_enable xvmc) \
+		\
+		$(use_enable oss) \
+		$(use_with alsa) \
+		$(use_with arts) \
+		$(use_with esd esound) \
+		$(use_with pulseaudio) \
+		$(use_enable vcd) --without-internal-vcdlibs \
+		\
+		$(use_enable win32codecs w32dll) \
+		$(use_enable modplug) \
+		--enable-asf \
+		--with-external-ffmpeg \
+		--without-pulseaudio \
+		--disable-optimizations \
+		${myconf} \
+		--with-xv-path=/usr/$(get_libdir) \
+		--with-w32-path=/usr/lib/win32 \
+		--enable-fast-install \
+		--disable-dependency-tracking || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	dodoc AUTHORS ChangeLog README TODO doc/README* doc/faq/faq.txt
+	dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png
+
+	rm -rf "${D}/usr/share/doc/xine"
+}