[qtbase] support for android (#27421)

* [qtbase] support for android

* Fix opengl on android

* Make gles a feature

* Adjust android dependencies

* v.db

* Make ANDROID_SDK_ROOT available to all qt* ports

* v db

* naming and feature

* v db

* Gate gles2 `!windows`

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* v db

* !linux

* v db

* add qtbase[gles2] to ci for linux

* v db

* disable opengl_desktop if gles2 is set

* disable gles3

* v db

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

ports/qt/vcpkg.json

@@ -196,6 +196,13 @@
           ],
           "platform": "windows"
         },
+        {
+          "name": "qtbase",
+          "features": [
+            "gles2"
+          ],
+          "platform": "linux"
+        },
         {
           "name": "qtwayland",
           "features": [

ports/qtbase/cmake/qt_install_submodule.cmake

@@ -8,6 +8,10 @@ if(NOT DEFINED QT6_DIRECTORY_PREFIX)
     set(QT6_DIRECTORY_PREFIX "Qt6/")
 endif()
 
+if(VCPKG_TARGET_IS_ANDROID AND NOT ANDROID_SDK_ROOT)
+    message(FATAL_ERROR "${PORT} requires ANDROID_SDK_ROOT to be set. Consider adding it to the triplet." )
+endif()
+
 function(qt_download_submodule_impl)
     cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "SUBMODULE" "PATCHES")
 
@@ -123,6 +127,7 @@ function(qt_cmake_configure)
             -DINSTALL_LIBEXECDIR:STRING=bin
             -DINSTALL_PLUGINSDIR:STRING=${qt_plugindir}
             -DINSTALL_QMLDIR:STRING=${qt_qmldir}
+            -DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
             ${_qarg_OPTIONS}
         OPTIONS_RELEASE
             ${_qarg_OPTIONS_RELEASE}

ports/qtbase/portfile.cmake

@@ -146,6 +146,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
     "xkbcommon-x11"       FEATURE_xkbcommon_x11
     "xrender"             FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled. 
     "xrender"             FEATURE_xcb_native_painting # experimental
+    "gles2"               FEATURE_opengles2
     #"vulkan"              CMAKE_REQUIRE_FIND_PACKAGE_Vulkan
     #"egl"                 CMAKE_REQUIRE_FIND_PACKAGE_EGL
     #"fontconfig"          CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig
@@ -161,6 +162,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
     INVERTED_FEATURES
     "vulkan"              CMAKE_DISABLE_FIND_PACKAGE_Vulkan
     "egl"                 CMAKE_DISABLE_FIND_PACKAGE_EGL
+    "gles2"               CMAKE_DISABLE_FIND_PACKAGE_GLESv2
+    "gles2"               FEATURE_opengl_desktop
     "fontconfig"          CMAKE_DISABLE_FIND_PACKAGE_Fontconfig
     #"freetype"            CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated
     "harfbuzz"            CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz
@@ -185,7 +188,11 @@ if("xkb" IN_LIST FEATURES)
 else()
     list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xkbcommon=no)
 endif()
-list(APPEND FEATURE_GUI_OPTIONS )
+
+# Disable GLES3
+list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles3:BOOL=OFF)
+list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles31:BOOL=OFF)
+list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles32:BOOL=OFF)
 
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ATSPI2:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_DirectFB:BOOL=ON)
@@ -193,7 +200,6 @@ list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libdrm:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_gbm:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libinput:BOOL=ON)
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Mtdev:BOOL=ON)
-list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GLESv2:BOOL=ON) # only used if INPUT_opengl is correctly set
 list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON)
 # sql-drivers features:
 

ports/qtbase/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.3.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -121,6 +121,15 @@
             "xrender"
           ],
           "platform": "linux"
+        },
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "egl",
+            "gles2"
+          ],
+          "platform": "android"
         }
       ]
     },
@@ -162,6 +171,10 @@
         }
       ]
     },
+    "gles2": {
+      "description": "OpenGL ES 2.0",
+      "supports": "!windows"
+    },
     "glib": {
       "description": "GLib",
       "dependencies": [

versions/baseline.json

@@ -6218,7 +6218,7 @@
     },
     "qtbase": {
       "baseline": "6.3.2",
-      "port-version": 1
+      "port-version": 2
     },
     "qtcharts": {
       "baseline": "6.3.2",

versions/q-/qt.json

@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "dc6a4c7e1ff449ba08297582c31a2add75d1d87b",
+      "git-tree": "3d1f292c90218f1cf71b84cfba2ec4b8a741b90b",
       "version": "6.3.2",
       "port-version": 1
     },

versions/q-/qtbase.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fdd5dc4e0a94cae2b27acd08ea0c4a7453a6519d",
+      "version": "6.3.2",
+      "port-version": 2
+    },
     {
       "git-tree": "02656542bbdef8469f5a461b1523c4111f0841b3",
       "version": "6.3.2",