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

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 244 insertions, 9 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/Manifest b/media-libs/xine-lib/Manifest
index 3c458a7efc08..82649394b6e3 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -6,6 +6,7 @@ AUX xine-lib-1.1.19-xvmc.patch 485 RMD160 781a7fbc5dcc9f3c25de83625509fcce3950cc
 AUX xine-lib-1.1.20-stat.patch 607 RMD160 3a099a94d3c1be1241e352d58ba7436431497d78 SHA1 0dc10729d00e716e4eb4a94b3f4f640c95fba726 SHA256 cfeb7d18ed8893644cc4aa717adcd163c328df2e86e7e66060e2d71823ee9ae5
 AUX xine-lib-1.2.0-zlib-1.2.5.2.patch 1034 RMD160 dae450b4ab481a68ab075cdf59f69bb261f8ccbb SHA1 3d539b0e76976df1157c75d0ead121765e7a81cc SHA256 6e23d9b5f9bc97840995dcfbc2f8537726cee31f127774c186a15dd349b75553
 AUX xine-lib-1.2.1-ffmpeg-git.patch 2314 RMD160 28f004b6e231034b28eed95368668451c29b093c SHA1 179558f72566574e52f3a79231aac25968f18ff0 SHA256 896d2d050a370944b098b82208a41871d11716bc92242b5639e5a9b45cc138a0
+AUX xine-lib-1.2.1-fix_dvb_crc_checking.patch 634 RMD160 d6a54d7db42b21a944968b03738b028179d38888 SHA1 2c788361b1ebf6e643313f1912e574847d719d05 SHA256 6c0695a9ac6fb5b7bfbe6940847ae96f8e9836c55a2a1409e20faba13b6ba465
 DIST xine-lib-1.1.15-textrel-fix.patch 29373 RMD160 4702a26f42251614f5f6c99b4770f82da36577ae SHA1 e04d04dbd736fd17be8cf0583d47630850a89bf9 SHA256 1d6aa047cb0a13f248aea2e06e16b9758b9c39d8b7e42b32d0b52b424d26b33e
 DIST xine-lib-1.1.19.tar.xz 5782580 RMD160 7b8c2a4e5bcd0984414360d8d589aa533a9040f3 SHA1 f65f762d2e16adf04b9d715c91ee0bc02c322a7d SHA256 f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9
 DIST xine-lib-1.1.20.tar.xz 5957256 RMD160 039a7d0ee4e65ce20755d4abbfbf9af6e17a37c5 SHA1 1dbd48e14113739101429391d45f65ebbf6519fc SHA256 da65da5831f5b93f02b4ec10049eaf044cf99944e2fd8e12d494dccefee124eb
@@ -15,18 +16,19 @@ EBUILD xine-lib-1.1.19.ebuild 5675 RMD160 b34cf5a8030843ba98e7a90200e4c5e1518153
 EBUILD xine-lib-1.1.20.ebuild 5416 RMD160 02b70183bbda2d03ec3fe742a19d0cae72049c90 SHA1 8a155af17311149aa0f4496dee7c4432848d22df SHA256 4b611a4b8ac09dac6273ba5f3ee64ffd46792afce55ad0192993a00ac3a589d0
 EBUILD xine-lib-1.2.0-r1.ebuild 5163 RMD160 f3ffd8fbd6285a10b217f32c5a718993ccef686a SHA1 9eb4e3cc4c8b82f730dc1a915f1dac50493b5e5f SHA256 401242cc5ea582fcb36f4e93b30997ba5429cfb313287156fe2555142ef2f55b
 EBUILD xine-lib-1.2.0-r2.ebuild 5227 RMD160 97797d790352e13d542c3e7379896e75a00f7fde SHA1 5e03fbe022ccf7ab988012e0d44bb75a2e654647 SHA256 86c8dc936076cced174bed75a61254a35455210b231e88eec01889cc6e627261
+EBUILD xine-lib-1.2.1-r1.ebuild 5269 RMD160 a8f44bda7ca12a4248615d5493beb279e1709784 SHA1 b20253a62da74005c1739f77951edb1c0b496ee0 SHA256 1f031694fdf059ce94c8b799deb2a8b9cb1a98e2d267e1d42d4c2d3c729c40c9
 EBUILD xine-lib-1.2.1.ebuild 5206 RMD160 a92afe8d027f4c1fec4a462844a10fa7689232bf SHA1 debd3e74df0a18471324eaab80022ef769298cd0 SHA256 7e8b77ab2815a8030929b997cfcdf2b7890da966f154c0622c0d1be66416fa8b
 EBUILD xine-lib-1.2.9999.ebuild 5163 RMD160 fd641aafdc8fee17b49d54d77f98eee4fbb1df08 SHA1 ce66a4a34f4c784bc88524ce337231f2a5f4ebeb SHA256 abfb6935a743bbeb79cf54819ce4c101776cf6fea0dc20983e162b6d8acecb5c
-MISC ChangeLog 78268 RMD160 2e83b7f18267e975478f72dbb75c3a12821ca49f SHA1 1771a5265850bbd98a666e2ac7b4e722f555df3f SHA256 1afcf5aba61e6f8e02d37374fffd23ad31980b086b8a46c3e6c258101d049641
+MISC ChangeLog 78503 RMD160 fcd25e97dd8348b93f30681b4206179258f8a1e5 SHA1 82edf22e06210ba25196babf08732a2827557940 SHA256 3d5acfc74cbcca825b1dc72a4a669a2e6bf34b153833bb60829ccf798cb4ba25
 MISC metadata.xml 3072 RMD160 1e12a6a6a26545534c9a77ee57a04c3df6613772 SHA1 c0f3e790048f732dedb7de2478a1de54f327a2b7 SHA256 40718f6753a8cdbb8492ca71d3c335106fa7fe54cb4f6161ad1023ef8323af1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPTgsMAAoJEEdUh39IaPFNpBUH/jUxUXMoJCiYAvRaSnC+DsCu
-nz3SYnqFnf0k5lgRLGu2+MHHYex4949Icz0qokX7wfVodAqV1dZ7OBJcvATe+b+C
-VYH8jX7n5KCK7dxaMJO9gRwJLiYkN5dAdOucNaJX4Jhsm3jiTTftmR5JXaa41LDZ
-bfb4LjllmE/NkneeQU92Z60DUabmzsX+12Ei40Ysy9lnLsuCZZUCenfdvdQSgMQo
-SK94ODFjqnMS/+PuxGCDypZ0EKxoj2C21I6cTSuVd8JAwXMwBdApRVwuHAu891lt
-TmMaeWK07AiFD//VkEk/TuyE4x6Ify80KUUk5i7orOhDETCiPuQhNxyWEBIWjTI=
-=dUFc
+iQEcBAEBAgAGBQJPV00vAAoJEEdUh39IaPFNIsUH/3qKpOKXc7p162/4iOapFJfm
+3kY/aXpH8uRxZJhTh+H1FxQdi5E79afHbYF1tTDi/GYOD+hXWx+kJvJWmmkV0IxX
+0bMsKg76NxrJ4zogd7S7pyWe4xgkW/7iyv1jtimJcWvQ1ibdM9Fz/RuTs1QGBu9G
+K6jNmIk2u7V0K4qeEf7lSicnADhVDAszMUNCCw/YQ98zpoqa2cuJ7nzRlWFtECpg
+KIPDTluVAT++R8vU4WQwepXL/8ZiH01UyW25OLBcsu6w9UjvhNDSa8JKdeZPfTsV
+fxs3EQi/7TTr7NXCLfiEbzsFrQQgh7/oZ1NSWeZQ2rIAYGT5UFB4xgajkdE3YYQ=
+=7ihf
 -----END PGP SIGNATURE-----
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
+}