NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/gstreamer1/gst1-plugins-bad: add wpe plugin option

Browse Source 
Removed gst1-plugins-bad dependency from wpewebkit gstreamer-gl option
so that there isn't a circular dependency with gst1-plugins-bad.

It appears that wpewebkit gstreamer-gl only has a runtime dependency on
gst1-plugins-bad.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
James Hilliard 2019-06-04 23:51:25 -06:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 2b1c847e2f
commit 11a290b589
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/gstreamer1/gst1-plugins-bad/Config.in
View File

@ -591,6 +591,16 @@ comment "webrtcdsp needs a toolchain w/ C++, NPTL, gcc >= 4.8"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WPE
bool "wpe"
default y
depends on BR2_PACKAGE_WPEWEBKIT
depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL
comment "wpe needs the gst1-plugins-base opengl library and wpewebkit"
depends on !BR2_PACKAGE_WPEWEBKIT \
|| !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265
bool "x265" bool "x265"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP

7
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
View File

@ -698,6 +698,13 @@ else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtcdsp GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtcdsp
endif endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WPE),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-wpe
GST1_PLUGINS_BAD_DEPENDENCIES += wpewebkit
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-wpe
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y) ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-x265 GST1_PLUGINS_BAD_CONF_OPTS += --enable-x265
GST1_PLUGINS_BAD_DEPENDENCIES += x265 GST1_PLUGINS_BAD_DEPENDENCIES += x265

1
package/wpewebkit/wpewebkit.mk
View File

@ -34,7 +34,6 @@ endif
ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y) ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y)
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=ON WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=ON
WPEWEBKIT_DEPENDENCIES += gst1-plugins-bad
else else
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
endif endif