commit: 3233ef7e39636128b31a4144cd4d0efe7247491a Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Sep 3 19:52:29 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Sep 3 19:52:29 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3233ef7e
dev-qt/qtwayland: Drop USE=egl In this case, USE=egl was not enabling additional support but enabled- instead-of GLX. Rather than complicating things with REQUIRED_USE, build with EGL unconditionally as the use of GLX in context of Wayland is questionable. Gentoo-bug: 627758 Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-qt/qtwayland/metadata.xml | 1 - dev-qt/qtwayland/qtwayland-5.10.9999.ebuild | 6 +++--- dev-qt/qtwayland/qtwayland-5.6.9999.ebuild | 6 +++--- dev-qt/qtwayland/qtwayland-5.9.1.ebuild | 6 +++--- dev-qt/qtwayland/qtwayland-5.9.9999.ebuild | 6 +++--- dev-qt/qtwayland/qtwayland-5.9999.ebuild | 6 +++--- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml index 00ed5295..9bd59538 100644 --- a/dev-qt/qtwayland/metadata.xml +++ b/dev-qt/qtwayland/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="egl">Use EGL instead of GLX to manage OpenGL contexts</flag> <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> <flag name="qml">Build QML/QtQuick bindings</flag> <flag name="wayland-compositor">Build Qt compositor for wayland</flag> diff --git a/dev-qt/qtwayland/qtwayland-5.10.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.10.9999.ebuild index fe6a245a..0629d749 100644 --- a/dev-qt/qtwayland/qtwayland-5.10.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.10.9999.ebuild @@ -10,14 +10,14 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="egl +libinput xcomposite" +IUSE="+libinput xcomposite" DEPEND=" >=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-${PV} ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV}[egl=,libinput?] - media-libs/mesa[egl?] + ~dev-qt/qtgui-${PV}[egl,libinput?] + media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 diff --git a/dev-qt/qtwayland/qtwayland-5.6.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.6.9999.ebuild index 3fb13e35..e706826a 100644 --- a/dev-qt/qtwayland/qtwayland-5.6.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.6.9999.ebuild @@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="egl qml wayland-compositor xcomposite" +IUSE="qml wayland-compositor xcomposite" DEPEND=" >=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[egl=] - media-libs/mesa[egl?] + ~dev-qt/qtgui-${PV}[egl] + media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 wayland-compositor? ( qml? ( ~dev-qt/qtdeclarative-${PV} ) diff --git a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild index fe6a245a..0629d749 100644 --- a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild @@ -10,14 +10,14 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="egl +libinput xcomposite" +IUSE="+libinput xcomposite" DEPEND=" >=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-${PV} ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV}[egl=,libinput?] - media-libs/mesa[egl?] + ~dev-qt/qtgui-${PV}[egl,libinput?] + media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 diff --git a/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild index fe6a245a..0629d749 100644 --- a/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.9.9999.ebuild @@ -10,14 +10,14 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="egl +libinput xcomposite" +IUSE="+libinput xcomposite" DEPEND=" >=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-${PV} ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV}[egl=,libinput?] - media-libs/mesa[egl?] + ~dev-qt/qtgui-${PV}[egl,libinput?] + media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.9999.ebuild index fe6a245a..0629d749 100644 --- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.9999.ebuild @@ -10,14 +10,14 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="egl +libinput xcomposite" +IUSE="+libinput xcomposite" DEPEND=" >=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-${PV} ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV}[egl=,libinput?] - media-libs/mesa[egl?] + ~dev-qt/qtgui-${PV}[egl,libinput?] + media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11