Backport some FFmpeg related fixes from master.

Fixes bugs #466718, #463588 and should improve libav compatibility.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 277 insertions, 5 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index dede33893a7f..4192cb9ad4bd 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.184 2013/05/24 14:05:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.185 2013/06/13 22:47:47 aballier Exp $
+
+*xbmc-12.2-r1 (13 Jun 2013)
+
+  13 Jun 2013; Alexis Ballier <aballier@gentoo.org> +xbmc-12.2-r1.ebuild:
+  Backport some FFmpeg related fixes from master.
+  Fixes bugs #466718, #463588 and should improve libav compatibility.
 
   24 May 2013; Alexis Ballier <aballier@gentoo.org> xbmc-9999.ebuild:
   Fix ffmpeg deps: upstream recommends ffmpeg so this one shall come first in
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 9d300a62ae80..e5f2c2976245 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -21,19 +21,21 @@ DIST xbmc-12.0.tar.gz 67176825 SHA256 53018cd014b5203df5e5ef4080931ef499d3740815
 DIST xbmc-12.1.tar.gz 67430677 SHA256 29e3f36e1884913088f786179a4c925f52e46e9ba7bf8f24e35e934177c01ec3 SHA512 a8b5194766e32e09fa65c0e3656ff180c15761ce2348dc8a1fff0c65247b47e644db4fc91a829e73907b6a52c8e1bdebf624640b9dd06cea2c46bda1d2b3b4a5 WHIRLPOOL 13dbaf040faaaef1b04da892949e9684d7a958cec286b3a5f8cb449ec0fea6b5f96c2a473ece840b86103eb03dd1f39dd66411e5b0526785256d2cc92e1e95e8
 DIST xbmc-12.2.tar.gz 67663000 SHA256 b2330634fc513d27a44b131bbbe4ca6b61d60a1fe6c7ca27a7dc749df0bcea1c SHA512 d6812886b4d1a5c28c8150b164d714f8855ccb1ac4e74811c9eb03d09e12a6f05bedd3c034132ae79e0bff66efd54ced9c2c1140da6b4ad7b82dbb90fa3d1c39 WHIRLPOOL c3fc97e5f45a38a259bca06af0b171630ac16832034410e45174d900358b1d16b72940b29475dcad72a2198d8722859a229152379ab7784a7d61f961eb261ddb
 DIST xbmc-9999-20130413-generated-addons.tar.xz 53088 SHA256 20f752b240f2fd9f0f5b061d576c9d215d494bdaeee0d6118a413b2cf62567bc SHA512 203d1e143f83c03f5700710167b050d09d0d7996b8499d47f886009a801bab9eb2ae67ab612b551a9d2e541fc622e08a21f91df4206b3dd456f2b2bc12d514c3 WHIRLPOOL 92470a764ddd55cc2ea242b7b7df2a15c40fd6b273c30510624ef11a7b7870418956b3ad0df0853334053e50c4b141e00969f8458a9bd13aaf9dfeb3f79902a6
+DIST xbmc_backports-12-1.tar.bz2 5010 SHA256 a222c32f5a4a0a8690b1544674cfbfeddf81943e85b6ea716768b83c9eba5fa8 SHA512 19b29808f7a3a7b0642f8463bdd229041588d2f42952fe55a17ab69b5b259cde249eb763598893463218d0ab6c747bf3c81e045bdbf5655f9f5f2d2067cb35d2 WHIRLPOOL cc6870dabca8b53a1a6055a4218a8f9bbb2c031ab3b928040325fb121ea75ae6db431542660d28c3bc6900a904e2c0949d69651b2f63faffe8bc7f670d519f06
 EBUILD xbmc-11.0-r1.ebuild 6507 SHA256 8a061777222215b70be0e356744a733da97bff974afa311c945b33c46938cfc9 SHA512 118a994f758de41de5c1e294d4982750db0e55e15388d219a8bb0b5d703b7662910028effc002eb6923e5c2e8b4a65583ba03974e92b7f5f351d689ab729c65f WHIRLPOOL 198d13ab2449bcb49fcc8ffa3975a340af3ee97d1a9d0e2848977e4fd5809f56c84355b905dbc0fdb433cfa71c4b9f828ffd3fe5a9c06f70685e90d15418a878
 EBUILD xbmc-11.0.ebuild 6295 SHA256 5a700f39848da84db6e79eed1a316dbec2cea01252ae412f2219f63b653e8c71 SHA512 02fd0286655573965dc9204d1580d69dce5a9beef049a92ad10d619e39ef9ad07524b4172503626a442c8f4969200e4e9587b31e776fc5ca8a2b3f2596a11b12 WHIRLPOOL 1b03964b773587217dea06243a2c4b9f459e7deb3f6efbaed17ae8fa0b80e0f83e286b03d97a4ac2f19fce5df7bb609232a38f6c7366183c42165013ed7f08d6
 EBUILD xbmc-12.0.ebuild 6481 SHA256 b232410feb0c2715dc2b2e9ad9204f1e1f09a9237c0cc57b9a2f23f8a9e2b8d3 SHA512 65a1cac4a88b806ecc327cfec1ac3ef90dc73868a82c8ace3a47fcf5eb2b61f125d317646c096b671bc88f7814e08231ace11312e74e595a8c421696bd1982c3 WHIRLPOOL da70651c655c64ca82895236d11e1ae4462cce62809ab0338364b142bcd03c42c6d244c75591df381cc93bc9809d44b6f5f6a9a518fd52e150d4c520a21d2622
 EBUILD xbmc-12.1-r1.ebuild 7075 SHA256 34a0c48fca3eadf20e15fc8b83495c9b3c4ee3672125cf00cf2ec721e1d625b5 SHA512 4b5a51e09e97aac67985588d2fa44891f3d409bff554ce9e80c9083a2fbe1b564a8652fedd4c8553c427894e58e4b30bac33236b3d396cf49eb290ffcb26f627 WHIRLPOOL 6cef003efd1e1cecd1ffc6366c0f123ba5c8fb58b8f8f738678fbbc3fcfb7b76be22a6ef9e0289afb8d900f84770cf4d588147b3fda05423f15fc9f0e6ac226f
 EBUILD xbmc-12.1.ebuild 6868 SHA256 9f0c53b808bfdcce7f89e31ec66c520ea5f4163068c8f526de0c44ee3b4ce1e9 SHA512 3d4ad64cdc2c4b19923e9143caf9210d9377c26af4e7bf6a1b22dfc660320ed2493c4617ea7122ef1c84b5d875240458f3d332ae58a649141e64b3571f4d4f99 WHIRLPOOL 6009890ca8b44e18f0348399639734752fe22aaa09d702c4f0c4da14ffb9d8a99828404fcf10f7913052af56c8f5bcbe60490bc060a3a63e71d7ef64a2e5f08f
+EBUILD xbmc-12.2-r1.ebuild 7154 SHA256 3f007accc435edf6d44117158eb05e1ad32713974a33f35702fdd4247d77d638 SHA512 51b13f0b3d3bd5f4fbe62abf11b42e009fba82391410aa6e7f2ce316f12a61256f4f61ea231bc33f2aadace9c864589b0b14d141a100f0fe93d980ed07acb013 WHIRLPOOL cbe92219fbe94d47c915f4459f83450e04b989c5817dfff350b1c6c936559ad692d5e9641bf8876707bcdc1ec3152d401355b50c8bd499e5a44bd537d218ecbe
 EBUILD xbmc-12.2.ebuild 6913 SHA256 e87201fd81099970a2c700425b679ccae94643120a39398018dac2f531a63845 SHA512 e2cacdfbb00219c00c90bd85f17e53e4f82c2514d455908afefb72d9c646a239d61a2a9446d7d88b3db92fdbbad10226dff0c5d55d71da495b8c25e60c7be40d WHIRLPOOL b43c29da1e353157c623867cb19d45e135e775b78638e5640f5d9aa9a774222cd3b4cbc70ded5c6c928743d1b2f326828832d109af55a55439e5f620c3177a67
 EBUILD xbmc-9999.ebuild 8322 SHA256 843049a3fecd2c9b1ab7c66d9f4c8c8f67f85351f30d5bd3d90ca22d15257099 SHA512 301772fc0c82c18a6539e6d5bb0e5b54fba46dca563cc38258f1af6f01e9da96c71ceafbf13e0f63c3b610e0072fb2adf476529067dfa88085e5b0fa49449c6b WHIRLPOOL 5dfab91f2edcd2e9e16ec5e9fb3b225016388c134a1d09ca5a055f3170a643efb64227c58ab01f886a33ad34ccded47a59cc589cd1807499df3aed35d9529b57
-MISC ChangeLog 30307 SHA256 cbb8af2d35a476521415c3d74c6882a3244061806fb524bb5be4d4e9fcb0203f SHA512 6ba6a33d1338bc249b16882061432b39b2e8ff20a7e2865cc4f226d41956a9aa3a486eec2a9a485ac87a879199dbc964a43a9c12ab8d57ba457ecc5ca3a0e654 WHIRLPOOL 6bd40efda2c85226193d2f490267620aef5936ac15990efaf90e0caec720368bf0115e62eb79a440c2e5f28de41e9859903548950b1245c72ca0a80a417984a6
+MISC ChangeLog 30531 SHA256 f1361dacd823bf8136129d13860a643fe813b32be017d4922d1bf2d8fdac10d1 SHA512 cef775541ca4f0cab841e4989d272cab6c28eedac682c04bfed79fde757d8d7cbb521c7ba22daff7104c02563c410acbc4ee9620ee7d2ef79b746c1aabfa8fe3 WHIRLPOOL 48c12d9b0023d61a8643f95fd4ed4be482232c5197148b21b1912da560e8453f2ff1c10ce27b82c8ae2f6c73ebc67561c4570cc891359e6aeb8d3dcf835c9dc5
 MISC metadata.xml 1140 SHA256 00929104e646c293b0ee5dc8a42701b940a0e908f7293c15a277ce138a56999a SHA512 e6a4b148543b613ffad57925310bc7562629e18f726cc958bf2de64020b0ec3d72cf82eb2e506a194c1c3610361d96ff41245d1e7a411be08f87719abbb80410 WHIRLPOOL 92f8748f2fedb7fe0bd34ed29e4e4ff25cb55b7ceacc15a9a4c561c3544530d216d5494de1862591156f3290e641a38aa91000c2b33e850d8a923e1818eb5ac1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGfc8QACgkQvFcC4BYPU0psqgCgmOnGCV3rKbw6sXC7qyNYkDPS
-lfYAn2MGAwIYCdfss8DSOcS6ypb25AUM
-=0KJY
+iEYEAREIAAYFAlG6TBQACgkQvFcC4BYPU0rKWACgmkS8YUPOqJcMIxDtuSMFJn8x
+6P8AoIfEjc2zfP1lELwJaaVR0DHU9fhy
+=JAkG
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-12.2-r1.ebuild b/media-tv/xbmc/xbmc-12.2-r1.ebuild
new file mode 100644
index 000000000000..4ccc15228e00
--- /dev/null
+++ b/media-tv/xbmc/xbmc-12.2-r1.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.2-r1.ebuild,v 1.1 2013/06/13 22:47:47 aballier Exp $
+
+EAPI=5
+
+# Does not work with py3 here
+# It might work with py:2.5 but I didn't test that
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1 multiprocessing autotools
+
+BACKPORTS_VERSION=1
+
+case ${PV} in
+9999)
+	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+	inherit git-2
+	SRC_URI="!java? ( mirror://gentoo/${P}-20121224-generated-addons.tar.xz )"
+	;;
+*_alpha*|*_beta*|*_rc*)
+	MY_PV="Frodo_${PV#*_}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	;;
+*)
+	MY_P=${P/_/-*_}
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
+		mirror://gentoo/${PN}_backports-12-${BACKPORTS_VERSION}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	;;
+esac
+
+DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://xbmc.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug gles goom java joystick midi mysql neon nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl sse sse2 sftp udev upnp +usb vaapi vdpau webserver +X +xrandr"
+REQUIRED_USE="
+	pvr? ( mysql )
+	rsxs? ( X )
+	X? ( sdl )
+	xrandr? ( X )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/zip
+	app-i18n/enca
+	airplay? ( app-pda/libplist )
+	dev-libs/boost
+	dev-libs/fribidi
+	dev-libs/libcdio[-minimal]
+	cec? ( >=dev-libs/libcec-2.1 )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	dev-libs/yajl
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	media-libs/alsa-lib
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-1.5.6
+	media-libs/jasper
+	media-libs/jbigkit
+	>=media-libs/libass-0.9.7
+	bluray? ( media-libs/libbluray )
+	css? ( media-libs/libdvdcss )
+	media-libs/libmad
+	media-libs/libmodplug
+	media-libs/libmpeg2
+	media-libs/libogg
+	media-libs/libpng
+	projectm? ( media-libs/libprojectm )
+	media-libs/libsamplerate
+	sdl? ( media-libs/libsdl[audio,opengl,video,X] )
+	alsa? ( media-libs/libsdl[alsa] )
+	>=media-libs/taglib-1.8
+	media-libs/libvorbis
+	sdl? (
+		media-libs/sdl-gfx
+		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
+		media-libs/sdl-mixer
+		media-libs/sdl-sound
+	)
+	media-libs/tiff
+	pulseaudio? ( media-sound/pulseaudio )
+	media-sound/wavpack
+	|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
+	>=virtual/ffmpeg-0.6[encode]
+	rtmp? ( media-video/rtmpdump )
+	avahi? ( net-dns/avahi )
+	nfs? ( net-fs/libnfs )
+	webserver? ( net-libs/libmicrohttpd[messages] )
+	sftp? ( net-libs/libssh )
+	net-misc/curl
+	samba? ( >=net-fs/samba-3.4.6[smbclient] )
+	bluetooth? ( net-wireless/bluez )
+	sys-apps/dbus
+	caps? ( sys-libs/libcap )
+	sys-libs/zlib
+	virtual/jpeg
+	usb? ( virtual/libusb )
+	mysql? ( virtual/mysql )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gles? ( virtual/opengl )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+		virtual/ffmpeg[vdpau]
+	)
+	X? (
+		x11-apps/xdpyinfo
+		x11-apps/mesa-progs
+		x11-libs/libXinerama
+		xrandr? ( x11-libs/libXrandr )
+		x11-libs/libXrender
+	)"
+RDEPEND="${COMMON_DEPEND}
+	udev? (	sys-fs/udisks:0 sys-power/upower )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-util/gperf
+	X? ( x11-proto/xineramaproto )
+	dev-util/cmake
+	x86? ( dev-lang/nasm )
+	java? ( virtual/jre )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
+	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+	epatch "${FILESDIR}"/${PN}-12.0-system-projectm.patch
+	# Backported fixes
+	EPATCH_MULTI_MSG="Applying patches backported from master..." \
+		EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/${PN}_backports"
+	# The mythtv patch touches configure.ac, so force a regen
+	rm -f configure
+
+	# some dirs ship generated autotools, some dont
+	multijob_init
+	local d
+	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
+		[[ -e ${d} ]] && continue
+		pushd ${d/%configure/.} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
+		multijob_child_init eautoreconf
+		popd >/dev/null
+	done
+	multijob_finish
+	elibtoolize
+
+	# Disable internal func checks as our USE/DEPEND
+	# stuff handles this just fine already #408395
+	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
+
+	local squish #290564
+	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
+	use sse && squish="-DSQUISH_USE_SSE=1 -msse"
+	use sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
+	sed -i \
+		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
+		-e "1iCXXFLAGS += ${squish}" \
+		lib/libsquish/Makefile.in || die
+
+	# Fix XBMC's final version string showing as "exported"
+	# instead of the SVN revision number.
+	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	epatch_user #293109
+
+	# Tweak autotool timestamps to avoid regeneration
+	find . -type f -print0 | xargs -0 touch -r configure
+}
+
+src_configure() {
+	# Disable documentation generation
+	export ac_cv_path_LATEX=no
+	# Avoid help2man
+	export HELP2MAN=$(type -P help2man || echo true)
+	# No configure flage for this #403561
+	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
+	# Requiring java is asine #434662
+	export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-ccache \
+		--disable-optimizations \
+		--enable-external-libraries \
+		--enable-gl \
+		$(use_enable airplay) \
+		$(use_enable avahi) \
+		$(use_enable bluray libbluray) \
+		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
+		$(use_enable css dvdcss) \
+		$(use_enable debug) \
+		$(use_enable gles) \
+		$(use_enable goom) \
+		--disable-hal \
+		$(use_enable joystick) \
+		$(use_enable midi mid) \
+		$(use_enable mysql) \
+		$(use_enable neon) \
+		$(use_enable nfs) \
+		$(use_enable opengl gl) \
+		$(use_enable profile profiling) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable pvr mythtv) \
+		$(use_enable rsxs) \
+		$(use_enable rtmp) \
+		$(use_enable samba) \
+		$(use_enable sdl) \
+		$(use_enable sftp ssh) \
+		$(use_enable usb libusb) \
+		$(use_enable upnp) \
+		$(use_enable vaapi) \
+		$(use_enable vdpau) \
+		$(use_enable webserver) \
+		$(use_enable X x11) \
+		$(use_enable xrandr)
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
+
+	domenu tools/Linux/xbmc.desktop
+	newicon tools/Linux/xbmc-48x48.png xbmc.png
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
+}
+
+pkg_postinst() {
+	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
+}