Skip to content

Fixes to be able to build without wpeframework #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes to be able to build without wpeframework #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions package/wpe/wpebackend-rdk/wpebackend-rdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
8 changes: 5 additions & 3 deletions package/wpe/wpewebkit/wpewebkit.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 \
Expand Down