media-libs/qtav: Fix build with ffmpeg-4

Closes: https://bugs.gentoo.org/660852
Package-Manager: Portage-2.3.49, Repoman-2.3.10

diff --git a/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch b/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch
new file mode 100644 (file)
index 0000000..cb77e9a
--- /dev/null
+++ b/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch
@@ -0,0 +1,36 @@
+From 1633f2962e195eb2a013072e694a2e1c701613a8 Mon Sep 17 00:00:00 2001
+From: 0xFelix <evostar@gmx.de>
+Date: Tue, 12 Dec 2017 13:24:34 +0100
+Subject: [PATCH] Remove usage of deprecated avfiltergraph.h header
+
+avfiltergraph.h was replaced by avfilter.h in libavfilter version
+3.8.0+ so only include it when the used libavfilter version
+is older than 3.8.0
+---
+ src/QtAV/private/AVCompat.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h
+index 6c38596d1..944cfd7de 100644
+--- a/src/QtAV/private/AVCompat.h
++++ b/src/QtAV/private/AVCompat.h
+@@ -59,6 +59,7 @@ extern "C"
+ #include <libavutil/parseutils.h>
+ #include <libavutil/pixdesc.h>
+ #include <libavutil/avstring.h>
++#include <libavfilter/version.h>
+ 
+ #if !FFMPEG_MODULE_CHECK(LIBAVUTIL, 51, 73, 101)
+ #include <libavutil/channel_layout.h>
+@@ -79,8 +80,11 @@ extern "C"
+ #endif //QTAV_HAVE(AVRESAMPLE)
+ 
+ #if QTAV_HAVE(AVFILTER)
++#if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,8,0)
+ #include <libavfilter/avfiltergraph.h> /*code is here for old version*/
++#else
+ #include <libavfilter/avfilter.h>
++#endif
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+ #endif //QTAV_HAVE(AVFILTER)

diff --git a/media-libs/qtav/qtav-1.12.0.ebuild b/media-libs/qtav/qtav-1.12.0.ebuild
index 62a4f6419592a878a3f88813d97cda2152417db0..f3e1ff02cc1dff14ce8265c932fffcc8e8821bc7 100644 (file)
--- a/media-libs/qtav/qtav-1.12.0.ebuild
+++ b/media-libs/qtav/qtav-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
+PATCHES=(
+       "${FILESDIR}/${P}-multilib.patch"
+       "${FILESDIR}/${P}-ffmpeg-4.patch"
+)
 
 src_prepare() {
        cmake-utils_src_prepare