From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42AD8138351 for ; Fri, 3 Apr 2020 20:03:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A3F4E0A9A; Fri, 3 Apr 2020 20:03:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 450BAE0A9A for ; Fri, 3 Apr 2020 20:03:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C343434F03C for ; Fri, 3 Apr 2020 20:03:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D3D88D for ; Fri, 3 Apr 2020 20:03:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1585850962.355d7fbccd6bf39726fd130b7ba530f4ffe9ecec.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtgui/metadata.xml dev-qt/qtgui/qtgui-5.14.9999.ebuild dev-qt/qtgui/qtgui-5.15.9999.ebuild dev-qt/qtgui/qtgui-5.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 355d7fbccd6bf39726fd130b7ba530f4ffe9ecec X-VCS-Branch: master Date: Fri, 3 Apr 2020 20:03:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7ca2b7ac-330e-46cb-85ae-012f168d696a X-Archives-Hash: 25b085f3e2fb8d1b079b9845b3ebbe1b commit: 355d7fbccd6bf39726fd130b7ba530f4ffe9ecec Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Nov 23 09:26:18 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 hacktivis.me> Signed-off-by: Andreas Sturmlechner 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 @@ 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.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)