summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2016-02-22 00:22:25 +0100
committerDavid Seifert <soap@gentoo.org>2016-02-22 00:22:40 +0100
commit6b3d75d72176eea6a04efd494105f0af5781255d (patch)
tree2bc24c466bf7cc3c96629fecc94914ed8c196914 /media-sound
parentapp-admin/vault: use get_golibdir for library installation (diff)
downloadgentoo-6b3d75d72176eea6a04efd494105f0af5781255d.tar.gz
gentoo-6b3d75d72176eea6a04efd494105f0af5781255d.tar.bz2
gentoo-6b3d75d72176eea6a04efd494105f0af5781255d.zip
media-sound/moc: Patch for converting 'audioconvert.h' to 'channel_layout.h'
Gentoo-Bug: 575328 Package-Manager: portage-2.2.27
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch20
-rw-r--r--media-sound/moc/moc-2.6_alpha1-r1.ebuild1
2 files changed, 21 insertions, 0 deletions
diff --git a/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch b/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch
new file mode 100644
index 000000000000..9ade09033976
--- /dev/null
+++ b/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch
@@ -0,0 +1,20 @@
+Patch for building with latest FFmpeg 3.0
+https://bugs.gentoo.org/show_bug.cgi?id=575328
+
+Inspired by
+https://raw.githubusercontent.com/Homebrew/patches/1282e60/moc/moc-2.5.0.diff
+
+We can unconditionally depend on the existence of 'channel_layout.h',
+as even the oldest version in the Gentoo tree contains this header.
+
+--- moc-2.6-alpha1/decoder_plugins/ffmpeg/ffmpeg.c
++++ moc-2.6-alpha1/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -66,7 +66,7 @@
+ GCC_DIAG_ON(deprecated-declarations)
+ #include <libavutil/mathematics.h>
+ #ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS
+-#include <libavutil/audioconvert.h>
++#include <libavutil/channel_layout.h>
+ #endif
+
+ /* FFmpeg also likes common names, without that, our common.h and log.h
diff --git a/media-sound/moc/moc-2.6_alpha1-r1.ebuild b/media-sound/moc/moc-2.6_alpha1-r1.ebuild
index a5b24cdb1e7a..3901a156b09d 100644
--- a/media-sound/moc/moc-2.6_alpha1-r1.ebuild
+++ b/media-sound/moc/moc-2.6_alpha1-r1.ebuild
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}-fix-ncurses-underlinking.patch"
+ "${FILESDIR}/${P}-audioconvert.h.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"