wpebackend-rdk: Bump up version to 1.20210402

Signed-off-by: Pablo Saavedra <[email protected]>
Igalia · Jun 7, 2021 · 4ea4ef8 · 4ea4ef8
1 parent 5eed5ba
commit 4ea4ef8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/recipes-browser/wpebackend-rdk/wpebackend-rdk.inc b/recipes-browser/wpebackend-rdk/wpebackend-rdk.inc
@@ -6,16 +6,31 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://src/wayland/display.h;;beginline=5;endline=24;md5=b1c8cb6b0857048a21b33611f01c575a"
 
 SRC_URI = "git://github.com/WebPlatformForEmbedded/WPEBackend-rdk.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
 
 PROVIDES += "virtual/wpebackend"
 RPROVIDES_${PN} += "virtual/wpebackend"
 
-DEPENDS = "libwpe glib-2.0 libinput"
+DEPENDS = "libwpe glib-2.0"
 
 inherit cmake pkgconfig
 
+PACKAGECONFIG ?= "wayland virtualinput"
 
-PACKAGECONFIG ?= "wayland"
+# Wayland selectors
+PACKAGECONFIG[wpeframework] = "-DUSE_BACKEND_WPEFRAMEWORK=ON -DUSE_KEY_INPUT_HANDLING_LINUX_INPUT=OFF -DUSE_INPUT_LIBINPUT=OFF,,wpeframework-clientlibraries wpeframework-plugins libxkbcommon xkeyboard-config"
+
+# other switches
+PACKAGECONFIG[debug]            = "-DCMAKE_BUILD_TYPE=Debug,-DCMAKE_BUILD_TYPE=Release,"
+PACKAGECONFIG[libinput]         = "-DUSE_INPUT_LIBINPUT=ON,-DUSE_INPUT_LIBINPUT=OFF,libinput,"
+PACKAGECONFIG[libinput-udev]    = "-DUSE_INPUT_UDEV=ON,-DUSE_INPUT_UDEV=OFF,libinput eudev,"
+PACKAGECONFIG[virtualinput]     = "-DUSE_VIRTUAL_KEYBOARD=ON,-DUSE_VIRTUAL_KEYBOARD=OFF,wpeframework-clientlibraries,"
+
+# MESA
+PACKAGECONFIG[westeros-mesa]    = "-DUSE_BACKEND_WESTEROS_MESA=ON,,"
+
+# FIXME RDEPENDS on PACKAGECONFIG is not behaving as it should
+RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'wpeframework', 'xkeyboard-config', '', d)}"
 
 # device specific backends
 PACKAGECONFIG[intelce] = "-DUSE_BACKEND_INTEL_CE=ON -DUSE_KEY_INPUT_HANDLING_LINUX_INPUT=ON,,intelce-display"

diff --git a/recipes-browser/wpebackend-rdk/wpebackend-rdk_1.20200213.bb b/recipes-browser/wpebackend-rdk/wpebackend-rdk_1.20200213.bb
@@ -1,19 +1,6 @@
 require wpebackend-rdk.inc
 
-DEPENDS = "libwpe glib-2.0 libinput"
-
-PV = "1.20200213"
 SRCREV = "3ec8dfd1a1f1cede256fd5de0a63a8c6b6a31ffa"
 
-SRC_URI = "git://github.com/WebPlatformForEmbedded/WPEBackend-rdk.git;protocol=https;branch=master"
-
-S = "${WORKDIR}/git"
-
-BBCLASSEXTEND += "devupstream:target"
-
-PROVIDES_append_class-devupstream = " virtual/wpebackend"
-
-SRC_URI_class-devupstream = "git://github.com/WebPlatformForEmbedded/WPEBackend-rdk.git;protocol=https;branch=master"
-SRCREV_class-devupstream = "3ec8dfd1a1f1cede256fd5de0a63a8c6b6a31ffa"
+PV = "1.20200213"
 
-RPROVIDES_${PN}_append_class-devupstream += "virtual/wpebackend"
diff --git a/recipes-browser/wpebackend-rdk/wpebackend-rdk_1.20210402.bb b/recipes-browser/wpebackend-rdk/wpebackend-rdk_1.20210402.bb
@@ -0,0 +1,12 @@
+require wpebackend-rdk.inc
+
+SRCREV = "196f75360b8643b119d8d96208d914998e5d4fc9"
+
+PV = "1.20210402"
+
+# devupstream
+BBCLASSEXTEND += "devupstream:target"
+PROVIDES_append_class-devupstream = " virtual/wpebackend"
+SRC_URI_class-devupstream = "git://github.com/WebPlatformForEmbedded/WPEBackend-rdk.git;protocol=https;branch=master"
+SRCREV_class-devupstream = "196f75360b8643b119d8d96208d914998e5d4fc9"
+RPROVIDES_${PN}_append_class-devupstream += "virtual/wpebackend"