commit: 6a549174bb957dabc91737e5f8b39b87e7895306 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Thu Nov 19 16:00:25 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu Nov 19 16:00:30 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a549174
dev-qt/qtmultimedia: rename egl USE flag -> gles2 This avoids conflicts where egl was enabled but gles2 was not (gles2 must have the same setting across all Qt modules). Gentoo-bug: 565588 Package-Manager: portage-2.2.25 dev-qt/qtmultimedia/metadata.xml | 2 +- dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild | 6 +++--- dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild | 6 +++--- dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index c018a17..536277f 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -3,9 +3,9 @@ <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="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.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild index d760a39..721ad83 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 egl gstreamer gstreamer010 openal pulseaudio qml widgets" +IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets" REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" @@ -34,8 +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] ) + gles2? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] ) + !gles2? ( ~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 d760a39..721ad83 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 egl gstreamer gstreamer010 openal pulseaudio qml widgets" +IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets" REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" @@ -34,8 +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] ) + gles2? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] ) + !gles2? ( ~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 d760a39..721ad83 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 egl gstreamer gstreamer010 openal pulseaudio qml widgets" +IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets" REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" @@ -34,8 +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] ) + gles2? ( ~dev-qt/qtgui-${PV}:5[egl,gles2] ) + !gles2? ( ~dev-qt/qtgui-${PV}:5[-egl] ) openal? ( media-libs/openal ) ) widgets? (