Drop libav patch that breaks building with ffmpeg #408495 by Piotr Mitas.

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

4 files changed, 21 insertions, 163 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 2e8458d593af..582b25a8edcc 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.121 2012/03/17 16:32:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.122 2012/03/19 00:10:16 vapier Exp $
+
+  19 Mar 2012; Mike Frysinger <vapier@gentoo.org> xbmc-11.0_rc2.ebuild,
+  -files/xbmc-11.0-libav-0.8.patch:
+  Drop libav patch that breaks building with ffmpeg #408495 by Piotr Mitas.
 
   17 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> xbmc-9999.ebuild:
   Stop applying -libpng-1.5.patch because upstream commit
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 5e0b3585b13d..d073565771cf 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -5,7 +5,6 @@ AUX xbmc-10.0-python-2.7.patch 30308 RMD160 15f01d93b0db903eadb5deb94d5092b0a4b6
 AUX xbmc-10.1-gcc-4.6.patch 4295 RMD160 4aee4c91f9d2f9e947d37cd39f2700fc0eaec353 SHA1 5ae755b20e06560aaf1508b80c1f7661ef36802f SHA256 cef1154bc3352b215bfece1a749d901d43ec7aa0c6d050921ae8745c553e84c9
 AUX xbmc-10.1-headers.patch 294 RMD160 74536be4a5e3b939c6360bbc715f30e08226af46 SHA1 2435642148ec291d10bded3036592a6104f5ff03 SHA256 8b8e86cf7edef227e8267c52d60545b753eea11261f078131ee30f9eac8bb002
 AUX xbmc-10.1-libpng-1.5.patch 19253 RMD160 1488504816e668fceb1c3f762738864ea81fa940 SHA1 06e90834bc665eabc3f4e587d551b93af87c1ba5 SHA256 1a0985b91ee9862a538a43689d005dc88d49bf5a70d917896fb69ee416369ff7
-AUX xbmc-11.0-libav-0.8.patch 7270 RMD160 113fe71b2be268521d643518d556f7cda8e399bc SHA1 52a9ef20eb2d3fb28ae7941505323797e9a32332 SHA256 b8831ec575963cc6b38709d4a772e8bb4fd920c722212019a19a96eaa050152f
 AUX xbmc-11.0-libpng-1.5.patch 18833 RMD160 023626a75b96fbae4d662ff875f1647113d53bad SHA1 463ff9dda04707fc71db3d431eded9f396698aa9 SHA256 83b49d44b7855dcb2f7d34e2e9628f4c1f8e06ae8f9e94ac06a6036620705daa
 AUX xbmc-9999-no-arm-flags.patch 542 RMD160 108586f2956cc27cc9f3c582565bd4e2f22fede0 SHA1 e6dc2f2b63e208fccb0c1ecb50322d6a9c9fda88 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84
 AUX xbmc-9999-no-exec-stack.patch 782 RMD160 d1d9c9ea4d92254776f4cc431228ff39180430d4 SHA1 308e1c765ddc46c45b974a203bbb17ea13858fba SHA256 0d3085458ff9c8c22f4dd406ee611d74909bb1dc2de4788b67e30cb5967c819f
@@ -13,18 +12,24 @@ AUX xbmc-9999-nomythtv.patch 6190 RMD160 829dff4b58098ee0935aed6fcda345e06abdb7b
 DIST xbmc-10.1.tar.gz 130187822 RMD160 a4ddb06b396b8ae437bf30bea5b44396b54ebc5b SHA1 7a9f4e2c18a23d687ecfc744f2e051e4f88ef01a SHA256 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
 DIST xbmc-11.0-Eden_rc2.tar.gz 59257824 RMD160 e0efe3c69de4e990ca52f994c242f5a232843f72 SHA1 ff3b02d56d9a7ec356fa7064087062721d183773 SHA256 7a52850243e85ca51043c9163104ceda14d42d2ab682255dd4d4cecd05c1d802
 EBUILD xbmc-10.1.ebuild 5390 RMD160 ccb062b93f485e70ffba8d108aae662d10533c12 SHA1 99bcc61eed8b3086085caeaa476e1c646e24bdd1 SHA256 df2669bfd06df9b2cbdb12ba25a5ad2858827f8613f495b2267109a1158a5d35
-EBUILD xbmc-11.0_rc2.ebuild 5893 RMD160 13bd625faec8a9c716f35bf39cdf7ff4d0b549f1 SHA1 22b1a9966ff178f5ee9656bdbc931152c6f34f54 SHA256 7051b76e29e75742b5256516506052b9f999c921347f4d7255619f73b339c85d
+EBUILD xbmc-11.0_rc2.ebuild 5841 RMD160 6afdcba0287659742735076e78209f2d2c065338 SHA1 0207846ddbe92f4e67cd7a1e63f30f5f6848e12d SHA256 0dc5d91e6c136f6e176f8568ba4a6d377622cfdc59dd17fd8abfa79afa1a6d5a
 EBUILD xbmc-9999.ebuild 5691 RMD160 834b0ca5b09f9186179163f23f775f8bdbcf4c8d SHA1 085534640730758cd94d104615afdf0630af1605 SHA256 566c6712b0668a53cfefdf34ae8131ceae096ab5cdfc8dd3f6fb0c8684841366
-MISC ChangeLog 19282 RMD160 874fdfbd331c0bca1d2ab0f51e2aeeb01c620052 SHA1 0c72bcbdf35ada5fa957d5d3522907c3a33a5f1f SHA256 2b2e9bded397a732af553bc2d73c7feaf598310b0a96e1f6ce4a2c062595fb55
+MISC ChangeLog 19464 RMD160 d1f36d252ee1f1258f4c99fc7d3270ea06ad1f44 SHA1 fd1b8aada5f8e8a2f448c2f6abc344d59a3d382d SHA256 8ef4342b0b59f906270de3e7f806cd5fb3b0f4049e7d7706245cb96651b01d03
 MISC metadata.xml 932 RMD160 fbedc1d562949001f2195a49f375d2e4a1fdc7ff SHA1 c102da84b6cd9160308943fc7cc7801aff691a46 SHA256 2f82a971dfec33d4958ee8977011928976c4aab5f4e03139be6a6245bf3eb62d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEbBAEBAgAGBQJPZLx2AAoJEEdUh39IaPFNK9oH91H3aBirn+SjqHShr+PIo86s
-wpkTdCxWGkPKoHs21kbo4HTw00XkqsoAuZt4jGtiZZgK88MHbpqRw4inxt0AUzYt
-DmgZVPmMdZEadBE+lngxhuudu6v2mVZvyXm+7uECuqWaAJBmOj2d6dshd/qeh5J5
-eQo3G1G/2GADNP3vt5dydbyooZ+v5FOZbJXqpgfJY5b9gsx8glSQBkJZJIfZOH8F
-wuUqA32oqES5M+/0OyLF8aLL240qoSOcvNjy9jGCT9ewSaz828QtFu+6Y2qhfjGw
-N/4zmXpzFLlz+RrzDKlASKqK6MPR0bgW3Uiyjj9EDSwW0cHxhk3lCaOjLCfDtQ==
-=FWWf
+iQIcBAEBAgAGBQJPZnmCAAoJELEHsLL7fEFWT10P/iCuwbkK5DY0rWfpEFCx4DF6
+waiJ+uqQfkb9/CQ2+u4rtaFzt/FuY7Q1u9LUE6EyOCzC36UW1f51jFRjmLttKI0m
+t+cSjPE+dpmntvNdjK/aESx+NYqz1ytrkHm3fy5NWUOedo96XXGSTeuCuf/E5fjH
+WOpUG5JusKvCHe9WvOL5DEVF7JnramAFaXXJs1Ljs63XZmftFRo2xnceVQlrU8Fr
+d2nmgYRpt/HKTtBpL2WIateEcJzcu5q47ONVQej6LOv5zYj5osXCh5ikixIFf1zG
+goHJsfk9PhY9uAdYGYOVhYI1jmGuh691GWbnoEcVWkkTlckJRimpSwn9P8aD1nSr
+aT6jzsspOZzMc2CnxisTY0aiMaxIPpuwbWDzI9Xg0R/4ha7F2/v0+jOdkA1//P4E
+hxXsTpJ7SaoSErxa+xI/DNPHC8qyUHZvBe9S7N9JOyo4JoM1yYEduCrnhNjGwC6k
+ojkFj4P4VQEbYEliKTBFfRSN4qChxHZJ9n5v6m5hCPdEG95/cAyjkOhZCUyW64eq
+IRBRtd1bSe/RxI1K8qzCvXpgraWVmavLXE+l8ynCxz4ENUNeFAadbuYczHYHOSk9
+hQxQ0vZ9Bi+/UsJF7gMZi55sKtl69b6M4OUTm88oDspdFS69wMXTEXCshngN9n+u
+7KIsHyBWeuKKdmEb+ngf
+=4f3C
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-11.0-libav-0.8.patch b/media-tv/xbmc/files/xbmc-11.0-libav-0.8.patch
deleted file mode 100644
index 6735b2ded59b..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-libav-0.8.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/configure.in b/configure.in
-index bca9239..27297b8 100755
---- a/configure.in
-+++ b/configure.in
-@@ -1248,7 +1248,11 @@ if test "$use_external_ffmpeg" = "yes"; then
-   AC_DEFINE([USE_EXTERNAL_FFMPEG], [1], [Whether to use external FFmpeg libraries.])
- 
-   # Disable vdpau support if external libavcodec doesn't have it
--  AC_CHECK_LIB([avcodec], [ff_vdpau_vc1_decode_picture],,
-+  AC_RUN_IFELSE(
-+    AC_LANG_PROGRAM([[#include <libavcodec/avcodec.h>]],
-+      [[avcodec_register_all();
-+        AVCodec *codec = avcodec_find_decoder_by_name("vc1_vdpau");
-+        return (codec) ? 0 : 1;]]),,
-     [if test "x$use_vdpau" = "xyes"; then
-       AC_MSG_ERROR($ffmpeg_vdpau_not_supported)
-     else
-@@ -1256,6 +1260,23 @@ if test "$use_external_ffmpeg" = "yes"; then
-       AC_MSG_RESULT($ffmpeg_vdpau_not_supported)
-     fi])
- 
-+  # Other headers to include if available.
-+  AC_CHECK_HEADERS([libavutil/mathematics.h],,)
-+
-+  # Check if <libavfilter/vsrc_buffer.h> exists and defines old
-+  # av_vsrc_buffer_add_frame() from SoC. This avoids multiple declarations of
-+  # av_vsrc_buffer_add_frame().
-+  AC_COMPILE_IFELSE(
-+    AC_LANG_SOURCE([[
-+      #include <libavfilter/vsrc_buffer.h>
-+      void foo(void)
-+      {
-+        AVRational a;
-+        av_vsrc_buffer_add_frame(NULL, NULL, 0, a);
-+      }
-+      ]]), AC_DEFINE([USE_OLD_AV_VSRC_BUFFER_ADD_FRAME],
-+        [1], [Check if SoC av_vsrc_buffer_add_frame() is defined in libavfilter/vsrc_buffer.h.]),)
-+  
-   # Check for 'PIX_FMT_VDPAU_MPEG4' from libavutil
-   if test "x$use_vdpau" != "xno"; then
-     AC_LANG_PUSH([C++])
-diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
-index 302e35c..a421225 100644
---- a/lib/DllAvFilter.h
-+++ b/lib/DllAvFilter.h
-@@ -47,17 +47,21 @@
-     #include <ffmpeg/avfiltergraph.h>
-   #endif
-   /* for av_vsrc_buffer_add_frame */
--  #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,8,0)
--    #include <libavfilter/avcodec.h>
--  #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
--    int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
--                                 AVFrame *frame);
--  #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
--    int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
--                                 AVFrame *frame, int64_t pts);
-+  #if (defined USE_OLD_AV_VSRC_BUFFER_ADD_FRAME)
-+    #include <libavfilter/vsrc_buffer.h>
-   #else
--    int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
--          AVFrame *frame, int64_t pts, AVRational pixel_aspect);
-+    #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,8,0)
-+      #include <libavfilter/avcodec.h>
-+    #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-+      int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
-+                                   AVFrame *frame);
-+    #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
-+      int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
-+                                   AVFrame *frame, int64_t pts);
-+    #else
-+      int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
-+            AVFrame *frame, int64_t pts, AVRational pixel_aspect);
-+    #endif
-   #endif
- #else
-   #include "libavfilter/avfiltergraph.h"
-@@ -82,6 +86,9 @@ class DllAvFilterInterface
-   virtual int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx)=0;
-   virtual int avfilter_poll_frame(AVFilterLink *link)=0;
-   virtual int avfilter_request_frame(AVFilterLink *link)=0;
-+#if (defined USE_OLD_AV_VSRC_BUFFER_ADD_FRAME)
-+  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, AVRational pixel_aspect)=0;
-+#else
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-@@ -91,6 +98,7 @@ class DllAvFilterInterface
- #else
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, AVRational pixel_aspect)=0;
- #endif
-+#endif
-   virtual AVFilterBufferRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int w, int h)=0;
-   virtual void avfilter_unref_buffer(AVFilterBufferRef *ref)=0;
-   virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad)=0;
-@@ -171,6 +179,9 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
-   }
-   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 (defined USE_OLD_AV_VSRC_BUFFER_ADD_FRAME)
-+  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
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-   virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-@@ -180,6 +191,7 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
- #else
-   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); }
- #endif
-+#endif
-   virtual AVFilterBufferRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int w, int h) { return ::avfilter_get_video_buffer(link, perms, w, h); }
-   virtual void avfilter_unref_buffer(AVFilterBufferRef *ref) { ::avfilter_unref_buffer(ref); }
-   virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad) { return ::avfilter_link(src, srcpad, dst, dstpad); }
-diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h
-index e882cac..b8bb2d6 100644
---- a/lib/DllAvUtil.h
-+++ b/lib/DllAvUtil.h
-@@ -59,6 +59,10 @@
-   #else
-     #include <ffmpeg/mem.h>
-   #endif
-+  /* For AVRounding */
-+  #if (defined HAVE_LIBAVUTIL_MATHEMATICS_H)
-+    #include <libavutil/mathematics.h>
-+  #endif
- #else
-   #include "libavutil/avutil.h"
-   #include "libavutil/crc.h"
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-index c79ead4..c59130f 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-@@ -787,6 +787,9 @@ int CDVDVideoCodecFFmpeg::FilterProcess(AVFrame* frame)
- 
-   if (frame)
-   {
-+#if (defined USE_OLD_AV_VSRC_BUFFER_ADD_FRAME)
-+    result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, frame->pts, m_pCodecContext->sample_aspect_ratio);
-+#else
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-     result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, 0);
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
-@@ -796,6 +799,7 @@ int CDVDVideoCodecFFmpeg::FilterProcess(AVFrame* frame)
- #else
-     result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, frame->pts, m_pCodecContext->sample_aspect_ratio);
- #endif
-+#endif
- 
-     if (result < 0)
-     {
diff --git a/media-tv/xbmc/xbmc-11.0_rc2.ebuild b/media-tv/xbmc/xbmc-11.0_rc2.ebuild
index 2b0c673847f4..cc7ab6544cf6 100644
--- a/media-tv/xbmc/xbmc-11.0_rc2.ebuild
+++ b/media-tv/xbmc/xbmc-11.0_rc2.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_rc2.ebuild,v 1.2 2012/03/15 18:49:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0_rc2.ebuild,v 1.3 2012/03/19 00:10:16 vapier Exp $
 
 EAPI="4"
 
@@ -124,7 +124,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
 	epatch "${FILESDIR}"/${PN}-9999-no-exec-stack.patch
-	epatch "${FILESDIR}"/${PN}-11.0-libav-0.8.patch
 	# The mythtv patch touches configure.ac, so force a regen
 	rm -f configure