media-sound/moc: Patch for converting 'audioconvert.h' to 'channel_layout.h'

Gentoo-Bug: 575328

Package-Manager: portage-2.2.27

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 (file)
index 0000000..9ade090
--- /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 a5b24cdb1e7a2cad9b86e1c6cd528aedbb89ae7a..3901a156b09df47c6aeecf0858f92119123fef21 100644 (file)
--- 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}"