Upstream patch for "Fix DVB CRC checking (was wrong endianness)"

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

3 files changed, 234 insertions, 1 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 78a219506d51..7e335f4932f6 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.669 2012/02/29 11:25:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.670 2012/03/07 11:58:46 ssuominen Exp $
+
+*xine-lib-1.2.1-r1 (07 Mar 2012)
+
+  07 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xine-lib-1.2.1-r1.ebuild, +files/xine-lib-1.2.1-fix_dvb_crc_checking.patch:
+  Upstream patch for "Fix DVB CRC checking (was wrong endianness)"
 
   29 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> xine-lib-1.2.1.ebuild:
   ppc64/x86 stable wrt #405659
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.1-fix_dvb_crc_checking.patch b/media-libs/xine-lib/files/xine-lib-1.2.1-fix_dvb_crc_checking.patch
new file mode 100644
index 000000000000..3a7e654654f0
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.1-fix_dvb_crc_checking.patch
@@ -0,0 +1,23 @@
+http://xine.hg.sourceforge.net/hgweb/xine/xine-lib-1.2/rev/4bf51c8a7dad
+
+--- src/input/input_dvb.c
++++ src/input/input_dvb.c
+@@ -2470,10 +2470,10 @@
+ 
+       crc = av_crc(this->class->av_crc, 0xffffffff, originalPkt+1, 12);
+ 
+-      originalPkt[13]=(crc>>24) & 0xff;
+-      originalPkt[14]=(crc>>16) & 0xff;
+-      originalPkt[15]=(crc>>8) & 0xff;
+-      originalPkt[16]=crc & 0xff;
++      originalPkt[13]=(crc    ) & 0xff;
++      originalPkt[14]=(crc>> 8) & 0xff;
++      originalPkt[15]=(crc>>16) & 0xff;
++      originalPkt[16]=(crc>>24) & 0xff;
+       memset(originalPkt+17,0xFF,PKT_SIZE-21); /* stuff the remainder */
+ 
+     }
+
+
+
+
diff --git a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..acf282c632d6
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2012 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.2.1-r1.ebuild,v 1.1 2012/03/07 11:58:46 ssuominen Exp $
+
+EAPI=4
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+	_live_inherits="autotools mercurial"
+else
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+fi
+
+inherit eutils libtool multilib ${_live_inherits}
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack nls opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc"
+
+RDEPEND="dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	sys-libs/zlib
+	virtual/ffmpeg
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( >=media-libs/libbluray-0.2.1 )
+	css? ( >=media-libs/libdvdcss-1.2.10 )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dxr3? ( media-libs/libfame )
+	flac? ( media-libs/flac )
+	fusion? ( media-libs/FusionSound )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	nls? ( virtual/libintl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)
+	pulseaudio? ( media-sound/pulseaudio )
+	real? (
+		amd64? ( media-libs/amd64codecs )
+		x86? ( media-libs/win32codecs )
+		x86-fbsd? ( media-libs/win32codecs )
+		)
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		)
+	v4l? ( media-libs/libv4l )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio[-minimal]
+		)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		)
+	wavpack? ( media-sound/wavpack )
+	win32codecs? ( media-libs/win32codecs )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		)
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/pkgconfig
+	>=sys-devel/libtool-2.2.6b
+	bluray? ( !media-libs/libbluray-xine )
+	nls? ( sys-devel/gettext )
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-libs/libXt
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		)
+	xv? ( x11-proto/videoproto )
+	xvmc? ( x11-proto/videoproto )
+	xinerama? ( x11-proto/xineramaproto )"
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
+	xv? ( X )
+	xinerama? ( X )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-ffmpeg-git.patch \
+		"${FILESDIR}"/${P}-fix_dvb_crc_checking.patch
+
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ ${PV} == *9999* ]]; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable altivec) \
+		$(use_enable vis) \
+		--disable-optimizations \
+		$(use_enable mmap) \
+		$(use_enable oss) \
+		$(use_enable aalib) \
+		$(use_enable directfb) \
+		$(use_enable dxr3) \
+		$(use_enable fbcon fb) \
+		$(use_enable opengl) $(use_enable opengl glu) \
+		$(use_enable vidix) \
+		$(use_enable xinerama) \
+		$(use_enable xvmc) \
+		$(use_enable vdpau) \
+		$(use_enable dvb) \
+		--disable-gnomevfs \
+		$(use_enable samba) \
+		--disable-v4l $(use_enable v4l v4l2) $(use_enable v4l libv4l) \
+		$(use_enable vcd) \
+		$(use_enable vdr) \
+		$(use_enable bluray) \
+		$(use_enable a52 a52dec) \
+		$(use_enable aac faad) \
+		$(use_enable gtk gdkpixbuf) \
+		$(use_enable dts) \
+		$(use_enable mad) \
+		$(use_enable modplug) \
+		$(use_enable musepack) \
+		$(use_enable mng) \
+		$(use_enable real real-codecs) \
+		$(use_enable win32codecs w32dll) \
+		$(use_with truetype freetype) $(use_with truetype fontconfig) \
+		$(use_with X x) \
+		$(use_with alsa) \
+		--without-esound \
+		$(use_with fusion fusionsound) \
+		$(use_with jack) \
+		$(use_with pulseaudio) \
+		$(use_with libcaca caca) \
+		$(use_with sdl) \
+		$(use_with xcb) \
+		--with-xv-path=/usr/$(get_libdir) \
+		$(use_with imagemagick) \
+		--with-external-dvdnav \
+		$(use_with flac libflac) \
+		$(use_with speex) \
+		$(use_with theora) \
+		$(use_with vorbis) \
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
+		--with-w32-path=${win32dir} \
+		$(use_with wavpack)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		htmldir="/usr/share/doc/${PF}/html" \
+		install
+
+	rm -f \
+		"${ED}"usr/lib*/libxine*.la \
+		"${ED}"usr/share/doc/${PF}/COPYING
+}