New snapshot, with mmap support optional, a lot of Coverity fixes, and Shorten files playing in Amarok.

Package-Manager: portage-2.1.2_pre1-r4

4 files changed, 212 insertions, 8 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 5b6e011b89e9..b18f0e1d590c 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,13 @@
 # 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.402 2006/09/16 12:22:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.403 2006/09/29 04:43:01 flameeyes Exp $
+
+*xine-lib-1.1.3_pre20060929 (29 Sep 2006)
+
+  29 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +xine-lib-1.1.3_pre20060929.ebuild:
+  New snapshot, with mmap support optional, a lot of Coverity fixes, and
+  Shorten files playing in Amarok.
 
   16 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   xine-lib-1.1.2-r2.ebuild, -xine-lib-1.1.3_pre20060831.ebuild,
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 0b70ed45c849..6c860e995260 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_pre20060914.tar.bz2 6672808 RMD160 32ee0b19b5eb477572d9370e6f7f1147173591ad SHA1 6549ab65260aedbacb8848281735e675a808f071 SHA256 b43e07648739c45109f4263afd6edba78787d0698d4a5de2cafc30e03e057896
+DIST xine-lib-1.1.3_pre20060929.tar.bz2 6668440 RMD160 f82a57ac8e5cd6addf8d3263a16468156f216bdb SHA1 511e948d5e0f2e12836097d78bc065c8fd8061f5 SHA256 36fff223b1dd3765efe35e9afa201faba8b8b092c595d8949255b3f2a93619dc
 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 7095 RMD160 6e98cb03c3b3fe75129b75d9348e1769b8eea180 SHA1 bf6c307be854f6b5806da1ff6d4e704df90b5c3b SHA256 32f4104829af53af391852a8e8a7841d1e35774d671758785947ee2637a96454
@@ -13,10 +14,14 @@ EBUILD xine-lib-1.1.3_pre20060914.ebuild 5071 RMD160 5142f4cbf7570c4594b21c3866e
 MD5 8ec8cfa245b9f29431349fcef3592ca0 xine-lib-1.1.3_pre20060914.ebuild 5071
 RMD160 5142f4cbf7570c4594b21c3866e814f2ac3dbf61 xine-lib-1.1.3_pre20060914.ebuild 5071
 SHA256 cf6f39198c94c20f714a71b536e6edc28fe86e7a69baa1fe9e9a2c0f29dc112d xine-lib-1.1.3_pre20060914.ebuild 5071
-MISC ChangeLog 40324 RMD160 a9d7429fb74688ae53755ba918054310664d3faa SHA1 8707e1e537fcdbf1a0ee93a47c95ed862f3ce3ec SHA256 39a7575023d96ffcccd4e9fd667884f45de01905d98267d9b1cc43438a242f3a
-MD5 25014cfef96b873c757fb23d0816f8a6 ChangeLog 40324
-RMD160 a9d7429fb74688ae53755ba918054310664d3faa ChangeLog 40324
-SHA256 39a7575023d96ffcccd4e9fd667884f45de01905d98267d9b1cc43438a242f3a ChangeLog 40324
+EBUILD xine-lib-1.1.3_pre20060929.ebuild 5279 RMD160 d7ceefd6cb29c5e5e8ab2f3dd75e3bf148bb467b SHA1 c83b20693b41af6d3fda3c998a142bf05a80e210 SHA256 4b24301d57feb67bd9d9d8a9e7a043660b39f4829b401512fd8958ab9554d1ed
+MD5 9def459063b753afbf315f187fe4cf53 xine-lib-1.1.3_pre20060929.ebuild 5279
+RMD160 d7ceefd6cb29c5e5e8ab2f3dd75e3bf148bb467b xine-lib-1.1.3_pre20060929.ebuild 5279
+SHA256 4b24301d57feb67bd9d9d8a9e7a043660b39f4829b401512fd8958ab9554d1ed xine-lib-1.1.3_pre20060929.ebuild 5279
+MISC ChangeLog 40567 RMD160 d3d74722546ad42f15920dbb1b150a29d53b2034 SHA1 d990fade87acaf017e8a1edd9dc7b6c86595b996 SHA256 b813bbe26d0c6a47ac9ff56645b114e4ea1a0e806cf5328533c4e9f4058a6277
+MD5 4d02a5a57bd5e484b87845eef75a70e1 ChangeLog 40567
+RMD160 d3d74722546ad42f15920dbb1b150a29d53b2034 ChangeLog 40567
+SHA256 b813bbe26d0c6a47ac9ff56645b114e4ea1a0e806cf5328533c4e9f4058a6277 ChangeLog 40567
 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 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
+MD5 d80e0f43b9d3a24bee79009bc2e91b9c files/digest-xine-lib-1.1.3_pre20060929 542
+RMD160 02dfa3f6798e169415891bf3c777531e2e9930d3 files/digest-xine-lib-1.1.3_pre20060929 542
+SHA256 011a7df7ee4b32600cfa1a995303c24fb296a5db02d154ce9b7f16e6798d3aee files/digest-xine-lib-1.1.3_pre20060929 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFC+yQAiZjviIA2XgRAvIaAJkBT9iWbyT/64e5dlff+KHO2dEoOQCgj4XN
-r6TXBaO9L7cgivAhYlsSm7c=
-=uG5t
+iD8DBQFFHKRnAiZjviIA2XgRAkiWAJoCQLJ2OZ+phWilq+wKxSZYAlXhrwCfReMo
+sjdupQDtmQXZh91nuwTBvFI=
+=w4hP
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20060929 b/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20060929
new file mode 100644
index 000000000000..cdcf061e2804
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20060929
@@ -0,0 +1,6 @@
+MD5 21b97f876da6cf1e608194ce191904aa xine-lib-1.1.3_pre20060929.tar.bz2 6668440
+RMD160 f82a57ac8e5cd6addf8d3263a16468156f216bdb xine-lib-1.1.3_pre20060929.tar.bz2 6668440
+SHA256 36fff223b1dd3765efe35e9afa201faba8b8b092c595d8949255b3f2a93619dc xine-lib-1.1.3_pre20060929.tar.bz2 6668440
+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_pre20060929.ebuild b/media-libs/xine-lib/xine-lib-1.1.3_pre20060929.ebuild
new file mode 100644
index 000000000000..a132f87491dd
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.3_pre20060929.ebuild
@@ -0,0 +1,183 @@
+# 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_pre20060929.ebuild,v 1.1 2006/09/29 04:43:01 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 mmap"
+
+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
+
+	# Too many file names are the same (xine_decoder.c), change the builddir
+	# So that the relative path is used to identify them.
+	mkdir "${WORKDIR}/build"
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable gnome gnomevfs) \
+		$(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) \
+		\
+		$(use_enable mmap) \
+		--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"
+}