commit: 355d7fbccd6bf39726fd130b7ba530f4ffe9ecec
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sat Nov 23 09:26:18 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 2 18:09:22 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=355d7fbc
dev-qt/qtgui: rename USE=gles2 to USE=gles2-only
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtgui/metadata.xml | 1 -
dev-qt/qtgui/qtgui-5.14.9999.ebuild | 12 ++++++------
dev-qt/qtgui/qtgui-5.15.9999.ebuild | 12 ++++++------
dev-qt/qtgui/qtgui-5.9999.ebuild | 12 ++++++------
4 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index a7e86f45..cfa040fb 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -9,7 +9,6 @@
<flag name="egl">Enable EGL integration</flag>
<flag name="eglfs">Build the EGL Full Screen/Single Surface
platform plugin</flag>
<flag name="evdev">Enable support for input devices via
evdev</flag>
- <flag name="gles2">Use GLES 2.0 or later instead of full
OpenGL</flag>
<flag name="ibus">Build the IBus input method plugin</flag>
<flag name="libinput">Enable support for input devices via
<pkg>dev-libs/libinput</pkg></flag>
<flag name="tslib">Enable support for touchscreen devices via
<pkg>x11-libs/tslib</pkg></flag>
diff --git a/dev-qt/qtgui/qtgui-5.14.9999.ebuild
b/dev-qt/qtgui/qtgui-5.14.9999.ebuild
index 474c2a42..fdad446a 100644
--- a/dev-qt/qtgui/qtgui-5.14.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.9999.ebuild
@@ -15,7 +15,7 @@ fi
# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+libinput +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs X )
@@ -23,7 +23,7 @@ REQUIRED_USE="
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
- X? ( gles2? ( egl ) )
+ X? ( gles2-only? ( egl ) )
"
RDEPEND="
@@ -42,7 +42,7 @@ RDEPEND="
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
- gles2? ( media-libs/mesa[gles2] )
+ gles2-only? ( media-libs/mesa[gles2] )
jpeg? ( virtual/jpeg:0 )
libinput? (
dev-libs/libinput:=
@@ -99,8 +99,8 @@ QT5_GENTOO_CONFIG=(
:system-freetype:FREETYPE
!:no-freetype:
!gif:no-gif:
- gles2::OPENGL_ES
- gles2:opengles2:OPENGL_ES_2
+ gles2-only::OPENGL_ES
+ gles2-only:opengles2:OPENGL_ES_2
!:no-gui:
:system-harfbuzz:
!:no-harfbuzz:
@@ -169,7 +169,7 @@ src_configure() {
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
- -opengl $(usex gles2 es2 desktop)
+ -opengl $(usex gles2-only es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
diff --git a/dev-qt/qtgui/qtgui-5.15.9999.ebuild
b/dev-qt/qtgui/qtgui-5.15.9999.ebuild
index cf523927..8b98a4f7 100644
--- a/dev-qt/qtgui/qtgui-5.15.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.9999.ebuild
@@ -15,7 +15,7 @@ fi
# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+libinput +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs X )
@@ -23,7 +23,7 @@ REQUIRED_USE="
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
- X? ( gles2? ( egl ) )
+ X? ( gles2-only? ( egl ) )
"
RDEPEND="
@@ -42,7 +42,7 @@ RDEPEND="
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
- gles2? ( media-libs/mesa[gles2] )
+ gles2-only? ( media-libs/mesa[gles2] )
jpeg? ( virtual/jpeg:0 )
libinput? (
dev-libs/libinput:=
@@ -99,8 +99,8 @@ QT5_GENTOO_CONFIG=(
:system-freetype:FREETYPE
!:no-freetype:
!gif:no-gif:
- gles2::OPENGL_ES
- gles2:opengles2:OPENGL_ES_2
+ gles2-only::OPENGL_ES
+ gles2-only:opengles2:OPENGL_ES_2
!:no-gui:
:system-harfbuzz:
!:no-harfbuzz:
@@ -169,7 +169,7 @@ src_configure() {
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
- -opengl $(usex gles2 es2 desktop)
+ -opengl $(usex gles2-only es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index d8d3e0e7..d6adc4b3 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -15,7 +15,7 @@ fi
# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg
+IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+libinput +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
|| ( eglfs X )
@@ -23,7 +23,7 @@ REQUIRED_USE="
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
- X? ( gles2? ( egl ) )
+ X? ( gles2-only? ( egl ) )
"
RDEPEND="
@@ -42,7 +42,7 @@ RDEPEND="
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
- gles2? ( media-libs/mesa[gles2] )
+ gles2-only? ( media-libs/mesa[gles2] )
jpeg? ( virtual/jpeg:0 )
libinput? (
dev-libs/libinput:=
@@ -99,8 +99,8 @@ QT5_GENTOO_CONFIG=(
:system-freetype:FREETYPE
!:no-freetype:
!gif:no-gif:
- gles2::OPENGL_ES
- gles2:opengles2:OPENGL_ES_2
+ gles2-only::OPENGL_ES
+ gles2-only:opengles2:OPENGL_ES_2
!:no-gui:
:system-harfbuzz:
!:no-harfbuzz:
@@ -164,7 +164,7 @@ src_configure() {
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
- -opengl $(usex gles2 es2 desktop)
+ -opengl $(usex gles2-only es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
