dev-qt/qtmultimedia: revision bump to improve handling of EGL videonode plugin

ALso ensure Qt dependencies are of the same version.

Gentoo-bug: 564560
Gentoo-bug: 565588

Package-Manager: portage-2.2.26

2 files changed, 79 insertions, 0 deletions

diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index c018a17936f3..b275b675c4b1 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -6,6 +6,7 @@
 		<flag name="egl">Enable EGL integration</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
+		<flag name="gles2">Enable EGL/GLES2 integration</flag>
 		<flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
 		<flag name="gstreamer010">Enable audio support via <pkg>media-libs/gstreamer:0.10</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild
new file mode 100644
index 000000000000..765a5b308bcd
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="The Multimedia module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
+REQUIRED_USE="?? ( gstreamer gstreamer010 )"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~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
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-bad:0.10
+		media-libs/gst-plugins-base:0.10
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}
+		gles2? ( ~dev-qt/qtgui-${PV}[egl,gles2] )
+		!gles2? ( ~dev-qt/qtgui-${PV}[-egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		~dev-qt/qtopengl-${PV}
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-proto/videoproto )
+"
+
+src_prepare() {
+	# do not rely on qtbase configuration
+	sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+		qtmultimedia.pro || die
+
+	qt_use_compile_test alsa
+	qt_use_compile_test gstreamer
+	qt_use_compile_test openal
+	qt_use_compile_test pulseaudio
+
+	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=(
+		$(usex gstreamer 'GST_VERSION=1.0' '')
+		$(usex gstreamer010 'GST_VERSION=0.10' '')
+	)
+	qt5-build_src_configure
+}