wpebackend-rdk

.diff

# $ git diff stable master package/wpe/wpebackend-rdk/wpebackend-rdk.mk
# The stable branch still uses WPELauncher, the master branch uses WPEFramework
# They build wpebackend-rdk differently

diff --git a/package/wpe/wpebackend-rdk/wpebackend-rdk.mk b/package/wpe/wpebackend-rdk/wpebackend-rdk.mk
index 5469664227..95821db3fd 100644
--- a/package/wpe/wpebackend-rdk/wpebackend-rdk.mk
+++ b/package/wpe/wpebackend-rdk/wpebackend-rdk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEBACKEND_RDK_VERSION = 1abc9e3168844b7f9e3b594f6e6056b5917f16a5
+WPEBACKEND_RDK_VERSION = 0b628970fbcdd0346557db630fc07e909f9dd38b
 WPEBACKEND_RDK_SITE = $(call github,WebPlatformForEmbedded,WPEBackend-rdk,$(WPEBACKEND_RDK_VERSION))
 WPEBACKEND_RDK_INSTALL_STAGING = YES
 WPEBACKEND_RDK_DEPENDENCIES = wpebackend libglib2
@@ -12,9 +12,7 @@ WPEBACKEND_RDK_DEPENDENCIES = wpebackend libglib2
 WPEBACKEND_RDK_FLAGS = 
 
 ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y)
-WPEBACKEND_RDK_DEPENDENCIES += libxkbcommon xkeyboard-config
-else
-WPEBACKEND_RDK_FLAGS += -DUSE_KEY_INPUT_HANDLING_LINUX_INPUT=ON
+WPEBACKEND_RDK_DEPENDENCIES += xkeyboard-config
 endif
 
 ifeq ($(BR2_PACKAGE_GLUELOGIC_VIRTUAL_KEYBOARD),y)
@@ -30,12 +28,15 @@ endif
 # USE_BACKEND_WESTEROS or USE_BACKEND_BCM_RPI
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 
-ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WESTEROS)$(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR),yyn)
-WPEBACKEND_RDK_DEPENDENCIES += wayland westeros libxkbcommon
-WPEBACKEND_RDK_FLAGS +=-DUSE_BACKEND_WESTEROS=ON -DUSE_KEY_INPUT_HANDLING_LINUX_INPUT=OFF -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_WESTEROS_SINK=OFF
-else ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WESTEROS)$(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR),yyy)
-WPEBACKEND_RDK_DEPENDENCIES += libegl wayland westeros wpeframework-plugins libxkbcommon
-WPEBACKEND_RDK_FLAGS +=-DUSE_BACKEND_WPEFRAMEWORK=ON -DUSE_KEY_INPUT_HANDLING_LINUX_INPUT=OFF -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_INPUT_LIBINPUT=OFF
+ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WESTEROS)$(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR),yyy)
+WPEBACKEND_RDK_DEPENDENCIES += libegl wayland westeros wpeframework-plugins
+WPEBACKEND_RDK_FLAGS +=-DUSE_BACKEND_WPEFRAMEWORK=ON -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_INPUT_LIBINPUT=OFF
+else ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WESTEROS),yy)
+WPEBACKEND_RDK_DEPENDENCIES += wayland westeros
+WPEBACKEND_RDK_FLAGS +=-DUSE_BACKEND_WESTEROS=ON -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_WESTEROS_SINK=OFF
+else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR),y)
+WPEBACKEND_RDK_DEPENDENCIES += libegl wpeframework-plugins
+WPEBACKEND_RDK_FLAGS +=-DUSE_BACKEND_WPEFRAMEWORK=ON -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_INPUT_LIBINPUT=OFF
 else
 WPEBACKEND_RDK_DEPENDENCIES += libegl
 WPEBACKEND_RDK_FLAGS += -DUSE_BACKEND_BCM_RPI=ON
@@ -48,11 +49,15 @@ ifeq ($(BR2_PACKAGE_BCM_WESTON),y)
        WPEBACKEND_RDK_DEPENDENCIES += bcm-weston
        WPEBACKEND_RDK_FLAGS += -DUSE_BACKEND_BCM_NEXUS_WAYLAND=ON
 else ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WESTEROS)$(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR),yyn)
-       WPEBACKEND_RDK_DEPENDENCIES += wayland westeros libxkbcommon
-       WPEBACKEND_RDK_FLAGS +=-DUSE_BACKEND_WESTEROS=ON -DUSE_KEY_INPUT_HANDLING_LINUX_INPUT=OFF -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_WESTEROS_SINK=OFF
-else ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WESTEROS)$(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR),yyy)
-    WPEBACKEND_RDK_DEPENDENCIES += wayland westeros wpeframework-plugins libxkbcommon wayland-egl-bnxs bcm-refsw
-    WPEBACKEND_RDK_FLAGS +=-DUSE_BACKEND_WPEFRAMEWORK=ON -DUSE_KEY_INPUT_HANDLING_LINUX_INPUT=OFF -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_INPUT_LIBINPUT=OFF
+       WPEBACKEND_RDK_DEPENDENCIES += wayland westeros
+       WPEBACKEND_RDK_FLAGS +=-DUSE_BACKEND_WESTEROS=ON -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_WESTEROS_SINK=OFF
+else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR),y)
+    WPEBACKEND_RDK_DEPENDENCIES += wpeframework wpeframework-plugins bcm-refsw
+    WPEBACKEND_RDK_FLAGS +=-DUSE_BACKEND_WPEFRAMEWORK=ON -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_VIRTUAL_KEYBOARD=OFF -DUSE_INPUT_LIBINPUT=OFF
+
+    ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WESTEROS),yy)
+       WPEBACKEND_RDK_DEPENDENCIES += wayland westeros wayland-egl-bnxs 
+    endif
 else
     WPEBACKEND_RDK_FLAGS += -DUSE_BACKEND_BCM_NEXUS=ON 
     ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_VIRTUALINPUT),y)