From 221223ca19a28582d3b37de3e36ff692168c0226 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sat, 23 Nov 2019 10:26:18 +0100 Subject: [PATCH] dev-qt/qtgui: rename USE=gles2 to USE=gles2-only Signed-off-by: Haelwenn (lanodan) Monnier Closes: https://github.com/gentoo/gentoo/pull/13742 Signed-off-by: Andreas Sturmlechner --- dev-qt/qtgui/metadata.xml | 1 - .../{qtgui-5.13.2.ebuild => qtgui-5.13.2-r1.ebuild} | 12 ++++++------ ...qtgui-5.14.1-r3.ebuild => qtgui-5.14.1-r4.ebuild} | 12 ++++++------ 3 files changed, 12 insertions(+), 13 deletions(-) rename dev-qt/qtgui/{qtgui-5.13.2.ebuild => qtgui-5.13.2-r1.ebuild} (94%) rename dev-qt/qtgui/{qtgui-5.14.1-r3.ebuild => qtgui-5.14.1-r4.ebuild} (94%) diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index 0ff1bae4e4d8..f785d85e8c4a 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -9,7 +9,6 @@ Enable EGL integration Build the EGL Full Screen/Single Surface platform plugin Enable support for input devices via evdev - Use GLES 2.0 or later instead of full OpenGL Build the IBus input method plugin Enable support for input devices via dev-libs/libinput Enable support for touchscreen devices via x11-libs/tslib diff --git a/dev-qt/qtgui/qtgui-5.13.2.ebuild b/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild similarity index 94% rename from dev-qt/qtgui/qtgui-5.13.2.ebuild rename to dev-qt/qtgui/qtgui-5.13.2-r1.ebuild index ec493f247cbc..e296604eeff4 100644 --- a/dev-qt/qtgui/qtgui-5.13.2.ebuild +++ b/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild @@ -13,7 +13,7 @@ fi # TODO: linuxfb -IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus +IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" REQUIRED_USE=" || ( eglfs xcb ) @@ -21,7 +21,7 @@ REQUIRED_USE=" eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) - xcb? ( gles2? ( egl ) ) + xcb? ( gles2-only? ( egl ) ) " RDEPEND=" @@ -40,7 +40,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:= @@ -96,8 +96,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: @@ -165,7 +165,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.14.1-r3.ebuild b/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild similarity index 94% rename from dev-qt/qtgui/qtgui-5.14.1-r3.ebuild rename to dev-qt/qtgui/qtgui-5.14.1-r4.ebuild index b0882bb75c58..59370d3b5715 100644 --- a/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild +++ b/dev-qt/qtgui/qtgui-5.14.1-r4.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 ) ) " COMMON_DEPEND=" @@ -42,7 +42,7 @@ COMMON_DEPEND=" 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:= @@ -106,8 +106,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: @@ -176,7 +176,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 vulkan) -- 2.26.2