jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-01 15:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

gst1-plugins-bad: fix openh264 handling

Browse Source 
Commit 301e8ffbb25 (gst1-plugins-bad: update configure options) added a sub
option for openh264, but didn't propagate the toolchain dependencies or add
any configure options.

Fix this and while we're at it also add a help text for the option.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2015-12-30 21:19:27 +01:00
parent 6fcb2c2329
commit 332d44a94f
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -595,7 +595,18 @@ comment "opencv plugin needs OpenCV-2.4"
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264
bool "openh264" bool "openh264"
depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS
depends on BR2_INSTALL_LIBSTDCPP # libopenh264
depends on !BR2_STATIC_LIBS # libopenh264
depends on BR2_TOOLCHAIN_HAS_THREADS # libopenh264
select BR2_PACKAGE_LIBOPENH264 select BR2_PACKAGE_LIBOPENH264
help
OpenH264 based encoding/decoding plugin
comment "openh264 plugin needs a toolchain w/ C++, dynamic library, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
BR2_STATIC_LIBS
depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG
bool "openjpeg" bool "openjpeg"

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

@ -714,6 +714,13 @@ else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-opencv GST1_PLUGINS_BAD_CONF_OPTS += --disable-opencv
endif endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-openh264
GST1_PLUGINS_BAD_DEPENDENCIES += libopenh264
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-openh264
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG),y) ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-openjpeg GST1_PLUGINS_BAD_CONF_OPTS += --enable-openjpeg
GST1_PLUGINS_BAD_DEPENDENCIES += openjpeg GST1_PLUGINS_BAD_DEPENDENCIES += openjpeg