From 3c00c226e01f3f8d22ff62a41e56c46183b0c561 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Sep 2021 06:25:47 -0600 Subject: [PATCH] package/wpewebkit: add option to enable media-stream This has a compile time dependency on gst1-plugins-bad due to the codecparsers dependency. We need to prevent the wpe plugin from being selected when wpewebkit media-stream support is enabled as the wpe plugin requires wpewebkit which would create a circular dependency with gst1-plugins-bad. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 7749e73b9acf35a11c9abaae86649c6333def88d) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++++ package/wpewebkit/Config.in | 5 +++++ package/wpewebkit/wpewebkit.mk | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index ba20da7a2d..1204a65681 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -647,11 +647,17 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WPE default y depends on BR2_PACKAGE_WPEWEBKIT depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL + depends on !BR2_PACKAGE_WPEWEBKIT_MEDIA_STREAM comment "wpe needs the gst1-plugins-base opengl library and wpewebkit" depends on !BR2_PACKAGE_WPEWEBKIT \ || !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL +comment "wpe is incompatible w/ wpewebkit media-stream support" + depends on BR2_PACKAGE_WPEWEBKIT + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL + depends on BR2_PACKAGE_WPEWEBKIT_MEDIA_STREAM + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS bool "v4l2codecs" depends on BR2_PACKAGE_HAS_UDEV # libgudev diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 04b2bf3beb..6fc1e668fd 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -107,6 +107,11 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA if BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA +config BR2_PACKAGE_WPEWEBKIT_MEDIA_STREAM + bool "media-stream support" + help + This option enables media-stream support. + config BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL bool "use gstreamer-gl" default y diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 5c5e6625f8..9ad569a472 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -46,6 +46,13 @@ WPEWEBKIT_CONF_OPTS += \ -DENABLE_WEB_AUDIO=OFF endif +ifeq ($(BR2_PACKAGE_WPEWEBKIT_MEDIA_STREAM),y) +WPEWEBKIT_CONF_OPTS += -DENABLE_MEDIA_STREAM=ON +WPEWEBKIT_DEPENDENCIES += gst1-plugins-bad +else +WPEWEBKIT_CONF_OPTS += -DENABLE_MEDIA_STREAM=OFF +endif + ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y) WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=ON else