[gentoo-commits] repo/gentoo:master commit in: media-libs/qtav/files/, media-libs/qtav/

[Johannes Huber]

commit:     fc58ee0973adc018239f499f2715ef87de4a7857
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  7 21:52:50 2020 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 21:53:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc58ee09

media-libs/qtav: Fix build w/ Qt 5.14

Thanks-to: David Haller <gentoo <AT> dhaller.de>
Closes: https://bugs.gentoo.org/703560
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 media-libs/qtav/files/qtav-1.12.0-qt5.14.patch | 12 ++++++++++++
 media-libs/qtav/qtav-1.12.0-r1.ebuild          |  1 +
 2 files changed, 13 insertions(+)

diff --git a/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch b/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch
new file mode 100644
index 00000000000..bf546c9e068
--- /dev/null
+++ b/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch
@@ -0,0 +1,12 @@
+diff -ub -purN -x '*~' a/qml/SGVideoNode.cpp b/qml/SGVideoNode.cpp
+--- a/qml/SGVideoNode.cpp	2017-06-21 03:47:15.000000000 +0200
++++ b/qml/SGVideoNode.cpp	2020-01-07 05:37:05.304897727 +0100
+@@ -25,6 +25,8 @@
+ #include "QtAV/VideoFrame.h"
+ #include <QtCore/QScopedPointer>
+ #include <QtGui/QOpenGLFunctions>
++#include <QtQuick/QSGMaterialType>
++#include <QtQuick/QSGMaterial>
+ #include <QtQuick/QSGMaterialShader>
+ 
+ // all in QSGRenderThread

diff --git a/media-libs/qtav/qtav-1.12.0-r1.ebuild b/media-libs/qtav/qtav-1.12.0-r1.ebuild
index 14df283f888..cac2cb20460 100644
--- a/media-libs/qtav/qtav-1.12.0-r1.ebuild
+++ b/media-libs/qtav/qtav-1.12.0-r1.ebuild
@@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
 	"${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765
+	"${FILESDIR}"/${P}-qt5.14.patch
 )
 
 src_prepare() {