diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-03-31 12:06:01 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-03-31 12:06:01 +0000 |
| commit | 23c0e75479b2fd06c8a5b8ed64744fae1efce969 (patch) | |
| tree | 8e8609f611d833ab39333b4b4053b21d7c2418c2 | |
| parent | Drop ia64/sparc keywords (diff) | |
| download | gentoo-2-23c0e75479b2fd06c8a5b8ed64744fae1efce969.tar.gz gentoo-2-23c0e75479b2fd06c8a5b8ed64744fae1efce969.tar.bz2 gentoo-2-23c0e75479b2fd06c8a5b8ed64744fae1efce969.zip | |
Add also the 3rd patch from libav bug#406215 that fixes the latest api include issues.
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-tv/xbmc/files/xbmc-11.0-ffmpeg-0.10.2.patch | 41 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-11.0.ebuild | 3 |
3 files changed, 49 insertions, 2 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/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 |