Updated 1.1.15-r1 ebuild. Added 1.1.16.1 ebuild with new vdr-xine patch.

(Portage version: 2.1.6.6/svn/Linux 2.6.27-gentoo-r1 i686)

svn path=/testing/; revision=496

4 files changed, 246 insertions, 2 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 152b474..c26b6b6 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for media-libs/xine-lib
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +files/xine-lib-1.1.15-GetImagePixels.patch, xine-lib-1.1.15-r1.ebuild,
+  +xine-lib-1.1.16.1.ebuild:
+  Updated 1.1.15-r1 ebuild. Added 1.1.16.1 ebuild with new vdr-xine patch.
+
   21 Oct 2008; Matthias Schwarzott <zzam@gentoo.org>
   -files/xine-lib-1.1.8-dxr3.patch,
   -files/xine-lib-1.1.14-metadata-bugfix.patch,
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch
new file mode 100644
index 0000000..c1c572d
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch
@@ -0,0 +1,25 @@
+Upstream ImageMagick changed part of the API and did not updated their
+deprecated support stuff, so bump us along for now to avoid having to downgrade.
+
+Gentoo-bug: 247292
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*~' xine-lib-1.1.15.orig/src/libxinevdec/image.c xine-lib-1.1.15/src/libxinevdec/image.c
+--- xine-lib-1.1.15.orig/src/libxinevdec/image.c	2008-06-14 16:15:00.000000000 -0700
++++ xine-lib-1.1.15/src/libxinevdec/image.c	2008-11-26 18:10:16.416309036 -0800
+@@ -110,7 +110,15 @@
+     width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */
+     height = MagickGetImageHeight(wand);
+     img_buf = malloc(width * height * 3);
++/* In 6.4.5.4 MagickGetImagePixels changed to MagickGetAuthenticPixels 
++ * But upstream did not update their deprecated compat stuff.
++ * So do a fun hack to make it work.
++ * - 2008/11/26 Robin H. Johnson <robbat2@gentoo.org>
++ */
++#if MagickLibVersion >= 0x645
++#define MagickGetImagePixels MagickGetAuthenticPixels
++#endif
+     MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
+     DestroyMagickWand(wand);
+ 
+     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width);
diff --git a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
index 70ef27f..d9207bd 100644
--- a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.15-r1.ebuild,v 1.10 2008/10/06 22:03:02 aballier Exp $
 
@@ -95,6 +95,7 @@ src_unpack() {
 	epatch "$FILESDIR"/${P}-libmpeg2-vis.patch
 	epatch "$FILESDIR"/${P}-buffer_h_ansi.patch
 	epatch "$FILESDIR"/${P}-ffmpeg.patch
+	epatch "$FILESDIR"/${P}-GetImagePixels.patch
 
 	# add vdr-xine patch
 	if use vdr; then
diff --git a/media-libs/xine-lib/xine-lib-1.1.16.1.ebuild b/media-libs/xine-lib/xine-lib-1.1.16.1.ebuild
new file mode 100644
index 0000000..3ebc4c8
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.16.1.ebuild
@@ -0,0 +1,213 @@
+# 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.15-r1.ebuild,v 1.10 2008/10/06 22:03:02 aballier Exp $
+
+EAPI=1
+
+inherit eutils flag-o-matic toolchain-funcs libtool multilib 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
+VDR_PATCHES="${PN}-1.1.16.1-gentoo-vdr-20090118"
+SRC_URI="${SRC_URI}
+		mirror://gentoo/${VDR_PATCHES}.tar.bz2
+		http://dev.gentoo.org/~zzam/distfiles/overlay/${VDR_PATCHES}.tar.bz2"
+
+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 -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 -jack
+-real +vis vdr"
+
+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_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-libs/libmpcdec )
+	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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# add vdr-xine patch
+	if use vdr; then
+		echo
+		einfo "Adding support for vdr-xine"
+
+		epatch "${WORKDIR}/${VDR_PATCHES}"/*
+
+		# fill in better fifo directory
+		sed -i src/vdr/input_vdr.c \
+			-e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|'
+
+		# only need to run autotools if we actually changed stuff
+
+		# add this, else libtool-2.2.4 will abort aclocal step
+		sed -i -e '/AC_PROG_CC/aAC_PROG_CXX'  "${S}"/configure.ac
+		AT_M4DIR="m4" eautoreconf
+	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
+
+	# 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"
+
+	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) --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) \
+		$(use_with 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 debug) \
+		$(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 || die "econf failed."
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
+		install || die "emake install failed."
+
+	dodoc ChangeLog
+}