Backport a huge patchset from upstream master to be compatible with ffmpeg 0.10 up to current git master. Bug #438842. Rebase the libav patches on top of these changes, it seems they were sent upstream but not applied. Drop a now useless patch with this refactoring. Please CC me on bugs if these patches cause problems.

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

5 files changed, 74 insertions, 120 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 7ff8d3b20c63..1e52fe2e0166 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,14 @@
 # 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.150 2012/10/09 21:44:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.151 2012/10/24 22:36:12 aballier Exp $
+
+  24 Oct 2012; Alexis Ballier <aballier@gentoo.org> xbmc-11.0.ebuild,
+  -files/xbmc-11.0-ffmpeg.patch, files/xbmc-11.0-libav.patch:
+  Backport a huge patchset from upstream master to be compatible with ffmpeg
+  0.10 up to current git master. Bug #438842. Rebase the libav patches on top
+  of these changes, it seems they were sent upstream but not applied. Drop a
+  now useless patch with this refactoring. Please CC me on bugs if these
+  patches cause problems.
 
   09 Oct 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Skip running eautoreconf in libapetag & libid3tag #437368 by BT.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index f548279d2968..35afc1cb0ae2 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -2,32 +2,22 @@
 Hash: SHA256
 
 AUX xbmc-11.0-ffmpeg-0.10.2.patch 1197 SHA256 84e2a842c81c1bc6a346c946301f38e47862051f4e3f56ffe468852542ba9b90 SHA512 c7bf34086e27c8789177665a862464018082404f3947a2b9f799a34cae15a01760bc67a148de6da20036c9e17ca047fbd32ed4237980af16605ee2d306c9f9a4 WHIRLPOOL 67cfa7538f59fc1a3cb664218de64b8518a66a97fdc4cd42f43f4882240f665f5be4e448df01df623b538899320f86b7f2d94989fbdb8667289fc8ebdb7f67c7
-AUX xbmc-11.0-ffmpeg.patch 1566 SHA256 5515321c4cb46b0ac1c959b9e8752c370344352d9f7de1be3991760fa6ffc70f SHA512 c7ccba50e6f8fa8dd714ddf0cf1348c7311aefa9d9e971b0287757f75b51d8640d7e404940e12f7b53dbca3ce0bdc81c5b2913d6a73e2edd1ca7351b0a986fdb WHIRLPOOL 088d39196324112d2b133df19489427ca6e84fe7eaf410d9be5603601562019dd78427c4ff438814928c1e3db4c22d742824b6458ef15b79a46ea2c8b79f749d
-AUX xbmc-11.0-libav.patch 3636 SHA256 b30f3c16595f9d79fe4f091504ae9d1f7b01042c988394e89ec467583d1e371d SHA512 cb71c6601df413136eb80c61345d6123ed4c7c5b3c99346f32986cf177afe966ab56cee13b4aa8a91ed37150c73c6f2c891e7f7ba7c34935483e47b7fda525d4 WHIRLPOOL 3487e0d19c1fffba396b406e95f1a9ab85d2ae33c6ca3f88ab3e35ac170e670d0611529ede7a6568f96df73f2dd4b311f3ef5acfde75384166d2b9da0b17473a
+AUX xbmc-11.0-libav.patch 3436 SHA256 ad2dde73e0c9ed1f96c0c6aa4c3d80edadbb92c3092d3c1f34e28bab45983ecb SHA512 42a5fd80b76d31e1b0661d3bda15e3015b90852c53f37b50927ddd15484e9a7f02efbb685b92a48594425c74bfc82ac9a2f256c69530a483d10c4d3b81e7ad79 WHIRLPOOL e9b4c62f15aa706f32926a21406b4d845de9219edd35ff0996916317d0bfca21b8bef2c3452fc03253fa99e24a3a6f93862d6a44a18d51be9641ea927c5daea6
 AUX xbmc-11.0-no-arm-flags.patch 542 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84 SHA512 7d40be4bdef2a2b1e53f8b96c489a87ec67975ae486fb44e619d66c1b5333ad33f896f64cca4e1c8050c3d92cd6537a9ca776e743c88fc2c8cabea1eae62b4b5 WHIRLPOOL 7c6666198b7d987028925e0f578d71796f6541995aa87964de3275f6a087610ef69d630ac349500a7c534de213b8fbff4cca6c25c3d0e6f1b1d8cd89f27d3d9d
 AUX xbmc-11.0-no-exec-stack.patch 807 SHA256 e36c83746838dd362512a046dc066c0f3fdc1252289b2761be381f84262cab78 SHA512 d0d4c2d4bb257c722ec40470fb6c8da59033009152598e69133b6184b25da36debf42f86859389c878a072603f3d583e28a52519e8dca47d9bdf7edd5f9e44c5 WHIRLPOOL d18dd387fe55b18be78fdad08b0a4319c2a5ccd161f1dfc0d5ab8015d88c5842780415c903a098a4683524658fc31c07e285e61fcff04ad6e4777c77e5691f38
 AUX xbmc-11.0-nomythtv.patch 6190 SHA256 ffb1eb49f94b4ae41e5d79172499671915122a58af248b0585ee276e4aa2c87e SHA512 4a9ff4b4f5cb56c92932f05b5b812bee0fdce37ed9f568a6e0dc0cd62335e2131361a63d8026b64f9c7078fa9c4ef0e439b52234c722b1b854aeeed1cc2764c7 WHIRLPOOL ce457b509c6fd222ae6002420db7cc438e1352114f38790b623f04e6834eb5508d4609a1bf71628bfafde3bcef830e84b42448619c19227d5729d6d8a824a13c
 AUX xbmc-9999-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea77114b63d1a7929ddae96111017a2 SHA512 b958cf3ab4877dbae4e5bd1376e8b9bd82f0dab43b1695c1d85e0e8ff366ef278ff686fe6394a04b3d79e19f11d8c92689fc049d2874e3fc12c907e36e993064 WHIRLPOOL f322fa4db24ff6f3372bdadd3dba8fbd4aed5849dc676f8c63d654f2c83de2165e60b26af821647a46cfa5ff129e7e0cb7c39c5cddbc2e5d9ec675bb148b2d63
 AUX xbmc-9999-nomythtv.patch 1680 SHA256 fe0289d1361b0dde3c261bc082bcad123c9cc9a2b7398e4eb48773f976be93a2 SHA512 403389bb1bf1442be1a8d23106bd78dc672c66fcf588b6076e6105023a69a92ca58cdaa91c9e2664123f244c3d5f42a9de6f72845c702339e3f8a0e976330ca1 WHIRLPOOL dcf13b59133f2b7288bc734803ad1317d6e943f7cd85b0428ec257b2ec9fb6a23311fbdd8574dbfb985a473dac7cf8ca30c2ac6d59b62797adb1f63d8bcc0b12
+DIST xbmc-11.0-ffmpeg-1.0-compat-1.tar.bz2 32687 SHA256 bfdca8283c35d0062ed2c2b3f67da29dcd71bb3e0f6b06c1dcc2e43d35d7c427 SHA512 e28f69719ee9b7343c8f43f34b0ae932b66452507daf3876f10e78c79fc2edeee2569c8470c0a7519ff24a43bf2558fe6d9e08a3aca73123ef423447b90f6abf WHIRLPOOL e0caafa34d99f8cfd7908ee7755352f2972794cd7460b04ab207d4f55ec39cbf09a22c77fc954b269d09b232dcf0cb357d6a41568337df5ea97aae6ee0d6faa6
 DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
-EBUILD xbmc-11.0.ebuild 6230 SHA256 cc9c8e0f4cbc99f6b02b8385f8ef08c9d7fe128a619eb650d4a627f8f7bbd391 SHA512 8a08020a237c0147163c5a8c57f1d23c5a3c0fdc1571ab640b3096eff49d28da60efbf86d42fa8139c88b6e073a9f689715b366cad9092d71ee2646165e91bc0 WHIRLPOOL 7a64f09945fc96f319b7869450eb4c1e7f74646c6f89d3a51f7908d3f56c99f9b185863b992f6fca8c929d7a53d6fea465f9ec9cfc977d113b83f8378f9957fb
+EBUILD xbmc-11.0.ebuild 6439 SHA256 22a80793ef283c8d619f65e3b24f2d1f41cc83970cba224a2ad0b171abae7610 SHA512 61a2ae9b408e631167cdce1421636db96a1a2a98176677cfba0c24eb769d32a8c05b513b77d611f54fec7886161fb583a9ebd774cdfd18fa076aa5e01aacf545 WHIRLPOOL eccdbd4ea12d818f95d6b87071841ccabadf74502cb14f3972b61b418a3bb241274b697857e33b508061054821abc8789ba5eeb609673c5270af35a232131a52
 EBUILD xbmc-9999.ebuild 6035 SHA256 08d78ce4f9c5ca521c53eaed71d69eba1199f9412b877e9f987982cb4a0dca54 SHA512 171623a48c7ae8f4aaf3cfd9c938a328d1e82e4ebc31b8817b58a635e3adb086a89dc427a8f6e68c24755692e16e78f8392898ff1fd6eb2c2ce3a65d676b8662 WHIRLPOOL 2dd69e13e93a104ecdff9e64d351324b849a6b1b6758f6484eda2f4c4bcbd93dd433f0ff7a5a2ad664d9bb753483d1964c055c24d6b71636d448259ba1ea3322
-MISC ChangeLog 23906 SHA256 90272d1274952d3c7104d91258ea929bc3127733026835c41298736df76d3a0c SHA512 94f4d2c4d92338dd20c57708ad8a48275381cef325a17cf5fa70a3490e2e78b9f847924109c026cefd6d728ec4d0b7346eeaf4a38f6b9955b2c31b290306334c WHIRLPOOL ba8fa5ec9678fd5a6e09d644a847a871904a13ee156c24fb3b55f1ad1755c2e95be5f79b3c774feaffa4dd7445a9b8981afc89169221b94087bea7ec8a1050c4
+MISC ChangeLog 24372 SHA256 772784492c7d92e9fa17da382fba5c625226378f8588bfcddc0ab6f318e02055 SHA512 515f1ec903f2b1d38e7e9e883467d213f5f7e13945300fab478254334d8a9f0711954580b4f3f0b778b98fa5bb2647019cd04a0dffa19ef97deee5532ec3add0 WHIRLPOOL 2bb5b3c3b6d8aab06b6c3596bfccb420fc422c93e09b5c1ad8f23846901a29c569857d45d1aa70f914ab96d2fdc5ddd79bd3a01b31561d1bc7d5fa6513cb8a51
 MISC metadata.xml 1114 SHA256 65972016512588a4bcad7af03c77fd0a667e18cb5d2d6dcf05f2f0f1a62ff9c9 SHA512 a79f6c3f4aa6539a36e9b54f9f283828da8ccea0deb6eabda7d0186d8afd0b62e0c150ed9fdba0a8ce913d76843fffcdb0203c166d2d75a2ef702a5c0b63f06a WHIRLPOOL e5582d23318132bf6ee3dd6cc8e6a1aff2a08407b2eff203c9a8571fa5869e12055485b290c1d04e93a068df46e07a62aea873655135bb04c0335e9c63e81683
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQdJrcAAoJELEHsLL7fEFWNG0P/0HndL99vnqobWF3345o8BHk
-qWhpakzkElB4mHs9iHlP7UEMYmY1W1CDjSTx7jmR3XlaAkGxAe+UKocqSknRTve1
-NNN6BZJarSTwq2Zbj2gI0G4xNSNuzcZayewAYIGjAc/VOqkIUE0Vs7RtVLJfu/xA
-xu+w8eYklZXt42HPLMZ3riHo5Gqyvkai7t9r6B3q+XdeSBpEpmp73e2jscgZ2OTM
-WkqMfXcE4Lwc64uiyMIxYJW+YBtjmz0Dyv7wDWJ+KMXw+gcFPv99ypS/5HLwFttD
-lYrdS4p6SgqMjurAWQhuXo2uCqyxbB2T/rziZQcGzQOXVNIx9P8Uc7g251mwF3iA
-yQl5pkRjnoJV7YWKs5DqOwCftrHFCo/jJ/ilDpTNAZgV2oPgqIyipAFhkrWpYd2d
-WgTklq1PsVIgiWfAyhMTh116I5Nx4KS3P+HxH04dRC4Tcur595gYWjxnpzBYNzuh
-vwmKPfg8QPRBU1tL3Qdj/m6ejjd2E3PiVOSCNdYfh6UO6bC37wlBjUsFP+rrqGoP
-Ud0idOA/jxV3GY21k5HC3DDy/z5ZoQzTzs5htoaynagsXX6EQHhR2iXHVt7IJW83
-SIMEqoY/TjOKb1sT7tsMrfsw6LQIP0k46Fo+s5s30ImLX1E9OaZTu+9C+1RAvX7e
-IsgSsCOqTl4ZJZED4jYc
-=lrGf
+iEYEAREIAAYFAlCIbV0ACgkQvFcC4BYPU0pEqQCgncqY0EMrDh0408SsRpyQbUJK
+tDYAn0oKv92gHihhQy9KVgASHEwcHaMz
+=+q0j
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-11.0-ffmpeg.patch b/media-tv/xbmc/files/xbmc-11.0-ffmpeg.patch
deleted file mode 100644
index 51372fdc1db9..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-ffmpeg.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/406215
-
-From 97212837ec81c3869ba60e0690f26c09b9428747 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <tchvatal@suse.cz>
-Date: Fri, 30 Mar 2012 10:00:46 +0200
-Subject: [PATCH] Ensure we include proper header on ffmpeg.
-
----
- configure.in      |    3 +++
- lib/DllAvFilter.h |    6 +++++-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index bca9239..d209f80 100755
---- a/configure.in
-+++ b/configure.in
-@@ -1229,6 +1229,9 @@ if test "$use_external_ffmpeg" = "yes"; then
-   AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,)
-   AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,)
- 
-+  # check for avcodec header as it is not present on libav
-+  AC_CHECK_HEADERS([libavfilter/avcodec.h],,)
-+
-   # Check if AVFilterBufferRefVideoProps AVRational member is named
-   # 'pixel_aspect' or 'sample_aspect_ratio'.
-   AC_CHECK_MEMBER([AVFilterBufferRefVideoProps.sample_aspect_ratio],
-diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
-index 827746e..d47623b 100644
---- a/lib/DllAvFilter.h
-+++ b/lib/DllAvFilter.h
-@@ -48,7 +48,11 @@ extern "C" {
-   #endif
-   /* for av_vsrc_buffer_add_frame */
-   #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,8,0)
--    #include <libavfilter/vsrc_buffer.h>
-+    #if defined(HAVE_LIBAVFILTER_AVCODEC_H)
-+      #include <libavfilter/avcodec.h>
-+    #else
-+      #include <libavfilter/vsrc_buffer.h>
-+    #endif
-   #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-     int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
-                                  AVFrame *frame);
--- 
-1.7.3.4
-
diff --git a/media-tv/xbmc/files/xbmc-11.0-libav.patch b/media-tv/xbmc/files/xbmc-11.0-libav.patch
index 0aaa1ce41849..84a215a72684 100644
--- a/media-tv/xbmc/files/xbmc-11.0-libav.patch
+++ b/media-tv/xbmc/files/xbmc-11.0-libav.patch
@@ -1,3 +1,6 @@
+Patch rebased to current patches backported from upstream by Alexis Ballier.
+Based on the previous patch, submitted upstream but not merged it seems:
+
 https://bugs.gentoo.org/406215
 
 From c74abc298e2075f431d9fa700fcfc5e1bbbddf22 Mon Sep 17 00:00:00 2001
@@ -9,64 +12,60 @@ The libav use micro version as 0
 The ffmpeg use the micro version as 100+
 
 Simply check if the variable is defined then it is not libav.
----
- lib/DllAvFilter.h                                  |   10 +++++++++-
- .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp        |    4 ++++
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
-index 302e35c..827746e 100644
---- a/lib/DllAvFilter.h
-+++ b/lib/DllAvFilter.h
-@@ -48,7 +48,7 @@ extern "C" {
-   #endif
-   /* for av_vsrc_buffer_add_frame */
-   #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,8,0)
+Index: xbmc-11.0/lib/DllAvFilter.h
+===================================================================
+--- xbmc-11.0.orig/lib/DllAvFilter.h
++++ xbmc-11.0/lib/DllAvFilter.h
+@@ -45,7 +45,11 @@ extern "C" {
+   #if (defined HAVE_LIBAVFILTER_AVFILTER_H)
+     #include <libavfilter/avfiltergraph.h>
+     #include <libavfilter/buffersink.h>
 -    #include <libavfilter/avcodec.h>
-+    #include <libavfilter/vsrc_buffer.h>
-   #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-     int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
-                                  AVFrame *frame);
-@@ -83,7 +83,11 @@ public:
-   virtual int avfilter_poll_frame(AVFilterLink *link)=0;
-   virtual int avfilter_request_frame(AVFilterLink *link)=0;
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-+#if LIBAVFILTER_VERSION_MICRO
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
-+#else
++    #if LIBAVFILTER_VERSION_MICRO < 50 // Libav
++      #include <libavfilter/vsrc_buffer.h>
++    #else
++      #include <libavfilter/avcodec.h>
++    #endif
+   #elif (defined HAVE_FFMPEG_AVFILTER_H)
+     #include <ffmpeg/avfiltergraph.h>
+     #include <ffmpeg/buffersink.h>
+@@ -75,7 +79,11 @@ public:
+   virtual int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, AVFilterInOut **inputs, AVFilterInOut **outputs, void *log_ctx)=0;
+   virtual int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx)=0;
+ #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
++#if LIBAVFILTER_VERSION_MICRO < 50 // Libav
 +  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, AVRational pixel_aspect)=0;
-+#endif
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame)=0;
- #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
-@@ -172,7 +176,11 @@ public:
-   virtual int avfilter_poll_frame(AVFilterLink *link) { return ::avfilter_poll_frame(link); }
-   virtual int avfilter_request_frame(AVFilterLink *link) { return ::avfilter_request_frame(link); }
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-+#if LIBAVFILTER_VERSION_MICRO
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }
 +#else
+   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
++#endif
+ #else
+   virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
+ #endif
+@@ -135,7 +143,11 @@ public:
+     return ::avfilter_graph_config(graphctx, log_ctx);
+   }
+ #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
++#if LIBAVFILTER_VERSION_MICRO < 50 // Libav
 +  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, AVRational pixel_aspect) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, pts, pixel_aspect); }
++#else
+   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }
 +#endif
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame); }
- #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-index b4e1451..4e5eedf 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-@@ -814,7 +814,11 @@ int CDVDVideoCodecFFmpeg::FilterProcess(AVFrame* frame)
+ #else
+   virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame(buffer_filter, frame, flags); }
+ #endif
+Index: xbmc-11.0/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+===================================================================
+--- xbmc-11.0.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
++++ xbmc-11.0/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+@@ -833,7 +833,11 @@ int CDVDVideoCodecFFmpeg::FilterProcess(
    if (frame)
    {
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-+#if LIBAVFILTER_VERSION_MICRO
-     result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, 0);
-+#else
+ #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
++#if LIBAVFILTER_VERSION_MICRO < 50 // Libav
 +    result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, frame->pts, m_pCodecContext->sample_aspect_ratio);
++#else
+     result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, 0);
 +#endif
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-     result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame);
- #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
--- 
-1.7.3.4
-
+ #else
+     result = m_dllAvFilter.av_buffersrc_add_frame(m_pFilterIn, frame, 0);
+ #endif
diff --git a/media-tv/xbmc/xbmc-11.0.ebuild b/media-tv/xbmc/xbmc-11.0.ebuild
index 0440eca93c53..5763c29d12b0 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.14 2012/09/05 07:52:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.15 2012/10/24 22:36:12 aballier Exp $
 
 EAPI="4"
 
@@ -16,7 +16,8 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	inherit autotools
 	MY_P=${P/_/-*_}
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
+		http://dev.gentoo.org/~aballier/distfiles/${P}-ffmpeg-1.0-compat-1.tar.bz2"
 	KEYWORDS="amd64 x86"
 	S=${WORKDIR}/${MY_P}
 fi
@@ -74,7 +75,7 @@ COMMON_DEPEND="virtual/opengl
 	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]
+	>=virtual/ffmpeg-0.10.2[encode]
 	rtmp? ( media-video/rtmpdump )
 	avahi? ( net-dns/avahi )
 	webserver? ( net-libs/libmicrohttpd )
@@ -126,9 +127,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-11.0-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-11.0-no-arm-flags.patch #400617
 	epatch "${FILESDIR}"/${PN}-11.0-no-exec-stack.patch
+	EPATCH_MULTI_MSG="Applying patches from upstream to fix building with recent FFmpeg versions..." \
+		EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/${P}-ffmpeg-1.0-compat" #438842
 	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
 	rm -f configure