4 files changed, 66 insertions, 18 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index a0e5be4ecdfb..6d3d16134043 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.127 2012/03/30 18:56:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.128 2012/03/31 12:06:00 scarabeus Exp $
+
+  31 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/xbmc-11.0-ffmpeg-0.10.2.patch, xbmc-11.0.ebuild, xbmc-9999.ebuild:
+  Add also the 3rd patch from libav bug#406215 that fixes the latest api include
+  issues.
 
   30 Mar 2012; Mike Frysinger <vapier@gentoo.org> xbmc-11.0.ebuild,
   +files/xbmc-11.0-ffmpeg.patch, +files/xbmc-11.0-libav.patch:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index dbd59c2c4858..8a499ad53282 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,30 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xbmc-11.0-ffmpeg-0.10.2.patch 1197 RMD160 58baba2480df84e9cc5e768c3bc95f03077cc78f SHA1 255abd76ebf718f23b621e0c119b494af5a9f328 SHA256 84e2a842c81c1bc6a346c946301f38e47862051f4e3f56ffe468852542ba9b90
 AUX xbmc-11.0-ffmpeg.patch 1566 RMD160 f6b966309a67a1ab4fc6917a9310c15921ced5a4 SHA1 0a34899915ce61a28bfe869be75625cd1344da77 SHA256 5515321c4cb46b0ac1c959b9e8752c370344352d9f7de1be3991760fa6ffc70f
 AUX xbmc-11.0-libav.patch 3636 RMD160 2324951f7f04b22b7afd6b2e12b15ddba38a8cea SHA1 7ba00ad27670691aec13436bba6a77a488dd88af SHA256 b30f3c16595f9d79fe4f091504ae9d1f7b01042c988394e89ec467583d1e371d
 AUX xbmc-11.0-no-exec-stack.patch 807 RMD160 c42590cf3dd2fb3407e6dd518ba706ea8919d586 SHA1 c50207ff50cb1cedc97a7de1484a98fdebf51c5e SHA256 e36c83746838dd362512a046dc066c0f3fdc1252289b2761be381f84262cab78
 AUX xbmc-9999-no-arm-flags.patch 542 RMD160 108586f2956cc27cc9f3c582565bd4e2f22fede0 SHA1 e6dc2f2b63e208fccb0c1ecb50322d6a9c9fda88 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84
 AUX xbmc-9999-nomythtv.patch 6190 RMD160 829dff4b58098ee0935aed6fcda345e06abdb7b3 SHA1 d34afef9342b1d5781729433795cb23240fa5d6b SHA256 ffb1eb49f94b4ae41e5d79172499671915122a58af248b0585ee276e4aa2c87e
 DIST xbmc-11.0.tar.gz 63012044 RMD160 23cf4d7fa11d2996cc45c44ba5ca0022ff2acc1d SHA1 d836a0a1e8ed239a339ec7e0c19f893e29df741d SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19
-EBUILD xbmc-11.0.ebuild 6043 RMD160 7813b7b94f71212884ccdf4e0db94bd1d0383b72 SHA1 d3fa531b082d8dd65d14bb38b1508b439588436c SHA256 d6665155ab0c95917e3e0e34df5b689bf502da80b93b1dd91ace2e3faa7dbc9e
+EBUILD xbmc-11.0.ebuild 6107 RMD160 214c4740d17e810269314a7f3429d198387b59f1 SHA1 793f198e2092579e215cf6d03dc913b2e685b7fd SHA256 e4e4ad9b931deea56ee3ea404feefa95a87f75c5a05eec80f673feefee71ca2c
 EBUILD xbmc-9999.ebuild 5885 RMD160 66f8c9dee573b14675266915b27a3ebf4f3069ee SHA1 5db9622800507153e306836e1b7f8c0a0594cec8 SHA256 290d289e5102559445d3d1d093140f619316d74fc916f54adf0afb4244c6a901
-MISC ChangeLog 20687 RMD160 9632cad691744c74e83c0a9b3f47027e1dfc4447 SHA1 575e58a5ce5f10ca588000d2f554619d1f7c28c6 SHA256 c15e8d899ae6c1ed506432eb00607506a0f05ddd11c976294654107060bcbc56
+MISC ChangeLog 20913 RMD160 d330797e75daa4d2106629382877367039b59036 SHA1 04c1b224fadf089a77cd7de01d8402cc6353b403 SHA256 2ddaa78322bc476c7ba57384a7e2d65ca61c61ca6e03a4ed8d1b73bf238435ce
 MISC metadata.xml 932 RMD160 fbedc1d562949001f2195a49f375d2e4a1fdc7ff SHA1 c102da84b6cd9160308943fc7cc7801aff691a46 SHA256 2f82a971dfec33d4958ee8977011928976c4aab5f4e03139be6a6245bf3eb62d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPdgHeAAoJELEHsLL7fEFWI6YP/3dqP1v2YyrBjr6XGfaYUM9w
-/x0CGcPPEVMivMMH7xSazvTZa0DkzOB8lthiaiCFqJUOhQoFsXg8JHEKVrJm4iPy
-RjyqwGaqLFPRjh7CFuFZH3iC8+p+/Zs1N5vItTWT5b09JQCv7aRpHn9D1QZcA8TW
-BlQM96zNZcItqniVq6docEiIv5aQRkcg0R7rMX2ijeUx5hUDPHuez2MM856Jfg2y
-GR33U3kGB9+Q8vO+Di4ut4nyNVFSUoPL/B+mt7mcIBdWxo602KQMk7F7hqH9xqgP
-Fym92qLqu9MgPYTRsJVSVHf0KAQOpt7aHvSOAD/Q9g7iNUwywKrPh2Nal/tnWEYg
-ryErPpFvmkgYMAVSYqXZwRa3SzardD/cgXjx69pqNh8S6CGTP50oWHkrymrQJmhB
-IeDD9tGyZPw/KZRcpzp3sHKlyiiVLZ7ncfVDwnwixZevweXdRyHuPkQ8sibzEZnX
-pTb1f169gHQ+kEYEZIyKgn9WtKOmUW6HHHt9YdzUYG6ex8/kBzpvgaTGCS8Ds0hP
-UIoKHbD6JE5aE2N1K6tJRouhbWg7IWPoHY4sbY0skSaJcil5U3yLQp/l23oiB/Rn
-Dkdo5U9DswggGHmMTzAIUlLq72zKB88LHNGr987SEk0RXjC7jKbm/Rh0wScCywwZ
-AsUh10tQdqVUsZPPnRqX
-=ww5J
+iQIcBAEBAgAGBQJPdvM7AAoJEOSiRoyO7jvoT4IP+wbg9Q/sQVgGT1E2WCO8R6P/
+yu+Am9hs0ShIh+wuBrizEGmcFAe4n2oAWUL1sbtaYqsYGo3jgGcIFZoomU4imXR5
+5iF0OZUdcRXiRPIvS7/keIGAHaOcc+ehlgXZpOigv61YoXn5UPyBD/2DQ9IDYCwe
+XFDXh78+QnEPeBfekmuciWSuh+g2CbCUC/vhDKVaI6DqYwdFp6zvcjSMytzw8+h9
+1ggV4hnQH2wc6HZkUJYyWdqg1V5iDs9SzfecmikGpCWLKBazmjftJK7GWXcV3Muk
+iX2CgjW6V92lA3kCzxIeThLU1/Lu1XqzHofcGoPVw4Rmyv9GZjuC+wBkfuOmyTO1
+ihjmUzkg4kGcZGHwzx0aceFgmthC2yg5tRpHovJC4q5z5o8q6sf5vJepwep8Q8hv
+QobX5iOPA17+qGMpc8tw3aeqzDxr8eMprlUJ5Wb9VgpKwwpdbd8FS3pvKq2npUGm
+0hGViYMhzj6peXG+X/5VdkdWiEgAAY5wVqI25GEb/6ygUSDVJDrCDQIrskZwYFoX
+0SNtXFMP48NXr0ZB3chO3tcngdofpTR0uPCvVBH2Ao5/jd5G3eSCh/m5zj8NhHik
+kariXiGdP5Q8q+F4nIoG9GLdfkcMYUgMUSOMd2IUnB4jGCR69Ots2OST6RmmkFhb
+2Tte+KGC3smBAoFNlNZI
+=2fop
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-11.0-ffmpeg-0.10.2.patch b/media-tv/xbmc/files/xbmc-11.0-ffmpeg-0.10.2.patch
new file mode 100644
index 000000000000..b6a2d731dc13
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-11.0-ffmpeg-0.10.2.patch
@@ -0,0 +1,41 @@
+From 4d74bd14c0fa158c5a2bcf18192f418fafc3a053 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <tchvatal@suse.cz>
+Date: Fri, 23 Mar 2012 11:59:02 +0100
+Subject: [PATCH 1/2] Add support for new ffmpeg-10/11 api.
+
+---
+ configure.in    |    3 +++
+ lib/DllAvUtil.h |    3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index bca9239..bea66ac 100755
+--- a/configure.in
++++ b/configure.in
+@@ -1225,6 +1225,9 @@ if test "$use_external_ffmpeg" = "yes"; then
+   # old FFmpeg have this in libavcodec/opt.h instead:
+   AC_CHECK_HEADERS([libavutil/opt.h])
+ 
++  # new FFmpeg have math headers
++  AC_CHECK_HEADERS([libavutil/mathematics.h],,)
++
+   # We'll support the use of rgb2rgb.h if it exists.
+   AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,)
+   AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,)
+diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h
+index e882cac..e3b8a02 100644
+--- a/lib/DllAvUtil.h
++++ b/lib/DllAvUtil.h
+@@ -59,6 +59,9 @@ extern "C" {
+   #else
+     #include <ffmpeg/mem.h>
+   #endif
++  #if (defined HAVE_LIBAVUTIL_MATHEMATICS_H)
++    #include <libavutil/mathematics.h>
++  #endif
+ #else
+   #include "libavutil/avutil.h"
+   #include "libavutil/crc.h"
+-- 
+1.7.3.4
+
diff --git a/media-tv/xbmc/xbmc-11.0.ebuild b/media-tv/xbmc/xbmc-11.0.ebuild
index ed1a893ce7bc..490e07ae44df 100644
--- a/media-tv/xbmc/xbmc-11.0.ebuild
+++ b/media-tv/xbmc/xbmc-11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.3 2012/03/30 18:56:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.4 2012/03/31 12:06:00 scarabeus Exp $
 
 EAPI="4"
 
@@ -124,6 +124,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
 	epatch "${FILESDIR}"/${PN}-11.0-no-exec-stack.patch
+	epatch "${FILESDIR}"/${PN}-11.0-ffmpeg-0.10.2.patch #406215
 	epatch "${FILESDIR}"/${PN}-11.0-libav.patch #406215
 	epatch "${FILESDIR}"/${PN}-11.0-ffmpeg.patch #406215
 	# The mythtv patch touches configure.ac, so force a regen