gentoo resync : 11.07.2019

3 files changed, 115 insertions, 0 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 9ac9ba2c7f56..fdab59ad38c2 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,3 +1,6 @@
+AUX qtmultimedia-5.12.4-fix-no-opengl.patch 1229 BLAKE2B ea648a12662060bdf1aeb5ebe62f748f15904b9cae5d985f0a93f8b56aa9671b30c0672d772620d60aae1cd3ae3f21cc5d2fa82348210716b3746b34e824de78 SHA512 226d2a95541c8c38886783a61fc997ead7a8fd6007e1ed6321a16e42eb12b54e4139e2aa1b776ae4323c153bfb73118d6a71ee3790158bcfded6eddc9a8b1cd7
 DIST qtmultimedia-everywhere-src-5.12.3.tar.xz 3742244 BLAKE2B 65cc184c2625c998ec0f12d5d2f72401693521c9b5e1f27db342279724789e88e0bd6c6cb741ccf28939e8edbb657dde391ceb24ab0cb97c786c114e7e95743d SHA512 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963
+DIST qtmultimedia-everywhere-src-5.12.4.tar.xz 3743264 BLAKE2B c468c674e441ca6b400bf2149b4c56851697df5d644486f7ec902a175ecc2260fb0e7e3c366aaf7d542a2b263731c622702bf9b2f04a5257a5e1d8e985c9507c SHA512 28eaaf4a704649616cd77ae5560ddd6298c82e525f59fa4d5a0178826fe2d6c9b77dcb067f2b5b56e88da7d6043a3f8e34b5c810d12751c74fdc65e5440586fa
 EBUILD qtmultimedia-5.12.3.ebuild 1454 BLAKE2B dea245e0689b8e1d48049a181522652cb5dd916a6c23a21cf28a2a2d74bef6ca02cf1c9974b4d111757431e9eff6785b0087c3ab07fcdc005cda382a5032982b SHA512 174f824fc6cc4c04d6425fb3f7d6e166f9942997216cc2eaa117c368a338e01798dc43bc1da1bf0a4a9f715c2831e0c8fe14a635d10659e5cc1e1ebe0917a47c
+EBUILD qtmultimedia-5.12.4.ebuild 1512 BLAKE2B 409cf16b96054d55d583b3530b386a1600387dddb75f6743edcc11c23dece1510be08b1d3556005938a7692501ea7bb6491abdbe52bfd52f2fd4b86643cf54ae SHA512 e9d79b6dcfb391fc4b6e0544e30f7cc0247fb518c106d48a1090608bf85dff4ef95292834e6c21438bcf4a32c168324dbe1646618273023d0861c8f0d27c92d7
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch
new file mode 100644
index 000000000000..1e5d7551d30c
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch
@@ -0,0 +1,42 @@
+From 9bbf9f0d862b8d458e59690d36641618fb101b4e Mon Sep 17 00:00:00 2001
+From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
+Date: Mon, 17 Jun 2019 15:20:22 +0200
+Subject: [PATCH] Fix compile issue when no opengl in QVideoSurfacePainter
+
+error: invalid use of incomplete type 'class QGLContext'
+
+Change-Id: I4bc9bd4231e663b187d3cef917b7a551ba614ba9
+Fixes: QTBUG-76405
+Reviewed-by: Andy Shaw <andy.shaw@qt.io>
+---
+ src/multimediawidgets/qpaintervideosurface.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
+index 440d5c858..6af0c7588 100644
+--- a/src/multimediawidgets/qpaintervideosurface.cpp
++++ b/src/multimediawidgets/qpaintervideosurface.cpp
+@@ -57,10 +57,6 @@
+ #ifndef GL_RGB8
+ #define GL_RGB8 0x8051
+ #endif
+-#endif
+-
+-#include <QtDebug>
+-QT_BEGIN_NAMESPACE
+ 
+ static void makeCurrent(QGLContext *context)
+ {
+@@ -70,6 +66,10 @@ static void makeCurrent(QGLContext *context)
+     if (handle && QOpenGLContext::currentContext() != handle)
+         handle->makeCurrent(handle->surface());
+ }
++#endif
++
++#include <QtDebug>
++QT_BEGIN_NAMESPACE
+ 
+ QVideoSurfacePainter::~QVideoSurfacePainter()
+ {
+-- 
+2.16.3
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild
new file mode 100644
index 000000000000..8a896cd1ccfe
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		~dev-qt/qtopengl-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-base/xorg-proto )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-no-opengl.patch" )
+
+src_prepare() {
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	qt_use_disable_mod qml quick \
+		src/src.pro \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}