[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     5e867829ffcd203afb15002c849032fc779b7823
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 18:20:37 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 18:21:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5e867829

dev-qt/qtmultimedia: add missing dependency

Package-Manager: portage-2.2.20.1

 dev-qt/qtmultimedia/metadata.xml                 | 1 +
 dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild    | 6 +++++-
 dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild    | 6 +++++-
 dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild | 6 +++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index 285042b..c018a17 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
+		<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="gstreamer">Enable audio support via <pkg>media-libs/gstreamer:1.0</pkg></flag>

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index dd56d86..e356a18 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
 REQUIRED_USE="?? ( gstreamer gstreamer010 )"
 
 RDEPEND="
@@ -20,11 +20,13 @@ RDEPEND="
 	>=dev-qt/qtnetwork-${PV}:5
 	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
@@ -32,6 +34,8 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		>=dev-qt/qtdeclarative-${PV}:5
+		>=dev-qt/qtgui-${PV}:5[egl=]
+		egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
index dd56d86..e356a18 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
 REQUIRED_USE="?? ( gstreamer gstreamer010 )"
 
 RDEPEND="
@@ -20,11 +20,13 @@ RDEPEND="
 	>=dev-qt/qtnetwork-${PV}:5
 	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
@@ -32,6 +34,8 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		>=dev-qt/qtdeclarative-${PV}:5
+		>=dev-qt/qtgui-${PV}:5[egl=]
+		egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
index dd56d86..e356a18 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets"
+IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets"
 REQUIRED_USE="?? ( gstreamer gstreamer010 )"
 
 RDEPEND="
@@ -20,11 +20,13 @@ RDEPEND="
 	>=dev-qt/qtnetwork-${PV}:5
 	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
@@ -32,6 +34,8 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		>=dev-qt/qtdeclarative-${PV}:5
+		>=dev-qt/qtgui-${PV}:5[egl=]
+		egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (