Update to wpewebkit 2.26.x on poky warrior

.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 = warrior
 [submodule "base-image/poky"]
 	path = base-image/poky
 	url = git://git.yoctoproject.org/poky
-	branch = sumo
+	branch = warrior
 [submodule "base-image/meta-raspberrypi"]
 	path = base-image/meta-raspberrypi
 	url = git://git.yoctoproject.org/meta-raspberrypi
-	branch = sumo
-[submodule "base-image/meta-gstreamer1.0"]
-	path = base-image/meta-gstreamer1.0
-	url = https://github.com/OSSystems/meta-gstreamer1.0
-	branch = sumo
+	branch = warrior
+[submodule "base-image/meta-qt5"]
+	path = base-image/meta-qt5
+	url = https://github.com/meta-qt5/meta-qt5.git
+	branch = warrior
 [submodule "base-image/meta-webkit"]
 	path = base-image/meta-webkit
 	url = https://github.com/Igalia/meta-webkit
-	branch = sumo
+	branch = master

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 = "sumo thud warrior"

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

@@ -12,7 +12,7 @@ BBLAYERS ?= " \
   ${TOPDIR}/../meta-raspberrypi \
   ${TOPDIR}/../meta-webkit \
   ${TOPDIR}/../meta-resin-wpe \
-  ${TOPDIR}/../meta-gstreamer1.0 \
+  ${TOPDIR}/../meta-qt5 \
   ${TOPDIR}/../meta-openembedded/meta-oe \
   ${TOPDIR}/../meta-openembedded/meta-python \
   "

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

@@ -32,18 +32,21 @@ DISTRO_FEATURES_append = " opengl wayland"
 IMAGE_FEATURES_append = " hwcodecs"
 
 # Use proprietary Broadcom OpenGL drivers and wpebackend-rdk
+MACHINE_FEATURES_remove = "vc4graphics"
 PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-rdk"
 PACKAGECONFIG_pn-wpebackend-rdk = "rpi"
 
 # Enable H.264 decoding in hardware
 IMAGE_INSTALL_append = " gstreamer1.0-omx"
 LICENSE_FLAGS_WHITELIST_append = " commercial"
 
-# Enable accelerated 2D HTML5 canvas
+# Enable accelerated 2D HTML5 canvas (cannot specify both glesv2 and opengl for cairo)
 PACKAGECONFIG_append_pn-cairo = " glesv2 egl"
+PACKAGECONFIG_remove_pn-cairo = " opengl"
 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.4.%"
+PREFERRED_VERSION_libwpe = "1.4.%"
+PREFERRED_VERSION_wpewebkit = "2.26.%"
+

base-image/meta-resin-wpe/recipes-support/gnutls/gnutls_%.bbappend

@@ -0,0 +1,2 @@
+# We need to build GnuTLS with "system trust"
+EXTRA_OECONF += " --with-default-trust-store-dir=/etc/ssl/certs"

base-image/meta-resin-wpe/recipes-webkit/wpebackend-rdk/files/0002-WPEBackend-fix-wpe-version.patch

@@ -0,0 +1,31 @@
+From c275769547745e10b8fdb8bfb792d869c2469786 Mon Sep 17 00:00:00 2001
+From: Eric Stobbart <[email protected]>
+Date: Sun, 17 Mar 2019 14:04:57 -0700
+Subject: [PATCH] [cmake] find required WPE package
+
+---
+ cmake/FindWPE.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/FindWPE.cmake b/cmake/FindWPE.cmake
+index 7f4ffd2..a062481 100644
+--- a/cmake/FindWPE.cmake
++++ b/cmake/FindWPE.cmake
+@@ -29,7 +29,7 @@
+ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ find_package(PkgConfig)
+-pkg_check_modules(PC_WPE QUIET wpe-0.2)
++pkg_check_modules(PC_WPE QUIET wpe-1.0)
+
+ find_path(WPE_INCLUDE_DIRS
+     NAMES wpe/wpe.h
+@@ -37,7 +37,7 @@ find_path(WPE_INCLUDE_DIRS
+ )
+
+ find_library(WPE_LIBRARIES
+-    NAMES wpe-0.2
++    NAMES wpe-1.0
+     HINTS ${PC_WPE_LIBDIR} ${PC_WPE_LIBRARY_DIRS}
+ )
+

base-image/meta-resin-wpe/recipes-webkit/wpebackend-rdk/wpebackend-rdk_1.20180925.bbappend

@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/files"
+
+SRC_URI += " \
+	file://0002-WPEBackend-fix-wpe-version.patch \
+          "

wpe-init

@@ -12,18 +12,11 @@ if [ -f /sys/class/backlight/rpi_backlight/brightness ]; then
 	echo $RPI_BACKLIGHT > /sys/class/backlight/rpi_backlight/brightness
 fi
 
-# Writable directories. See documentation here:
-# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export HOME=/tmp/balena
-mkdir -p /tmp/balena/xdg_runtime
-chmod 0700 /tmp/balena/xdg_runtime
-export XDG_RUNTIME_DIR=/tmp/balena/xdg_runtime
-
 # Enable touch screen
 export WPE_BCMRPI_TOUCH=1
 
 # Start browser
-cog $WPE_URL &
+cog --cookie-store=always $WPE_URL &
 
 # Start Tohora
 ./tohora 8080 cog