Version bump wrt #295396, thanks to Arseny Solokha for reporting.

Package-Manager: portage-2.2_rc54/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 182 insertions, 2 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index bc5bf146f17a..dbd7c55ef736 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.611 2009/10/21 19:30:08 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.612 2009/12/02 12:28:32 ssuominen Exp $
+
+*xine-lib-1.1.17 (02 Dec 2009)
+
+  02 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +xine-lib-1.1.17.ebuild:
+  Version bump wrt #295396, thanks to Arseny Solokha for reporting.
 
   21 Oct 2009; Gordon Malm <gengor@gentoo.org> xine-lib-1.1.16.3-r2.ebuild:
   Move TEXTREL patch out of $FILESDIR.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 003705e765a3..f83135ab15ac 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,7 +1,9 @@
 AUX xine-lib-1.1.16.3-libmpcdecsv7.patch 1798 RMD160 57ea11ed7ab5d345b588017ff38fde8cd4e2db59 SHA1 0f62d6d60809c641ae8147774225c113620f8a19 SHA256 111ecc67d11cb0847b2bf7ded7db776a08651ee5171d92da6a30f10430a3623b
 DIST xine-lib-1.1.15-textrel-fix.patch 29373 RMD160 4702a26f42251614f5f6c99b4770f82da36577ae SHA1 e04d04dbd736fd17be8cf0583d47630850a89bf9 SHA256 1d6aa047cb0a13f248aea2e06e16b9758b9c39d8b7e42b32d0b52b424d26b33e
 DIST xine-lib-1.1.16.3.tar.bz2 7468182 RMD160 279304a4e998472b2b5e79887e54c47765044ec6 SHA1 64c57c5f55ff37023cc4c3d93d4df3c06950d235 SHA256 d25a241efa55dc7d8f482336efa8bb7b9bb9d69b6df8a8a37f2660948fd67b52
+DIST xine-lib-1.1.17.tar.bz2 7528937 RMD160 ecac0711431a94c74edaf8f00e696ade5ed0b6ee SHA1 2438e66bb571c8a4c981581188376687c42b72c4 SHA256 14e17e1665c0aa90f958204570060a3aebded2b93078c5fae14ca8a92c0e79cf
 EBUILD xine-lib-1.1.16.3-r1.ebuild 5574 RMD160 eaccd47137f6088274044a5f819126a46fc14f87 SHA1 e2618efd4c429504bb3b3b1a978e06059c61ed54 SHA256 a3aac8e8c9b7b52d26214fc60ba2d6a3a115cacfed1f2aa271d7aae1ea3ac49f
 EBUILD xine-lib-1.1.16.3-r2.ebuild 5714 RMD160 5b900991cce76e5b63ce30f7bd5ac7d5e33fe003 SHA1 8c12b099ba7cadba8d9a39ac2ac2fb266b46816e SHA256 f648273c5e9d3c7cdac07ef990eaae0b5fe509b17c8e1dc357353f4e32c8a1bf
-MISC ChangeLog 70582 RMD160 b4e8ac94c162cb1c75619003cc8e6fb061a2d440 SHA1 e671ad369112348db2010645f6404489e23a3c1e SHA256 bbc1b09e4248ff01cf5fcd63ff9b74ee989259b3d40320cce0f29a3426050c75
+EBUILD xine-lib-1.1.17.ebuild 5414 RMD160 0c2f148ebed20456643c3c9b0698ee5ff42d21cb SHA1 cfbc972f7b579f91193495d47acecd6820217401 SHA256 4034fd2f05a0e3400b0d98733c05443dcb4627cf8f378e28a681c9e13e0d9a30
+MISC ChangeLog 70767 RMD160 14afc1b8fcac0b683c03bcc068e4e998e1fa0f72 SHA1 b38ffdf1dff2a1d80e63489ade51dffa4f856d2c SHA256 3b1d9794006431269ff20935da4436f755decae9e3e5519feeb5f9cc088fd2b2
 MISC metadata.xml 2914 RMD160 bed4bab81a32b49e4923ddfcc02e8338a45ef7ef SHA1 fe3faf7dba7f929241acfe5eaa17b2f66bfb2722 SHA256 efe3b879c59c9971e1ffcd732c2bdbd8f60f2b173fde675a371202ceeb96b0fe
diff --git a/media-libs/xine-lib/xine-lib-1.1.17.ebuild b/media-libs/xine-lib/xine-lib-1.1.17.ebuild
new file mode 100644
index 000000000000..df94fa792a04
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.17.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2009 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.17.ebuild,v 1.1 2009/12/02 12:28:32 ssuominen Exp $
+
+EAPI=2
+inherit flag-o-matic toolchain-funcs multilib
+
+# 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/${PN}-1.1.15-textrel-fix.patch"
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="-aalib -libcaca esd win32codecs nls +css +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
++modplug -gtk pulseaudio -mmap -truetype wavpack +musepack +xcb -jack
+-real +vis"
+
+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 )
+	css? ( >=media-libs/libdvdcss-1.2.7 )
+	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_beta14 )
+	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/libdca )
+	aac? ( >=media-libs/faad2-2.6.1 )
+	>=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-sound/musepack-tools-444 )
+	xcb? ( >=x11-libs/libxcb-1.0 )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	real? (
+		x86? ( media-libs/win32codecs )
+		x86-fbsd? ( media-libs/win32codecs )
+		amd64? ( media-libs/amd64codecs ) )"
+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_configure() {
+	#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
+
+	# Set the correct win32 dll path, bug #197236
+	local win32dir
+	if has_multilib_profile ; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	# 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"
+
+	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) --with-external-libfaad \
+		$(use_with flac libflac) \
+		$(use_with vorbis) \
+		$(use_with speex) \
+		$(use_with theora) \
+		$(use_with wavpack) \
+		$(use_enable modplug) \
+		$(use_enable a52 a52dec) --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) \
+		--without-arts \
+		$(use_with esd esound) \
+		$(use_with pulseaudio) \
+		$(use_with jack) \
+		$(use_enable vcd) --without-internal-vcdlibs \
+		$(use_enable win32codecs w32dll) \
+		$(use_enable real real-codecs) \
+		$(use_enable mmap) \
+		$(use_with truetype freetype) $(use_with truetype fontconfig) \
+		$(use_enable vis) \
+		--enable-asf \
+		--with-external-ffmpeg \
+		--disable-optimizations \
+		--disable-syncfb \
+		--with-xv-path=/usr/$(get_libdir) \
+		--with-w32-path=${win32dir} \
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
+		--enable-fast-install \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
+		install || die
+	dodoc ChangeLog
+}