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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E5D0F15814C for ; Sun, 17 Sep 2023 02:00:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C523D2BC015; Sun, 17 Sep 2023 02:00:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A29AA2BC015 for ; Sun, 17 Sep 2023 02:00:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB9C7335D21 for ; Sun, 17 Sep 2023 02:00:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 377CD11C7 for ; Sun, 17 Sep 2023 01:59:59 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1694915869.8f6c1cfa60a003d005f648a2e0c55d76baec0216.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtbase/qtbase-6.5.2-r2.ebuild dev-qt/qtbase/qtbase-6.5.9999.ebuild dev-qt/qtbase/qtbase-6.6.9999.ebuild dev-qt/qtbase/qtbase-6.9999.ebuild X-VCS-Directories: dev-qt/qtbase/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 8f6c1cfa60a003d005f648a2e0c55d76baec0216 X-VCS-Branch: master Date: Sun, 17 Sep 2023 01:59:59 +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: 149c57e4-f9da-44cd-ad57-d8e41e980d11 X-Archives-Hash: f9a29914983bee7efa10aa3fa2a78843 commit: 8f6c1cfa60a003d005f648a2e0c55d76baec0216 Author: Ionen Wolkens gentoo org> AuthorDate: Sun Sep 17 01:39:52 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sun Sep 17 01:57:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6c1cfa dev-qt/qtbase: use INPUT_opengl only to manipulate opengl options Individual features will be set based on this. Technically enabling QT_FEATURE_onlygles2 is a no-op without enabling opengl too, but it can confuse other packages into believing they can use it. Technically needs a revbump (qtdeclarative will keep failing until qtbase is rebuilt), but skipping given qtbase is a long rebuild and [gles2-only,-opengl] should be scarcely used. Closes: https://bugs.gentoo.org/914334 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 4 +--- dev-qt/qtbase/qtbase-6.5.9999.ebuild | 4 +--- dev-qt/qtbase/qtbase-6.6.9999.ebuild | 4 +--- dev-qt/qtbase/qtbase-6.9999.ebuild | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild index fe37d3d61bf9..d9c63889768c 100644 --- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild +++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild @@ -192,13 +192,11 @@ src_configure() { $(qt_feature eglfs) $(qt_feature evdev) $(qt_feature evdev mtdev) - $(qt_feature gles2-only opengles2) $(qt_feature libinput) - $(qt_feature opengl) - $(usev !opengl -DINPUT_opengl=no) #913691 $(qt_feature tslib) $(qt_feature vulkan) $(qt_feature widgets) + -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c ) && use widgets && mycmakeargs+=( $(qt_feature cups) # qtprintsupport is enabled w/ gui+widgets diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild index d7374a33f357..6f4b1146e6ae 100644 --- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild @@ -190,13 +190,11 @@ src_configure() { $(qt_feature eglfs) $(qt_feature evdev) $(qt_feature evdev mtdev) - $(qt_feature gles2-only opengles2) $(qt_feature libinput) - $(qt_feature opengl) - $(usev !opengl -DINPUT_opengl=no) #913691 $(qt_feature tslib) $(qt_feature vulkan) $(qt_feature widgets) + -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c ) && use widgets && mycmakeargs+=( $(qt_feature cups) # qtprintsupport is enabled w/ gui+widgets diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild index 8580c287a200..912bab574b4d 100644 --- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild @@ -190,13 +190,11 @@ src_configure() { $(qt_feature eglfs) $(qt_feature evdev) $(qt_feature evdev mtdev) - $(qt_feature gles2-only opengles2) $(qt_feature libinput) - $(qt_feature opengl) - $(usev !opengl -DINPUT_opengl=no) #913691 $(qt_feature tslib) $(qt_feature vulkan) $(qt_feature widgets) + -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c ) && use widgets && mycmakeargs+=( $(qt_feature cups) # qtprintsupport is enabled w/ gui+widgets diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index b02ce128351b..788fc8ddd22f 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -192,14 +192,12 @@ src_configure() { $(qt_feature eglfs) $(qt_feature evdev) $(qt_feature evdev mtdev) - $(qt_feature gles2-only opengles2) $(qt_feature libinput) - $(qt_feature opengl) - $(usev !opengl -DINPUT_opengl=no) #913691 $(qt_feature renderdoc graphicsframecapture) $(qt_feature tslib) $(qt_feature vulkan) $(qt_feature widgets) + -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c ) && use widgets && mycmakeargs+=( $(qt_feature cups) # qtprintsupport is enabled w/ gui+widgets