WIP: Update to latest meta-webkit (hardknott compatibility)

.gitmodules

@@ -1,20 +1,20 @@
 [submodule "base-image/meta-openembedded"]
 	path = base-image/meta-openembedded
 	url = git://git.openembedded.org/meta-openembedded
-	branch = sumo
+	branch = hardknott
 [submodule "base-image/poky"]
 	path = base-image/poky
 	url = git://git.yoctoproject.org/poky
-	branch = sumo
+	branch = hardknott
 [submodule "base-image/meta-raspberrypi"]
 	path = base-image/meta-raspberrypi
 	url = git://git.yoctoproject.org/meta-raspberrypi
-	branch = sumo
+	branch = hardknott
 [submodule "base-image/meta-gstreamer1.0"]
 	path = base-image/meta-gstreamer1.0
 	url = https://github.com/OSSystems/meta-gstreamer1.0
-	branch = sumo
+	branch = master
 [submodule "base-image/meta-webkit"]
 	path = base-image/meta-webkit
 	url = https://github.com/Igalia/meta-webkit
-	branch = sumo
+	branch = main

base-image/meta-resin-wpe/conf/layer.conf

@@ -7,4 +7,4 @@ BBFILE_COLLECTIONS += "resin-wpe"
 BBFILE_PATTERN_resin-wpe := "^${LAYERDIR}/"
 BBFILE_PRIORITY_resin-wpe = "99"
 
-LAYERSERIES_COMPAT_resin-wpe = "sumo"
+LAYERSERIES_COMPAT_resin-wpe = "hardknott"

base-image/meta-resin-wpe/conf/samples/local.conf.sample

@@ -26,14 +26,19 @@ PATCHRESOLVE = "noop"
 
 CONF_VERSION = "1"
 
-DISTRO_FEATURES_append = " opengl wayland"
+DISTRO_FEATURES_append = " opengl egl"
+DISTRO_FEATURES_remove = " x11"
 
 # Install hardware acceleration codecs
 IMAGE_FEATURES_append = " hwcodecs"
 
 # Use proprietary Broadcom OpenGL drivers and wpebackend-rdk
 PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-rdk"
-PACKAGECONFIG_pn-wpebackend-rdk = "rpi"
+PACKAGECONFIG_pn-wpebackend-rdk = "rpi libinput libinput-udev"
+DISABLE_VC4GRAPHICS = "1"
+
+# Disable Mesa GBM
+PACKAGECONFIG_remove_pn-mesa-gl = " gbm"
 
 # Enable H.264 decoding in hardware
 IMAGE_INSTALL_append = " gstreamer1.0-omx"
@@ -44,6 +49,6 @@ PACKAGECONFIG_append_pn-cairo = " glesv2 egl"
 PACKAGECONFIG_append_pn-wpewebkit = " 2dcanvas"
 
 # Specify versions
-PREFERRED_VERSION_cog = "0.2.%"
-PREFERRED_VERSION_libwpe = "1.0.%"
-PREFERRED_VERSION_wpewebkit = "2.22.%"
+PREFERRED_VERSION_cog = "0.10.%"
+PREFERRED_VERSION_libwpe = "1.10.%"
+PREFERRED_VERSION_wpewebkit = "2.32.%"