Keep up with gentoo.org ebuild.

svn path=/testing/; revision=175

5 files changed, 274 insertions, 4 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index cebd629..9cb8741 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +xine-lib-1.1.4-r2.ebuild, +files/xine-lib-1.1.4-CVE-2007-1246.patch:
+  Keep up with gentoo.org ebuild.
+
   11 Mar 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
   +xine-lib-1.1.4-r1.ebuild:
   update; make it eval to main portage tree
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 380d900..fed8432 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,3 +1,7 @@
+AUX xine-lib-1.1.4-CVE-2007-1246.patch 1304 RMD160 56394c48df401162c225f956a9b83fc8c3970668 SHA1 f4088a8e984d05535ea33d23a2010b2c7943de44 SHA256 6771d7b21d68882501f20d338f794d8400ec683dec5e90b7bce54bafd7b9dceb
+MD5 30a23851923288df6d34e7791b2dfc2f files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
+RMD160 56394c48df401162c225f956a9b83fc8c3970668 files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
+SHA256 6771d7b21d68882501f20d338f794d8400ec683dec5e90b7bce54bafd7b9dceb files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
 DIST xine-lib-1.1.3-gentoo-vdr-20070103.tar.bz2 27829 RMD160 9952ca16a0f7485052b3f5fa2083c87d884e1e71 SHA1 d76017f4e82e3d935d011fd414a177eeafdbe9f2 SHA256 566c187ddee2a63e285076c471424d9d63ae5249d06a59b79cc8239efc1feace
 DIST xine-lib-1.1.3.tar.gz 8508884 RMD160 8e28638385ea48e7d4d4d702573ca92c4eca77c8 SHA1 c0886910ddb1afa1a72572decf12c0251bba40bf SHA256 96e50c6e7b2fb1209c52dcab6b38f2a99aa1c9d6e028b479a800cafef11bccb0
 DIST xine-lib-1.1.4-gentoo-vdr-20070130.tar.bz2 27697 RMD160 709bd9cdcbb289b6f211d6dd32043cffe404771a SHA1 2795b6059f906b2b94cd04f848a4b34eff7bedab SHA256 97306a31b76175e72edc578e74636deda88a1752bb6a70457f72c2fc16a5aba9
@@ -12,14 +16,18 @@ EBUILD xine-lib-1.1.4-r1.ebuild 6223 RMD160 00d07a6a4bbecac94c0c0498ea19293898f3
 MD5 6bd6ca18bb1c7c889272c3fba73dfac3 xine-lib-1.1.4-r1.ebuild 6223
 RMD160 00d07a6a4bbecac94c0c0498ea19293898f34884 xine-lib-1.1.4-r1.ebuild 6223
 SHA256 0c9146d11d9b0e5faf1cd6385420d0e0b2d68100d9ff027f6c0a21dbafce512b xine-lib-1.1.4-r1.ebuild 6223
+EBUILD xine-lib-1.1.4-r2.ebuild 6289 RMD160 d0ab88ab7712f73f2fb9c191bffa95c540422ed6 SHA1 8aff7424c4508a2e1c1f0ff21cb998b950eed66c SHA256 4e485571f0c0875e6b1f8d4c21975dc903e91074216316a037eb7c95f51e075b
+MD5 00d23f8158b1a33481d51172585ed1c7 xine-lib-1.1.4-r2.ebuild 6289
+RMD160 d0ab88ab7712f73f2fb9c191bffa95c540422ed6 xine-lib-1.1.4-r2.ebuild 6289
+SHA256 4e485571f0c0875e6b1f8d4c21975dc903e91074216316a037eb7c95f51e075b xine-lib-1.1.4-r2.ebuild 6289
 EBUILD xine-lib-1.1.4.ebuild 6178 RMD160 b90f047d731f8f7fcb5d6d6bda2d423840fba3d7 SHA1 bf920125b362d88bee3964a6067e626d28c78782 SHA256 89ec895d318ce5962a821edc4e38b286ce300ac1317883079f9b08821caad587
 MD5 3001233514a03b5d4e43d8b0f3f510c3 xine-lib-1.1.4.ebuild 6178
 RMD160 b90f047d731f8f7fcb5d6d6bda2d423840fba3d7 xine-lib-1.1.4.ebuild 6178
 SHA256 89ec895d318ce5962a821edc4e38b286ce300ac1317883079f9b08821caad587 xine-lib-1.1.4.ebuild 6178
-MISC ChangeLog 642 RMD160 d8321772c216d06b2b2c17a5d711519a1ec20b78 SHA1 03f7d0b0b08f5d886e1bf4976fd2a174257230ab SHA256 fed5b8d4505e0962b49d45c1ee0fc531b12338b078114472a5ba1338dd46a336
-MD5 b64bd7476f7ebe0cd0bc739f658dc08c ChangeLog 642
-RMD160 d8321772c216d06b2b2c17a5d711519a1ec20b78 ChangeLog 642
-SHA256 fed5b8d4505e0962b49d45c1ee0fc531b12338b078114472a5ba1338dd46a336 ChangeLog 642
+MISC ChangeLog 802 RMD160 68ee0713f1ad704281eb0f29df5f6d6b3e18a96b SHA1 de50d1f7c775a395b3d920b365f3b2676a7b5dbd SHA256 f1208b633c52edec55170450129ea1d282a78fa40996efd588a4abf8ea13ea79
+MD5 f8970567479c249be5e983493524f7cf ChangeLog 802
+RMD160 68ee0713f1ad704281eb0f29df5f6d6b3e18a96b ChangeLog 802
+SHA256 f1208b633c52edec55170450129ea1d282a78fa40996efd588a4abf8ea13ea79 ChangeLog 802
 MISC metadata.xml 482 RMD160 4ad7da31113020d5de3a47ea5b367b186e93c7cb SHA1 8d99078eabffe305b5d8f8e5af9e27a2f6339890 SHA256 02042c581c6cb0316663d998281da538fdd14f8d4c0466edb0b6022b0ea9b7a3
 MD5 1cb0015845f0962f0d982c02b7377ae5 metadata.xml 482
 RMD160 4ad7da31113020d5de3a47ea5b367b186e93c7cb metadata.xml 482
@@ -33,3 +41,6 @@ SHA256 e819f31c8273ef357f99946d0c39423b204886f6d29dc36edf88d738517d94a0 files/di
 MD5 ea7379a6484695225b0ed2e3289e1495 files/digest-xine-lib-1.1.4-r1 816
 RMD160 5f48dde0eb1a285436dd7049d94da28ff7ae4f61 files/digest-xine-lib-1.1.4-r1 816
 SHA256 4b8804e9598a5463ad0f0fbcdb959219ae1537dbcdc3fe49ed139e858407f1fb files/digest-xine-lib-1.1.4-r1 816
+MD5 ea7379a6484695225b0ed2e3289e1495 files/digest-xine-lib-1.1.4-r2 816
+RMD160 5f48dde0eb1a285436dd7049d94da28ff7ae4f61 files/digest-xine-lib-1.1.4-r2 816
+SHA256 4b8804e9598a5463ad0f0fbcdb959219ae1537dbcdc3fe49ed139e858407f1fb files/digest-xine-lib-1.1.4-r2 816
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.4-r2 b/media-libs/xine-lib/files/digest-xine-lib-1.1.4-r2
new file mode 100644
index 0000000..805e932
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.4-r2
@@ -0,0 +1,9 @@
+MD5 1979e3b9fa7a4eddb18972c81bd64f00 xine-lib-1.1.4-gentoo-vdr-20070130.tar.bz2 27697
+RMD160 709bd9cdcbb289b6f211d6dd32043cffe404771a xine-lib-1.1.4-gentoo-vdr-20070130.tar.bz2 27697
+SHA256 97306a31b76175e72edc578e74636deda88a1752bb6a70457f72c2fc16a5aba9 xine-lib-1.1.4-gentoo-vdr-20070130.tar.bz2 27697
+MD5 7de81738932d414bff6b90b347449c9b xine-lib-1.1.4-xcb.patch.bz2 22346
+RMD160 0e993341e7ca4bd1ae3604235a1004f1c5d6ee07 xine-lib-1.1.4-xcb.patch.bz2 22346
+SHA256 8dc146699eadd52fcf1b1df296505fb24e5382696c40d325de22c782f7ca21bb xine-lib-1.1.4-xcb.patch.bz2 22346
+MD5 e8ecc022457d8ffc9fec91681c5fff2b xine-lib-1.1.4.tar.bz2 6997816
+RMD160 c77de004c9c3b74dca3de08aea0feb27db70a4c2 xine-lib-1.1.4.tar.bz2 6997816
+SHA256 e5515631b46a74be462a6076194d136d1c49adfd817f97e3a5e6dba88eab6c23 xine-lib-1.1.4.tar.bz2 6997816
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.4-CVE-2007-1246.patch b/media-libs/xine-lib/files/xine-lib-1.1.4-CVE-2007-1246.patch
new file mode 100644
index 0000000..5b285ce
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.4-CVE-2007-1246.patch
@@ -0,0 +1,33 @@
+? default
+? enterprise
+? prakesh
+Index: src/libw32dll/DirectShow/DS_VideoDecoder.c
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c,v
+retrieving revision 1.9
+diff -u -B -r1.9 DS_VideoDecoder.c
+--- src/libw32dll/DirectShow/DS_VideoDecoder.c	24 Dec 2003 16:55:36 -0000	1.9
++++ src/libw32dll/DirectShow/DS_VideoDecoder.c	10 Mar 2007 00:33:41 -0000
+@@ -110,6 +110,7 @@
+      
+         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
+         memcpy(this->iv.m_bh, format, bihs);
++        this->iv.m_bh->biSize = bihs;
+ 
+         this->iv.m_State = STOP;
+         //this->iv.m_pFrame = 0;
+Index: src/libw32dll/dmo/DMO_VideoDecoder.c
+===================================================================
+RCS file: /cvsroot/xine/xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c,v
+retrieving revision 1.4
+diff -u -B -r1.4 DMO_VideoDecoder.c
+--- src/libw32dll/dmo/DMO_VideoDecoder.c	24 Dec 2003 16:55:36 -0000	1.4
++++ src/libw32dll/dmo/DMO_VideoDecoder.c	10 Mar 2007 00:33:41 -0000
+@@ -118,6 +118,7 @@
+      
+         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
+         memcpy(this->iv.m_bh, format, bihs);
++        this->iv.m_bh->biSize = bihs;
+ 
+         this->iv.m_State = STOP;
+         //this->iv.m_pFrame = 0;
diff --git a/media-libs/xine-lib/xine-lib-1.1.4-r2.ebuild b/media-libs/xine-lib/xine-lib-1.1.4-r2.ebuild
new file mode 100644
index 0000000..d055442
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.4-r2.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2007 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.4.ebuild,v 1.3 2007/01/29 18:50:01 flameeyes Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
+
+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
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-xcb.patch.bz2
+	mirror://vdrfiles/${PN}/${P}-gentoo-vdr-20070130.tar.bz2"
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~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 truetype wavpack musepack xcb
+vdr vdr-net"
+
+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.1.2 )
+	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-1.0_alpha6 )
+	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_p20070129
+	modplug? ( media-libs/libmodplug )
+	nls? ( virtual/libintl )
+	gtk? ( =x11-libs/gtk+-2* )
+	pulseaudio? ( media-sound/pulseaudio )
+	truetype? ( =media-libs/freetype-2* media-libs/fontconfig )
+	virtual/libiconv
+	wavpack? ( >=media-sound/wavpack-4.31 )
+	musepack? ( media-libs/libmpcdec )
+	xcb? ( >=x11-libs/libxcb-1.0 )
+	!=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 ) )
+	v4l? ( virtual/os-headers )
+	dev-util/pkgconfig
+	sys-devel/libtool
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${WORKDIR}/${P}-xcb.patch"
+	epatch "${FILESDIR}/${P}-CVE-2007-1246.patch"
+
+	# add some vdr relevated patches
+	if use vdr; then
+		echo
+		einfo "Add VDR patches"
+
+		epatch ${WORKDIR}/${PN}-gentoo-vdr/040-centre_crop_out.patch
+		epatch ${WORKDIR}/${PN}-gentoo-vdr/050-libmpeg2.patch
+		epatch ${WORKDIR}/${PN}-gentoo-vdr/060-max-showings.patch
+		epatch ${WORKDIR}/${PN}-gentoo-vdr/070-export-functions.patch
+		epatch ${WORKDIR}/${PN}-gentoo-vdr/080-threading-redraw.patch
+		epatch ${WORKDIR}/${PN}-gentoo-vdr/100-main-gentoo-vdr.patch
+
+		if use vdr-net; then
+			epatch ${WORKDIR}/${PN}-gentoo-vdr/110-vdr-${PN}-1.1.2-network.diff
+		fi
+
+	fi
+
+	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
+		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
+
+	# 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"
+
+	elibtoolize
+	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 gdkpixbuf) \
+		\
+		$(use_enable aac faad) \
+		$(use_with flac libflac) \
+		$(use_with vorbis) \
+		$(use_with speex) \
+		$(use_with theora) \
+		$(use_with wavpack) \
+		$(use_enable modplug) \
+		$(use_enable a52) --with-external-a52dec \
+		$(use_enable mad) --with-external-libmad \
+		$(use_enable dts) --with-external-libdts \
+		$(use_enable musepack) --with-external-libmpcdec \
+		\
+		$(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_with xcb) \
+		\
+		$(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 mmap) \
+		$(use_with truetype freetype) $(use_with truetype fontconfig) \
+		--enable-asf \
+		--with-external-ffmpeg \
+		--disable-optimizations \
+		--disable-syncfb \
+		--disable-jack \
+		${myconf} \
+		--with-xv-path=/usr/$(get_libdir) \
+		--with-w32-path=/usr/$(ABI=x86 get_libdir)/win32 \
+		--enable-fast-install \
+		--disable-dependency-tracking || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
+		install || die "Install failed"
+}