summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2020-01-07 22:52:50 +0100
committerJohannes Huber <johu@gentoo.org>2020-01-07 22:53:55 +0100
commitfc58ee0973adc018239f499f2715ef87de4a7857 (patch)
tree1cc576c1a92afc1ae8fa095b15e4183cf899130a /media-libs
parentdev-cpp/yaml-cpp: fix ABI breakage (diff)
downloadgentoo-fc58ee0973adc018239f499f2715ef87de4a7857.tar.gz
gentoo-fc58ee0973adc018239f499f2715ef87de4a7857.tar.bz2
gentoo-fc58ee0973adc018239f499f2715ef87de4a7857.zip
media-libs/qtav: Fix build w/ Qt 5.14
Thanks-to: David Haller <gentoo@dhaller.de> Closes: https://bugs.gentoo.org/703560 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Johannes Huber <johu@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/qtav/files/qtav-1.12.0-qt5.14.patch12
-rw-r--r--media-libs/qtav/qtav-1.12.0-r1.ebuild1
2 files changed, 13 insertions, 0 deletions
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 000000000000..bf546c9e068d
--- /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 14df283f8888..cac2cb204608 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() {