Add new revision, restore internal copy of dvdnav or seeking is not possible. Bump patchset to fix build with constantize patch.

(Portage version: 2.1_pre9-r4)
 (Signed Manifest commit)

3 files changed, 15 insertions, 288 deletions

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 3e094834b153..f28f665c755e 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -6,7 +6,7 @@ DIST xine-lib-1.1.2cvs20060328.tar.gz 7996045 RMD160 4e561e02b7cd9a10797925386ae
 DIST xine-lib-patches-24.tar.bz2 18687 size 18687
 DIST xine-lib-patches-32.tar.bz2 13224 RMD160 a2d8d23a9fb64f1f2df4f48e111295308154453c SHA256 09c87125d862b2ceab974042b03c99b0b12197a1643551d2ab2390792d40452b size 13224
 DIST xine-lib-patches-33.tar.bz2 20898 RMD160 c5a774c8e9e0565cdc55f8ab3fee67970ea578c9 SHA256 8a5d33f999b79365f7ca1c3b7ece0f78aed17cbb18f05d4fc5b4f66dd895f622 size 20898
-DIST xine-lib-patches-36.tar.bz2 29421 RMD160 026071ecbd30111b0560c301baa9be9207de4d19 SHA256 0cd3490b80f39851a10810ed21564a8425897821f198ca6c86e62b70054ec17a size 29421
+DIST xine-lib-patches-37.tar.bz2 29736 RMD160 7ee8a766a102887879fad1b8c51c8186989ba57b SHA256 1763390d176c6cfef9488084f3eb246fd4fa98c3976d76cb948588061e54fcea size 29736
 EBUILD xine-lib-1.1.1-r3.ebuild 7232 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd SHA1 92c83023f1f2cf42accb15ea9a6463ca1eba2f81 SHA256 1a281ed1ce771661ae909ecfe5de3e83e8fe5be6b93ed1ebc07b59227301cc25 size 7232
 MD5 578712f99de216da48aefcc69567dcf1 xine-lib-1.1.1-r3.ebuild 7232
 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd xine-lib-1.1.1-r3.ebuild 7232
@@ -19,14 +19,14 @@ EBUILD xine-lib-1.1.2_pre20060328-r2.ebuild 7898 RMD160 573213333431bade16ac4913
 MD5 1023ff510b2a85971f8ec588bcfc6d17 xine-lib-1.1.2_pre20060328-r2.ebuild 7898
 RMD160 573213333431bade16ac49131a206a5695df090c xine-lib-1.1.2_pre20060328-r2.ebuild 7898
 SHA256 676cfa458ac4240c18535e5c30ac840096b8ca98826f319bd7166acc35f92058 xine-lib-1.1.2_pre20060328-r2.ebuild 7898
-EBUILD xine-lib-1.1.2_pre20060328-r4.ebuild 7817 RMD160 dd707e80c0883e59ce9b2172f6cd483db493d082 SHA1 a53144bfddab54ed9f9e979677aed47235656a80 SHA256 bb4bcae3b022fed1ab3ff3a9853c3c4aad9907e79e593fda5eef43845f4b0bae size 7817
-MD5 4b4f7705823275fb31ff6a3abacfd643 xine-lib-1.1.2_pre20060328-r4.ebuild 7817
-RMD160 dd707e80c0883e59ce9b2172f6cd483db493d082 xine-lib-1.1.2_pre20060328-r4.ebuild 7817
-SHA256 bb4bcae3b022fed1ab3ff3a9853c3c4aad9907e79e593fda5eef43845f4b0bae xine-lib-1.1.2_pre20060328-r4.ebuild 7817
-MISC ChangeLog 28076 RMD160 15011f5991031bcf49fb9442fde6b6eb578c3294 SHA1 4beec461754405074e1c6b658ee43fe599fc52b2 SHA256 b0a9094e91093301ddb55aa57382c10ae4b4d51260409ab6f3d807114ba8223d size 28076
-MD5 910bbd9684ddba9d77636b2fd2054b3b ChangeLog 28076
-RMD160 15011f5991031bcf49fb9442fde6b6eb578c3294 ChangeLog 28076
-SHA256 b0a9094e91093301ddb55aa57382c10ae4b4d51260409ab6f3d807114ba8223d ChangeLog 28076
+EBUILD xine-lib-1.1.2_pre20060328-r5.ebuild 7776 RMD160 1e42ea2c5adb94f39bf6e4b83428d6b6cf9844d1 SHA1 c3fc8e7cd5a6662fd4e52bd896b994873086c55f SHA256 a860fa286c711f3b8b016042d767313a22cb40b4702b51bafc3a39f9688f43d6 size 7776
+MD5 b6d7c1720744844b4ecf4883404586e4 xine-lib-1.1.2_pre20060328-r5.ebuild 7776
+RMD160 1e42ea2c5adb94f39bf6e4b83428d6b6cf9844d1 xine-lib-1.1.2_pre20060328-r5.ebuild 7776
+SHA256 a860fa286c711f3b8b016042d767313a22cb40b4702b51bafc3a39f9688f43d6 xine-lib-1.1.2_pre20060328-r5.ebuild 7776
+MISC ChangeLog 28391 RMD160 2653ef2fc04faf008cb9ffd774bcdf9fcea1c73f SHA1 37e4294a96d7bfcd6660c3f3e8bf372895746103 SHA256 416fbe61e3a4abc0177d4c6c11651c47c28d164e2506f529437a611614cd1568 size 28391
+MD5 f7e65ead643470fcad82397a5e6bd1c7 ChangeLog 28391
+RMD160 2653ef2fc04faf008cb9ffd774bcdf9fcea1c73f ChangeLog 28391
+SHA256 416fbe61e3a4abc0177d4c6c11651c47c28d164e2506f529437a611614cd1568 ChangeLog 28391
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 size 330
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -40,13 +40,13 @@ SHA256 78728c79fc77cab9a6f7c21f7a2eed2214a3621b408500fdd31a47535e33f65a files/di
 MD5 c2ece4a7b93084da70d23385e15c53bb files/digest-xine-lib-1.1.2_pre20060328-r2 539
 RMD160 8bc7657606b428177fc57c8ec366ba57fec00a83 files/digest-xine-lib-1.1.2_pre20060328-r2 539
 SHA256 c21af813701378f76e191bb13ef7cda054fd58ddaf5f0c3ac01d1702e41ce1f3 files/digest-xine-lib-1.1.2_pre20060328-r2 539
-MD5 b1e2ae3a15c2d2a2617ed78919ec7fc9 files/digest-xine-lib-1.1.2_pre20060328-r4 539
-RMD160 0d580bc1eddcd3cf75f3b3fade1ba3937566beda files/digest-xine-lib-1.1.2_pre20060328-r4 539
-SHA256 e29445b1f48c613f85f062ba8be3894172964178e38699266e1e9cd2d8f219c5 files/digest-xine-lib-1.1.2_pre20060328-r4 539
+MD5 2505c665224a0dbdf7d8d73f8694ae2b files/digest-xine-lib-1.1.2_pre20060328-r5 539
+RMD160 78f3b9cc991669c1062760af8d25c450bcac4439 files/digest-xine-lib-1.1.2_pre20060328-r5 539
+SHA256 3523e8b3a7556e00cb43f25ec899ba06d8634f4f0726e4bd0ce8f189725dcb08 files/digest-xine-lib-1.1.2_pre20060328-r5 539
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFET283AiZjviIA2XgRAtFDAJ9yOUt21LKsV52UDNn+GPuFuGx+OwCeIXp4
-/ufP/Y8A1SAJWLp/HHT+W/c=
-=/oU7
+iD8DBQFET6C/AiZjviIA2XgRAqOHAKDzSs54JrmGLs/TQA3YMFq8pRl85ACdF5/F
+z+cQiBeGGMX0Qe9IzEtJ8bA=
+=mQal
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r4 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r4
deleted file mode 100644
index a9c023756f79..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1b98ffb4087025c7c38bae883ada8735 xine-lib-1.1.2cvs20060328.tar.gz 7996045
-RMD160 4e561e02b7cd9a10797925386ae7416a932c8431 xine-lib-1.1.2cvs20060328.tar.gz 7996045
-SHA256 fd95811d123e4a82c815674f3722faf3a769e3ba3760d5a4da8630c83f7c7e38 xine-lib-1.1.2cvs20060328.tar.gz 7996045
-MD5 2cc256e9fc57c56f259cfeba679c1bda xine-lib-patches-36.tar.bz2 29421
-RMD160 026071ecbd30111b0560c301baa9be9207de4d19 xine-lib-patches-36.tar.bz2 29421
-SHA256 0cd3490b80f39851a10810ed21564a8425897821f198ca6c86e62b70054ec17a xine-lib-patches-36.tar.bz2 29421
diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r4.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r4.ebuild
deleted file mode 100644
index 92591289d696..000000000000
--- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r4.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# 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_pre20060328-r4.ebuild,v 1.2 2006/04/26 13:01:36 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
-	MY_P="${PN}-${PV/_pre/cvs}"
-	S="${WORKDIR}/${MY_P/cvs*/cvs}"
-
-	SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-fi
-
-PATCHLEVEL="36"
-
-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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-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/libdvdnav
-		>=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_EXCLUDE="patches/240_all_faad-interposing.patch" \
-	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
-		append-flags -UHAVE_MMX
-		filter-flags -fforce-addr  # breaks ffmpeg module
-		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
-		append-flags -mno-sse -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-
-		ewarn ""
-		ewarn "Debug information will be almost useless as the frame pointer is omitted."
-		ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-		ewarn "difficult to fix. Please have that in mind."
-		ewarn ""
-	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-external-dvdnav \
-		--with-w32-path=/usr/lib/win32 \
-		--disable-dependency-tracking || die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make 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
-}