From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Wed, 29 Nov 2006 23:14:12 +0000 (+0000)
Subject: Bump patchset to push out a patch for the possible security issue in libreal.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=404de1596c58a92a516839b719a9a55071ab17d5;p=gentoo.git

Bump patchset to push out a patch for the possible security issue in libreal.
Package-Manager: portage-2.1.2_rc2-r3
---

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 3066216083a9..37d159f6ef4c 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.418 2006/11/29 22:35:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.419 2006/11/29 23:14:12 flameeyes Exp $
+
+*xine-lib-1.1.2-r3 (29 Nov 2006)
+
+  29 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +xine-lib-1.1.2-r3.ebuild:
+  Bump patchset to push out a patch for the possible security issue in libreal.
 
 *xine-lib-1.1.3_pre20061129 (29 Nov 2006)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 5c1302be7d2a..239de7bb9bbf 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -5,18 +5,23 @@ DIST xine-lib-1.1.2.tar.bz2 6457108 RMD160 21322d6d7e085237926741495d70f5ce77649
 DIST xine-lib-1.1.3_pre20061129.tar.bz2 6979033 RMD160 66beb6757b8642925c24828eb555d1147fe9c742 SHA1 20bef44159c2980f30f87f46acff43c65463472c SHA256 8620c2ad309554c3ebc7acc358d41c7278b743c83442d14b0d432cd7c8b2b483
 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
+DIST xine-lib-patches-64.tar.bz2 23578 RMD160 6a4272d82c7d8de004e71e2991e0cdf66ab833c2 SHA1 d7a059d487e3d05af687f501e3394ee625b5f295 SHA256 d5fcf477e59d6963235c6d6f682d887e21f849bc76441d915152b83f93d44884
 EBUILD xine-lib-1.1.2-r2.ebuild 7179 RMD160 209e9efc0812378f7ec800cf3c625d433f46cc71 SHA1 02c7b26171626667741dd3a72fd9eac8457c5ace SHA256 b00c968bc3fecace431cdac9887e5fcb702c9312d7d7d0047fd98ffe4f8ef223
 MD5 043ef6b29d6f265d0aee1650cd852500 xine-lib-1.1.2-r2.ebuild 7179
 RMD160 209e9efc0812378f7ec800cf3c625d433f46cc71 xine-lib-1.1.2-r2.ebuild 7179
 SHA256 b00c968bc3fecace431cdac9887e5fcb702c9312d7d7d0047fd98ffe4f8ef223 xine-lib-1.1.2-r2.ebuild 7179
+EBUILD xine-lib-1.1.2-r3.ebuild 7187 RMD160 fc6818ec9cda34da0b19c7dd52ad2af76100c50d SHA1 2791d2a6283938ba3f3a5838441a2d22456248c7 SHA256 540cd64311589e56685837842e290273eac56148dcd839b4fbce78efa0932764
+MD5 bdc5c6dc7ce9ad3948e2cfe1ab3fada1 xine-lib-1.1.2-r3.ebuild 7187
+RMD160 fc6818ec9cda34da0b19c7dd52ad2af76100c50d xine-lib-1.1.2-r3.ebuild 7187
+SHA256 540cd64311589e56685837842e290273eac56148dcd839b4fbce78efa0932764 xine-lib-1.1.2-r3.ebuild 7187
 EBUILD xine-lib-1.1.3_pre20061129.ebuild 5348 RMD160 426195fa869f783e8a1d8086db69bb5cf3f37649 SHA1 05ba69e074471303e0ece0dcfb0385d00ce298b0 SHA256 7d1b1b9b8ba02e52c702379711d66c94bae3c25ab5f6642620e78dac516c5054
 MD5 f688ba0a081baa5370116e52a446c947 xine-lib-1.1.3_pre20061129.ebuild 5348
 RMD160 426195fa869f783e8a1d8086db69bb5cf3f37649 xine-lib-1.1.3_pre20061129.ebuild 5348
 SHA256 7d1b1b9b8ba02e52c702379711d66c94bae3c25ab5f6642620e78dac516c5054 xine-lib-1.1.3_pre20061129.ebuild 5348
-MISC ChangeLog 43624 RMD160 d3f36432de3df49b6cae8079680df2a5d3975616 SHA1 f0bc52c30036ef9110892e83e93513361937c569 SHA256 ff737503ff1d4557ff178b4643c57972c040458c2874634f4c757827234bd3aa
-MD5 b01821e31f7e4d8dc9f90c6a87ee340b ChangeLog 43624
-RMD160 d3f36432de3df49b6cae8079680df2a5d3975616 ChangeLog 43624
-SHA256 ff737503ff1d4557ff178b4643c57972c040458c2874634f4c757827234bd3aa ChangeLog 43624
+MISC ChangeLog 43821 RMD160 13dbe80e78a08c119c3205f57cb098be72bf69f4 SHA1 a8fc6754378f5a5eeedef99ef46ba4379e9677b6 SHA256 d431388927897c98cd332402cb7e095efd1489aa7f527480af6ea594199677a1
+MD5 4e1223e46e9980626e52f130bd771386 ChangeLog 43821
+RMD160 13dbe80e78a08c119c3205f57cb098be72bf69f4 ChangeLog 43821
+SHA256 d431388927897c98cd332402cb7e095efd1489aa7f527480af6ea594199677a1 ChangeLog 43821
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -24,13 +29,16 @@ SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 metadata
 MD5 f27667d2c33a9d999ec4b153cb53f81d files/digest-xine-lib-1.1.2-r2 509
 RMD160 d6b86118869621f916d506c6041f747e016dd592 files/digest-xine-lib-1.1.2-r2 509
 SHA256 9c987dc9ad1a1fa5fbaf02ce0e17493f4f77aa500ab3881dc62736325de62acb files/digest-xine-lib-1.1.2-r2 509
+MD5 cb78d496c7990cc579f6de6f00084f36 files/digest-xine-lib-1.1.2-r3 509
+RMD160 6d5034f81f1b037e8049996e9adae1f5fab746cb files/digest-xine-lib-1.1.2-r3 509
+SHA256 36f6f5bccde0b9770fbec9da49cb24f6deafa2a1de535444ab0e84f6db4a52e0 files/digest-xine-lib-1.1.2-r3 509
 MD5 8f40c71cd1506a04e1756c6d5ab3a1aa files/digest-xine-lib-1.1.3_pre20061129 542
 RMD160 cccded9597ed88c53a8a107be71cb2187186c297 files/digest-xine-lib-1.1.3_pre20061129 542
 SHA256 deede9b16659fa75f1dfa022975f4419ef3ca5b6568120fd45b1f6003ffdb4d2 files/digest-xine-lib-1.1.3_pre20061129 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFbgs4AiZjviIA2XgRAnd6AJ4+3IH8JKjlqYJoSfwS5ypx62e1uQCfbqx4
-lHGlDnmvUKrB887zgQtRSdA=
-=q+fh
+iD8DBQFFbhRLAiZjviIA2XgRAovHAKC8HYpczj9/Oigdo1BQY/PVcqzlcACfRUmT
+MSMpQo6ZzuEAEw4SEzHL+Q4=
+=fbSt
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2-r3 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2-r3
new file mode 100644
index 000000000000..95f803c5bafa
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.2-r3
@@ -0,0 +1,6 @@
+MD5 c4dd262c47caae6f428eb902ac8ec0e8 xine-lib-1.1.2.tar.bz2 6457108
+RMD160 21322d6d7e085237926741495d70f5ce7764910b xine-lib-1.1.2.tar.bz2 6457108
+SHA256 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226 xine-lib-1.1.2.tar.bz2 6457108
+MD5 bcf6f9a132ef087c1ae35e06f797b52b xine-lib-patches-64.tar.bz2 23578
+RMD160 6a4272d82c7d8de004e71e2991e0cdf66ab833c2 xine-lib-patches-64.tar.bz2 23578
+SHA256 d5fcf477e59d6963235c6d6f682d887e21f849bc76441d915152b83f93d44884 xine-lib-patches-64.tar.bz2 23578
diff --git a/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild b/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild
new file mode 100644
index 000000000000..ffd44f2676db
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.2-r3.ebuild
@@ -0,0 +1,251 @@
+# 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-r3.ebuild,v 1.1 2006/11/29 23:14:12 flameeyes Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="2.5"
+
+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="64"
+
+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_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 mp3 imagemagick dts asf
+debug modplug ${IUSE_VIDEO_CARDS}"
+
+RDEPEND="vorbis? ( media-libs/libvorbis )
+	X? ( || ( (
+			x11-libs/libXext
+			x11-libs/libX11 )
+		<virtual/x11-7 ) )
+	xv? ( || ( x11-libs/libXv <virtual/x11-7 ) )
+	xvmc? (
+		|| ( x11-libs/libXvMC <virtual/x11-7 )
+		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
+			x11-drivers/nvidia-legacy-drivers ) )
+		video_cards_via? ( || ( x11-drivers/xf86-video-via <virtual/x11-7 ) )
+		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 <virtual/x11-7 ) )
+	)
+	xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )
+	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.1.2 )
+	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 )
+	mp3? ( media-libs/libmad )
+	imagemagick? ( media-gfx/imagemagick )
+	dts? ( media-libs/libdts )
+	>=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-libs/libXt
+			x11-proto/xproto
+			x11-proto/videoproto
+			x11-proto/xf86vidmodeproto
+			xinerama? ( x11-proto/xineramaproto ) )
+		<virtual/x11-7 )
+		)
+	v4l? ( virtual/os-headers )
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	WANT_AUTOMAKE="1.9" 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
+		filter-flags -fno-omit-frame-pointer #breaks per bug #149704
+		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
+
+	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 gnomevfs) \
+		$(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 mp3 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) \
+		--with-external-ffmpeg \
+		--disable-polypaudio \
+		--disable-optimizations \
+		--disable-freetype \
+		${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
+		elog "You choose to build win32codecs support but disabled ASF"
+		elog "demuxer. This way you'll have support for win32codecs in"
+		elog "formats like AVI or Matroska, but not in WMV/WMA files."
+		elog ""
+		elog "To be able to play WMV/WMA files, please add asf useflag."
+	fi
+}