Bump revision, to fix OSD horizontal lines (bug #131185) and finally bug #112921.

Package-Manager: portage-2.1_pre9-r4

4 files changed, 297 insertions, 8 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 74a041a53c1f..ee2be6abeaf9 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.331 2006/04/24 09:20:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.332 2006/04/25 15:12:31 flameeyes Exp $
+
+*xine-lib-1.1.2_pre20060328-r2 (25 Apr 2006)
+
+  25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +xine-lib-1.1.2_pre20060328-r2.ebuild:
+  Bump revision, to fix OSD horizontal lines (bug #131185) and finally bug
+  #112921.
 
   24 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -xine-lib-1.1.1-r5.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index c2746f4fa284..a69da878da44 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -5,6 +5,7 @@ DIST xine-lib-1.1.1.tar.gz 7990031 RMD160 5b7ba57c675414e84649701b3f356404ec7c9f
 DIST xine-lib-1.1.2cvs20060328.tar.gz 7996045 RMD160 4e561e02b7cd9a10797925386ae7416a932c8431 SHA256 fd95811d123e4a82c815674f3722faf3a769e3ba3760d5a4da8630c83f7c7e38 size 7996045
 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
 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
@@ -13,10 +14,14 @@ EBUILD xine-lib-1.1.2_pre20060328-r1.ebuild 7888 RMD160 678cbc37fc06318f3cbc2194
 MD5 e783f276cd50b4e8e91c3b4c94a3e7ec xine-lib-1.1.2_pre20060328-r1.ebuild 7888
 RMD160 678cbc37fc06318f3cbc2194c1631ab093d3ff3e xine-lib-1.1.2_pre20060328-r1.ebuild 7888
 SHA256 188ac7a6f443d8aae25d6ea673a7ad5df96128b52b25f5afc550e97555efae5a xine-lib-1.1.2_pre20060328-r1.ebuild 7888
-MISC ChangeLog 26966 RMD160 e4feb2f87f161ec8e8045b02d40604729b2a5abe SHA1 9d996b7acdf30d55a375aea2b30ce5442cb898b2 SHA256 14b9eb53eaa78643417c1c99f59c27a10d72141643d511ff4c564ea51f1aa91f size 26966
-MD5 80c7f367292c099ae4e98df8a7ec8e79 ChangeLog 26966
-RMD160 e4feb2f87f161ec8e8045b02d40604729b2a5abe ChangeLog 26966
-SHA256 14b9eb53eaa78643417c1c99f59c27a10d72141643d511ff4c564ea51f1aa91f ChangeLog 26966
+EBUILD xine-lib-1.1.2_pre20060328-r2.ebuild 7898 RMD160 573213333431bade16ac49131a206a5695df090c SHA1 51c5884932b6458712ff75f45135951223a0db93 SHA256 676cfa458ac4240c18535e5c30ac840096b8ca98826f319bd7166acc35f92058 size 7898
+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
+MISC ChangeLog 27193 RMD160 c8a09d1cb83d0d3a248ca6af56ad9e26ce74ffc5 SHA1 c2e3f95ef9413f39de7f48383fb68a4fdb37fd11 SHA256 bfb6839a9ce4d1210ab3e4e78c4981185c7589e626a63443a3783aeb6d5576d0 size 27193
+MD5 807c7aa6a3ba1303ae4c7a07c7ce1911 ChangeLog 27193
+RMD160 c8a09d1cb83d0d3a248ca6af56ad9e26ce74ffc5 ChangeLog 27193
+SHA256 bfb6839a9ce4d1210ab3e4e78c4981185c7589e626a63443a3783aeb6d5576d0 ChangeLog 27193
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 size 330
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -27,10 +32,13 @@ SHA256 7f34a2c62e490267ace928ac8d8fea0cadd2a180b9f57ccba00ac30ba1ca6b2a files/di
 MD5 550f8063d46fecf33e569bf54acf1997 files/digest-xine-lib-1.1.2_pre20060328-r1 539
 RMD160 66d2c38830cd4b02db2d856d10826959319b480d files/digest-xine-lib-1.1.2_pre20060328-r1 539
 SHA256 78728c79fc77cab9a6f7c21f7a2eed2214a3621b408500fdd31a47535e33f65a files/digest-xine-lib-1.1.2_pre20060328-r1 539
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFETJhRAiZjviIA2XgRAipGAJwIVnfFb4KfCshOxkuBBJvHmUdiQQCg7RyJ
-+Gm3wioOvNDW7N6i81B4yig=
-=xvLz
+iD8DBQFETjxuAiZjviIA2XgRAoQPAKC4rNzp/6v7T0lMj4uqZ5wOTeAcWQCguCNI
+NwwN8q+Ekvo7XnYvqCwYiIo=
+=nPkb
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r2 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r2
new file mode 100644
index 000000000000..1c81f6cebd70
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r2
@@ -0,0 +1,6 @@
+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 9a8099ee8e93f1546a1c49f2015a4b65 xine-lib-patches-33.tar.bz2 20898
+RMD160 c5a774c8e9e0565cdc55f8ab3fee67970ea578c9 xine-lib-patches-33.tar.bz2 20898
+SHA256 8a5d33f999b79365f7ca1c3b7ece0f78aed17cbb18f05d4fc5b4f66dd895f622 xine-lib-patches-33.tar.bz2 20898
diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r2.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r2.ebuild
new file mode 100644
index 000000000000..c774b46042fc
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r2.ebuild
@@ -0,0 +1,268 @@
+# 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-r2.ebuild,v 1.1 2006/04/25 15:12:31 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="33"
+
+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"
+
+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
+		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 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 \
+		--disable-dependency-tracking || die "econf 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 "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
+}