meta-qt6 uprev: bring back dynamic layer and re-enable wayland-egl as default

This brings back the dynamic layer for qt6 and sets our default to
wayland-egl. The QtLocation bbappend has been dropped, as the MapBox
backend is no longer supported.

This fixes the apps being displayed.

Bug-AGL: SPEC-5294
Change-Id: I214f63ebaf2186cdd5281361cbe31c0c8c8bcda5
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30540
ci-image-build: Jenkins Job builder account
Tested-by: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account

7 files changed, 14 insertions, 76 deletions

diff --git a/meta-agl-core/conf/layer.conf b/meta-agl-core/conf/layer.conf
index 6a0b20d97..a354fbe33 100644
--- a/meta-agl-core/conf/layer.conf
+++ b/meta-agl-core/conf/layer.conf
@@ -16,11 +16,9 @@ BBFILES_DYNAMIC += " \
     selinux:${LAYERDIR}/dynamic-layers/meta-selinux/*/*/*.bb \
     selinux:${LAYERDIR}/dynamic-layers/meta-selinux/*/*/*.bbappend \
     \
+    qt6-layer:${LAYERDIR}/dynamic-layers/meta-qt6/*/*/*.bb \
+    qt6-layer:${LAYERDIR}/dynamic-layers/meta-qt6/*/*/*.bbappend \
 "
-# migrate to meta-qt6
-#    qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bb \
-#    qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bbappend \
-#
 
 LAYERSERIES_COMPAT_aglcore = "scarthgap"
 LAYERDEPENDS_aglcore = "core"
diff --git a/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtbase_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtbase_aglcore.inc
deleted file mode 100644
index 581f5de99..000000000
--- a/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtbase_aglcore.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/qtbase:"
-
-PACKAGECONFIG_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
-
-PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
-
-PACKAGECONFIG:append = " ${PACKAGECONFIG_WAYLAND}"
-
-# '-qpa wayland-egl' set wayland-egl as default of platform plugins
-PACKAGECONFIG[wayland]="-qpa wayland-egl -no-qpa-platform-guard"
diff --git a/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation/0001-mapbox-update-API-url-to-match-new-schema.patch b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation/0001-mapbox-update-API-url-to-match-new-schema.patch
deleted file mode 100644
index ba8a991ed..000000000
--- a/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation/0001-mapbox-update-API-url-to-match-new-schema.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 58197439eade86e7efc6fe98116c0092ea429d29 Mon Sep 17 00:00:00 2001
-From: Matt Ranostay <matt.ranostay@konsulko.com>
-Date: Tue, 10 Mar 2020 13:59:58 -0700
-Subject: [PATCH] mapbox: update API url to match new schema
-
----
- src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp | 7 ++++---
- src/plugins/geoservices/mapbox/qmapboxcommon.h           | 2 +-
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp b/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp
-index 0b128556..bd2be6b6 100644
---- a/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp
-+++ b/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.cpp
-@@ -88,12 +88,13 @@ QGeoTiledMapReply *QGeoTileFetcherMapbox::getTileImage(const QGeoTileSpec &spec)
-     request.setRawHeader("User-Agent", m_userAgent);
- 
-     request.setUrl(QUrl(mapboxTilesApiPath +
--                        ((spec.mapId() >= m_mapIds.size()) ? QStringLiteral("mapbox.streets") : m_mapIds[spec.mapId() - 1]) + QLatin1Char('/') +
-+                        m_mapIds[m_mapIds.size() - 1] +
-+                        QStringLiteral("/tiles/256/") +
-                         QString::number(spec.zoom()) + QLatin1Char('/') +
-                         QString::number(spec.x()) + QLatin1Char('/') +
-                         QString::number(spec.y()) +
--                        ((m_scaleFactor > 1) ? (QLatin1Char('@') + QString::number(m_scaleFactor) + QLatin1String("x.")) : QLatin1String(".")) +
--                        m_format + QLatin1Char('?') +
-+                        ((m_scaleFactor > 1) ? (QLatin1Char('@') + QString::number(m_scaleFactor) + QLatin1String("x")) : QLatin1String("")) +
-+                        QLatin1Char('?') +
-                         QStringLiteral("access_token=") + m_accessToken));
- 
-     QNetworkReply *reply = m_networkManager->get(request);
-diff --git a/src/plugins/geoservices/mapbox/qmapboxcommon.h b/src/plugins/geoservices/mapbox/qmapboxcommon.h
-index e60c4e83..4b2ea98d 100644
---- a/src/plugins/geoservices/mapbox/qmapboxcommon.h
-+++ b/src/plugins/geoservices/mapbox/qmapboxcommon.h
-@@ -46,7 +46,7 @@
- 
- QT_BEGIN_NAMESPACE
- 
--static const QString mapboxTilesApiPath = QStringLiteral("http://api.tiles.mapbox.com/v4/");
-+static const QString mapboxTilesApiPath = QStringLiteral("https://api.mapbox.com/");
- 
- // https://www.mapbox.com/api-documentation/#geocoding
- static const QString mapboxGeocodingApiPath = QStringLiteral("https://api.mapbox.com/geocoding/v5/mapbox.places/");
--- 
-2.25.0
-
diff --git a/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation_%.bbappend b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation_%.bbappend
deleted file mode 100644
index a0d80075a..000000000
--- a/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'qtlocation_aglcore.inc', '', d)}
diff --git a/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation_aglcore.inc
deleted file mode 100644
index 60867aef0..000000000
--- a/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtlocation_aglcore.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/qtlocation:"
-
-SRC_URI += "\
-    file://0001-mapbox-update-API-url-to-match-new-schema.patch \
-    "
-
-# Need to explicitly enable the various plugins
-PACKAGECONFIG += " \
-	geoservices_osm \
-	geoservices_here \
-	geoservices_itemsoverlay \
-	geoservices_mapbox \
-	geoservices_mapboxgl \
-"
diff --git a/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtbase_%.bbappend b/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_%.bbappend
index aab944c2f..aab944c2f 100644
--- a/meta-agl-core/dynamic-layers/meta-qt5.to_migrate_to_meta-qt6/recipes-qt/qt5/qtbase_%.bbappend
+++ b/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_%.bbappend
diff --git a/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_aglcore.inc
new file mode 100644
index 000000000..aa8bf1d59
--- /dev/null
+++ b/meta-agl-core/dynamic-layers/meta-qt6/recipes-qt/qt6/qtbase_aglcore.inc
@@ -0,0 +1,12 @@
+
+QT_QPA_DEFAULT_PLATFORM = "wayland-egl"
+
+
+
+# OLD
+#FILESEXTRAPATHS:prepend := "${THISDIR}/qtbase:"
+#PACKAGECONFIG_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
+#PACKAGECONFIG:append = " ${PACKAGECONFIG_WAYLAND}"
+# '-qpa wayland-egl' set wayland-egl as default of platform plugins
+#PACKAGECONFIG[wayland]="-qpa wayland-egl -no-qpa-platform-guard"
+#PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"