commit: bdedc5799c11d174d1e6481a858798b86207b996 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sat Oct 17 14:07:55 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat Oct 17 14:07:55 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bdedc579
dev-qt/qtmultimedia: improve dependency specification Package-Manager: portage-2.2.20.1 dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild | 2 +- dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild | 2 +- dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild | 2 +- dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild | 6 +++++- dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild | 6 +++++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild index e356a18..1b51234 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild @@ -34,8 +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] ) + !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] ) 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 e356a18..1b51234 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild @@ -34,8 +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] ) + !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] ) 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 e356a18..1b51234 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild @@ -34,8 +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] ) + !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] ) openal? ( media-libs/openal ) ) widgets? ( diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild index dd56d86..1b51234 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.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 + egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] ) + !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] ) openal? ( media-libs/openal ) ) widgets? ( diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild index dd56d86..1b51234 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-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 + egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] ) + !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] ) openal? ( media-libs/openal ) ) widgets? (