New snapshot with reduced patchset, near to 1.1.2 final release.

Package-Manager: portage-2.1.1_pre1-r5

4 files changed, 284 insertions, 9 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 998c6d187db5..e1ce86fef30f 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.370 2006/06/17 20:37:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.371 2006/06/30 22:06:49 flameeyes Exp $
+
+*xine-lib-1.1.2_pre20060630 (30 Jun 2006)
+
+  30 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +xine-lib-1.1.2_pre20060630.ebuild:
+  New snapshot with reduced patchset, near to 1.1.2 final release.
 
   17 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   xine-lib-1.1.2_pre20060606-r3.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 94e982c992f5..240ed2c9634b 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 DIST xine-lib-1.1.1.tar.gz 7990031 RMD160 5b7ba57c675414e84649701b3f356404ec7c9f0a SHA1 c06aa67ad4d161434fc629232d742b5c7fd3cb4c SHA256 8d37d556a0496b9df421dc3c01ce7457b88e8b2762720a577b5bbdb5374d1505
+DIST xine-lib-1.1.2_pre20060630.tar.bz2 6546455 RMD160 8d896c700948cb1572550a3226d9229cd0e92bda SHA1 0c1ef10e45ac9a6aa8f622573c6cb1ecc1aaf66e SHA256 7d37a800cf5bf935a9f855ebee5263e8cf3bea6d7a20ccf0220e630536c8390c
 DIST xine-lib-1.1.2cvs20060328.tar.gz 7996045 RMD160 4e561e02b7cd9a10797925386ae7416a932c8431 SHA1 88a3bfd552c8ffba9e60ca418126cc51a70555da SHA256 fd95811d123e4a82c815674f3722faf3a769e3ba3760d5a4da8630c83f7c7e38
 DIST xine-lib-1.1.2cvs20060606.tar.bz2 6509453 RMD160 a53a32bc5df800ad2072973224fe8c426caaefa7 SHA1 d1518396fd17bfe2e64b20b027f5566eacb8d4da SHA256 c00e378c87e669c60936b71aaaa6eb320dcf202835f7d7fca168efc026bcfb94
 DIST xine-lib-patches-24.tar.bz2 18687 RMD160 68bf0ae79ba27e30f7b719862fd378b1871bc661 SHA1 ca49e1fc763658cbcc46d1f4e4324ae80485337d SHA256 86367ba64e81cf75f4f877c348777c791cf372aff29043fcf838d5f23cc3175f
@@ -9,6 +10,7 @@ DIST xine-lib-patches-43.tar.bz2 36962 RMD160 b53a603b141bfee5121809e19bf4ad618c
 DIST xine-lib-patches-45.tar.bz2 40494 RMD160 bffb9c08ba2386fb9c33ee15cec01436c9804612 SHA1 aaca1ea745e2f8f5c886555a74479a7a62a21f4a SHA256 97cbbc99ac9999d78640bd57d24c6839c57d3761ba9124b75df41222fb3cf34b
 DIST xine-lib-patches-51.tar.bz2 76202 RMD160 fb04f34c7549c25d0d9fa8deab0e66fb5976c28f SHA1 c643fb24091b295790d4d605b0eb9f03350ca102 SHA256 7f2d01f97a0f8bdaa52a59012343e4f3215167da06bf95ee4702831efeda3e4f
 DIST xine-lib-patches-53.tar.bz2 78837 RMD160 b9a7ffb91f95d46b7fdf223922a7905632ee65e1 SHA1 8468fc3d85df8a2ccd7d42cab8a0ecdba80d8b9a SHA256 4886a37d09b604d5f9fd63490ac257f8bcdd77653c5a929baaa16baa4b43c759
+DIST xine-lib-patches-54.tar.bz2 21654 RMD160 f0657fbe3acebc6deed10c7bfa89a83fecada142 SHA1 c997df713387fa13777461b2000681882d88ce3b SHA256 9ef5d324f554e7b40c93da9f0f07c67fee8c500627c942d3c5b6a3e8ac872b2d
 EBUILD xine-lib-1.1.1-r3.ebuild 7196 RMD160 b10923676e1520254742b9158efce91141c77381 SHA1 f0e01ecec800aa95c602b007c87b78f12f9e9c54 SHA256 be1e6e9d1470c70171535199e3c1f4a9518695dc014bdf9a95d8b85999b433d9
 MD5 c185dd05a1f94e72d4171e4ef8099f9d xine-lib-1.1.1-r3.ebuild 7196
 RMD160 b10923676e1520254742b9158efce91141c77381 xine-lib-1.1.1-r3.ebuild 7196
@@ -29,10 +31,14 @@ EBUILD xine-lib-1.1.2_pre20060606-r3.ebuild 7727 RMD160 a98fc6f8a86800f0834ae055
 MD5 fafec315a5203cb423379ad083bd229d xine-lib-1.1.2_pre20060606-r3.ebuild 7727
 RMD160 a98fc6f8a86800f0834ae055d32f57b5890307cc xine-lib-1.1.2_pre20060606-r3.ebuild 7727
 SHA256 19686db7a19c5763727e1b59c0bfe8ceabcc95e59ff0a21692df35eb8f2410b1 xine-lib-1.1.2_pre20060606-r3.ebuild 7727
-MISC ChangeLog 34333 RMD160 6a90c5f532e781e5f5775e7582f0c4cd62c3011d SHA1 7669e2a0ae6445c08ce4b5d72596ea52c7ae2ad7 SHA256 cfa52a5018693cc97378fa24aa0c8d627b386fa2f7e4637f1ce4269a3624a69a
-MD5 99398e5e9b9d34b745af9d52133d99df ChangeLog 34333
-RMD160 6a90c5f532e781e5f5775e7582f0c4cd62c3011d ChangeLog 34333
-SHA256 cfa52a5018693cc97378fa24aa0c8d627b386fa2f7e4637f1ce4269a3624a69a ChangeLog 34333
+EBUILD xine-lib-1.1.2_pre20060630.ebuild 7349 RMD160 dc1eeba82bd7cb4ce4462ed82cb74b461b77703c SHA1 a25283b526c61000a67e063e66571a71b8b45018 SHA256 8f541567549d7075e08257279fce32f6dc5a286f833d592ce3d5554ad18742b0
+MD5 e46f4411a638f404b4302f9ef132b901 xine-lib-1.1.2_pre20060630.ebuild 7349
+RMD160 dc1eeba82bd7cb4ce4462ed82cb74b461b77703c xine-lib-1.1.2_pre20060630.ebuild 7349
+SHA256 8f541567549d7075e08257279fce32f6dc5a286f833d592ce3d5554ad18742b0 xine-lib-1.1.2_pre20060630.ebuild 7349
+MISC ChangeLog 34535 RMD160 b2162ca2ac6b90285d63242cf2d567646c1280e4 SHA1 fa507ebd66b284aff927ea2c6c8a7afe1453a107 SHA256 f72375e337c4d5288a472d5ecd940020979f5183c4c130a33f158d6394298df5
+MD5 a947ede9c8a0f6086934cb6d8ab9f9df ChangeLog 34535
+RMD160 b2162ca2ac6b90285d63242cf2d567646c1280e4 ChangeLog 34535
+SHA256 f72375e337c4d5288a472d5ecd940020979f5183c4c130a33f158d6394298df5 ChangeLog 34535
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -52,10 +58,13 @@ SHA256 66188db0305e351184a466f972c4d1de17f5ac30cc68692b637be6796c9bb804 files/di
 MD5 8edd48af1658b0505ae5168a12d5643d files/digest-xine-lib-1.1.2_pre20060606-r3 542
 RMD160 3acda6eb17601335217e06b65131f17ef6fce323 files/digest-xine-lib-1.1.2_pre20060606-r3 542
 SHA256 edf6990df3d715b18210d73937aca64341ef48b65a7632cfbcd912afd0ed51c7 files/digest-xine-lib-1.1.2_pre20060606-r3 542
+MD5 5ec6aca37d0a56c0b757289a8063cc1c files/digest-xine-lib-1.1.2_pre20060630 545
+RMD160 6967485aac1a0906a4744f484661bcef98dfb2b8 files/digest-xine-lib-1.1.2_pre20060630 545
+SHA256 8f9e451cc2b555c4f76dbc1f032eef2e54f1dcfcd2e6e8e7cf5d3afed4866d40 files/digest-xine-lib-1.1.2_pre20060630 545
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFElGf/AiZjviIA2XgRAgxpAKC6F42JN0eb4TMPFkF6EVATZ39RAwCg73LV
-bx5XBzbS+mkuOoUf3bIj2ik=
-=7J/9
+iD8DBQFEpaCMAiZjviIA2XgRAn8wAJ9kY2R47s3TWXbQsTMrYgjj41UIlgCg89dz
+IG4B9prMlTfmgOH7Lp+p63s=
+=pvK/
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060630 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060630
new file mode 100644
index 000000000000..1bbd813c218d
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060630
@@ -0,0 +1,6 @@
+MD5 5e09d4913d25ea21d36947016248b79a xine-lib-1.1.2_pre20060630.tar.bz2 6546455
+RMD160 8d896c700948cb1572550a3226d9229cd0e92bda xine-lib-1.1.2_pre20060630.tar.bz2 6546455
+SHA256 7d37a800cf5bf935a9f855ebee5263e8cf3bea6d7a20ccf0220e630536c8390c xine-lib-1.1.2_pre20060630.tar.bz2 6546455
+MD5 e143ff01655b559defe2ceb97fa0748e xine-lib-patches-54.tar.bz2 21654
+RMD160 f0657fbe3acebc6deed10c7bfa89a83fecada142 xine-lib-patches-54.tar.bz2 21654
+SHA256 9ef5d324f554e7b40c93da9f0f07c67fee8c500627c942d3c5b6a3e8ac872b2d xine-lib-patches-54.tar.bz2 21654
diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060630.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060630.ebuild
new file mode 100644
index 000000000000..c8a34896a60f
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.2_pre20060630.ebuild
@@ -0,0 +1,254 @@
+# 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.2_pre20060630.ebuild,v 1.1 2006/06/30 22:06:49 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
+	MY_PKG_SUFFIX=""
+	MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
+	S="${WORKDIR}/${MY_P}"
+
+	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+fi
+
+PATCHLEVEL="54"
+
+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 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via video_cards_i810"
+
+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 asf
+ffmpeg debug modplug ${IUSE_VIDEO_CARDS}"
+
+RDEPEND="vorbis? ( media-libs/libvorbis )
+	X? ( || ( (
+			x11-libs/libXext
+			x11-libs/libX11 )
+		virtual/x11 ) )
+	xv? ( || ( x11-libs/libXv virtual/x11 ) )
+	xvmc? (
+		|| ( x11-libs/libXvMC virtual/x11 )
+		video_cards_nvidia? ( media-video/nvidia-glx )
+		video_cards_via? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
+		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) )
+	)
+	xinerama? ( || ( x11-libs/libXinerama 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 )
+	dxr3? ( >=media-libs/libfame-0.9.0 )
+	theora? ( media-libs/libtheora )
+	speex? ( media-libs/speex )
+	libcaca? ( media-libs/libcaca )
+	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 )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051120 )
+	modplug? ( media-libs/libmodplug )
+	nls? ( virtual/libintl )
+	virtual/libiconv
+	!=media-libs/xine-lib-0.9.13*"
+
+DEPEND="${RDEPEND}
+	X? ( || ( (
+			x11-base/xorg-server
+			x11-libs/libXt
+			x11-proto/xextproto
+			x11-proto/xproto
+			x11-proto/videoproto
+			x11-proto/xf86vidmodeproto
+			xinerama? ( x11-proto/xineramaproto ) )
+		virtual/x11 )
+		)
+	v4l? ( virtual/os-headers )
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	# ffmpeg doesn'g use libtool, so the condition for PIC code
+	# is __PIC__, not PIC.
+	sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \
+		src/libffmpeg/libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
+		src/libffmpeg/libavcodec/msmpeg4.c \
+		|| die "sed failed (__PIC__)"
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+# check for the X11 path for a given library
+get_x11_dir() {
+	if [[ -f "${ROOT}/usr/$(get_libdir)/$1" ]]; then
+		echo "${ROOT}/usr/$(get_libdir)"
+	elif [[ -f "${ROOT}/usr/$(get_libdir)/xorg/$1" ]]; then
+		echo "${ROOT}/usr/$(get_libdir)/xorg"
+	elif [[ -f "${ROOT}/usr/X11R6/$(get_libdir)/$1" ]]; then
+		echo "${ROOT}/usr/X11R6/$(get_libdir)"
+	fi
+}
+
+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 -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
+
+	if ! use xvmc; then
+		myconf="${myconf} --disable-xvmc"
+	else
+		count="0"
+		if use video_cards_nvidia; then
+			count="`expr ${count} + 1`"
+			xvmclib="XvMCNVIDIA"
+		fi
+
+		if use video_cards_i810; then
+			count="`expr ${count} + 1`"
+			xvmclib="I810XvMC"
+		fi
+
+		if use video_cards_via; then
+			count="`expr ${count} + 1`"
+			xvmclib="viaXvMC"
+		fi
+
+		if [[ "${count}" -gt "1" ]]; then
+			eerror "Invalid combination of USE flags"
+			eerror "When building support for xvmc, you may only include support"
+			eerror "for none or one of the following VIDEO_CARDS:"
+			eerror ""
+			eerror "nvidia i810 via"
+			eerror ""
+			eerror "XvMC support will try to link against libXvMCW."
+		elif [[ -n "${xvmclib}" ]]; then
+			xvmcconf="--with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
+			xvmcdir=$(get_x11_dir libXvMC.so)
+
+			[[ -z ${xvmcdir} ]] && die "Unable to find libXvMC.so."
+
+			myconf="${myconf} ${xvmcconf} --with-xvmc-path=${xvmcdir} --with-xxmc-path=${xvmcdir}"
+		fi
+	fi
+
+	if use xv; then
+		xvdir=$(get_x11_dir libXv.so)
+
+		[[ -z ${xvdir} ]] && die "Unable to find libXv.so. Did you set USE=\"xv\" when you emerged xorg-x11?"
+
+		myconf="${myconf} --with-xv-path=${xvdir}"
+	fi
+
+	econf \
+		$(use_enable gnome) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_enable samba) \
+		$(use_enable altivec) \
+		$(use_enable v4l) \
+		\
+		$(use_enable mng) \
+		$(use_enable imagemagick) \
+		\
+		$(use_enable aac faad) \
+		$(use_enable flac) \
+		$(use_with vorbis ogg) $(use_with vorbis) \
+		$(use_enable speex) \
+		$(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_enable libcaca caca) \
+		$(use_enable sdl) \
+		\
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable esd) \
+		$(use_enable vcd) --without-internal-vcdlibs \
+		\
+		$(use_enable asf) \
+		$(use_enable win32codecs w32dll) \
+		$(use_enable modplug) \
+		$(use_with ffmpeg external-ffmpeg) \
+		--disable-polypaudio \
+		--disable-optimizations \
+		${myconf} \
+		--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
+}
+
+pkg_postinst() {
+	if use win32codecs && ! use asf; then
+		einfo "You choose to build win32codecs support but disabled ASF"
+		einfo "demuxer. This way you'll have support for win32codecs in"
+		einfo "formats like AVI or Matroska, but not in WMV/WMA files."
+		einfo ""
+		einfo "To be able to play WMV/WMA files, please add asf useflag."
+	fi
+}