From fbf9463418ad87461c790c0ad65d8b834d47f556 Mon Sep 17 00:00:00 2001 From: Guillaume Emont Date: Fri, 9 Jul 2021 11:42:34 +0000 Subject: [PATCH] Fixes to be able to build without wpeframework Building without wpeframework can be useful for some development and testing tasks. --- package/wpe/wpebackend-rdk/wpebackend-rdk.mk | 5 +++-- package/wpe/wpewebkit/wpewebkit.mk | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/wpe/wpebackend-rdk/wpebackend-rdk.mk b/package/wpe/wpebackend-rdk/wpebackend-rdk.mk index e2c9568a45ea..4706a6b28c03 100644 --- a/package/wpe/wpebackend-rdk/wpebackend-rdk.mk +++ b/package/wpe/wpebackend-rdk/wpebackend-rdk.mk @@ -43,13 +43,13 @@ ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WESTEROS)$(BR2_PACKAGE_WPEFRAMEWORK_CO 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_DEPENDENCIES += wayland westeros libinput WPEBACKEND_RDK_FLAGS +=-DUSE_BACKEND_WESTEROS=ON -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_WESTEROS_SINK=OFF else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITORCLIENT),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_DEPENDENCIES += libegl libinput WPEBACKEND_RDK_FLAGS += -DUSE_BACKEND_BCM_RPI=ON endif @@ -75,6 +75,7 @@ else WPEBACKEND_RDK_FLAGS += -DUSE_INPUT_LIBINPUT=OFF else WPEBACKEND_RDK_FLAGS += -DUSE_INPUT_LIBINPUT=ON + WPEBACKEND_RDK_DEPENDENCIES += libinput endif endif diff --git a/package/wpe/wpewebkit/wpewebkit.mk b/package/wpe/wpewebkit/wpewebkit.mk index 33ee281caadd..93b1baf89f46 100644 --- a/package/wpe/wpewebkit/wpewebkit.mk +++ b/package/wpe/wpewebkit/wpewebkit.mk @@ -97,7 +97,10 @@ endif ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDM),y) WPEWEBKIT_DEPENDENCIES += wpeframework-clientlibraries -WPEWEBKIT_FLAGS += -DENABLE_OPENCDM=ON +WPEWEBKIT_FLAGS += -DENABLE_OPENCDM=ON \ + -DENABLE_THUNDER=ON +else +WPEWEBKIT_FLAGS += -DENABLE_OPENCDM=OFF endif ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y) @@ -131,10 +134,9 @@ WPEWEBKIT_FLAGS += \ -DENABLE_MEDIA_SOURCE=ON \ -DENABLE_ENCRYPTED_MEDIA=ON \ -DENABLE_MEDIA_STATISTICS=ON \ - -DENABLE_THUNDER=ON \ -DENABLE_WEB_AUDIO=ON WPEWEBKIT_DEPENDENCIES += gstreamer1 gst1-plugins-base \ - gst1-plugins-good wpeframework-clientlibraries + gst1-plugins-good else WPEWEBKIT_FLAGS += \ -DENABLE_VIDEO=OFF \