commit: 8f6c1cfa60a003d005f648a2e0c55d76baec0216 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Sep 17 01:39:52 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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
