qtbase: update opengl PACKAGECONFIGs

Remove patch and add separate PACKAGECONFIG for disabling opengl.
Rename desktop opengl to gl to match what meta-qt5 is using.

Change-Id: I3308efd0717da79c813dcbc681787d47932a7f3e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

2 files changed, 5 insertions, 29 deletions

diff --git a/recipes-qt/qt6/qtbase/0005-Allow-build-without-opengl.patch b/recipes-qt/qt6/qtbase/0005-Allow-build-without-opengl.patch
deleted file mode 100644
index d7fa093..0000000
--- a/recipes-qt/qt6/qtbase/0005-Allow-build-without-opengl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 170b41c7807e066ee294c03423a8b816b1d0ed59 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Fri, 20 Mar 2020 09:55:42 +0200
-Subject: [PATCH] Allow build without opengl
-
-Task-number: QTBUG-82982
-Change-Id: I10dd13d6cdc6e69b13925ad4f96c90e178695ef4
----
- src/gui/configure.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
-index bf9d0e71f1..bd43503855 100644
---- a/src/gui/configure.cmake
-+++ b/src/gui/configure.cmake
-@@ -1279,7 +1279,7 @@ qt_configure_add_report_entry(
- qt_configure_add_report_entry(
-     TYPE ERROR
-     MESSAGE "The OpenGL functionality tests failed!  You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL[_ES2], QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your platform."
--    CONDITION QT_FEATURE_gui AND NOT WATCHOS AND ( NOT INPUT_opengl STREQUAL 'no' ) AND NOT QT_FEATURE_opengl_desktop AND NOT QT_FEATURE_opengles2 AND NOT QT_FEATURE_opengl_dynamic
-+    CONDITION QT_FEATURE_gui AND NOT WATCHOS AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengl_desktop AND NOT QT_FEATURE_opengles2 AND NOT QT_FEATURE_opengl_dynamic
- )
- qt_configure_add_report_entry(
-     TYPE WARNING
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index eac6239..f6ec611 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -16,7 +16,6 @@ include recipes-qt/qt6/qt6-git.inc
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
-    file://0005-Allow-build-without-opengl.patch \
 "
 
 DEPENDS += "\
@@ -24,8 +23,8 @@ DEPENDS += "\
     pcre2 \
 "
 
-PACKAGECONFIG_class-native ?= "gui widgets png dbus"
-PACKAGECONFIG_class-nativesdk ?= "gui widgets png dbus"
+PACKAGECONFIG_class-native ?= "gui widgets png dbus no-opengl"
+PACKAGECONFIG_class-nativesdk ?= "gui widgets png dbus no-opengl"
 PACKAGECONFIG ?= "\
     ${PACKAGECONFIG_DEFAULT} \
     ${PACKAGECONFIG_GRAPHICS} \
@@ -39,7 +38,7 @@ PACKAGECONFIG ?= "\
 PACKAGECONFIG_GRAPHICS ?= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
-        bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'gles2', d), '', d)} \
+        bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'gles2', d), 'no-opengl', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
 "
 PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xkbcommon glib', '', d)}"
@@ -81,13 +80,14 @@ PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibili
 PACKAGECONFIG[directfb] = "-DFEATURE_directfb=ON,-DFEATURE_directfb=OFF,directfb"
 PACKAGECONFIG[fontconfig] = "-DFEATURE_fontconfig=ON,-DFEATURE_fontconfig=OFF,fontconfig"
 PACKAGECONFIG[gbm] = "-DFEATURE_gbm=ON,-DFEATURE_gbm=OFF,virtual/libgbm"
+PACKAGECONFIG[gl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
 PACKAGECONFIG[gles2] = "-DFEATURE_opengles2=ON,-DFEATURE_opengles2=OFF,virtual/libgles2 virtual/egl"
 PACKAGECONFIG[harfbuzz] = "-DFEATURE_harfbuzz=ON,-DFEATURE_harfbuzz=OFF,harfbuzz"
 PACKAGECONFIG[jpeg] = "-DFEATURE_jpeg=ON,-DFEATURE_jpeg=OFF,jpeg"
 PACKAGECONFIG[kms] = "-DFEATURE_kms=ON,-DFEATURE_kms=OFF,drm virtual/egl"
 PACKAGECONFIG[libinput] = "-DFEATURE_libinput=ON,-DFEATURE_libinput=OFF,libinput"
 PACKAGECONFIG[mtdev] = "-DFEATURE_mtdev=ON,-DFEATURE_mtdev=OFF,mtdev"
-PACKAGECONFIG[opengl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
+PACKAGECONFIG[no-opengl] = "-DINPUT_opengl=no"
 PACKAGECONFIG[png] = "-DFEATURE_png=ON,-DFEATURE_png=OFF,libpng"
 PACKAGECONFIG[tslib] = "-DFEATURE_tslib=ON,-DFEATURE_tslib=OFF,tslib"
 PACKAGECONFIG[vulkan] = "-DFEATURE_vulkan=ON,-DFEATURE_vulkan=OFF,vulkan-headers vulkan-loader"