jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 16:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/gstreamer1/gst1-plugins-bad: bluez-plugin depends on bluez5_utils

Browse Source 
autotools doesn't throw an error if bluez_utils is found and is older than
version 5. It just doesn't build the plugin. As such, select bluez5_utils
instead. This was found with the meson conversion, because meson does
throw an error.

All dependencies of bluez5_utils are added, though some of them are
already implicit by gstreamer1 itself. This simplifies things if the
dependencies change in the future (suggested by Thomas).

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
[Arnout: add bluez5_utils comment to dependencies, extend commit log]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Adam Duskett 2019-05-28 23:56:47 -04:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent afc0b3838f
commit 7c28f2d659
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,17 +310,25 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ
bool "bluez" bool "bluez"
depends on !BR2_STATIC_LIBS # bluez_utils depends on BR2_USE_WCHAR # bluez5_utils -> libglib2
depends on BR2_USE_WCHAR # bluez_utils depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils depends on BR2_USE_MMU # bluez5_utils -> dbus
depends on BR2_USE_MMU # bluez_utils depends on !BR2_STATIC_LIBS # bluez5_utils -> uses dlfcn
select BR2_PACKAGE_BLUEZ_UTILS depends on !BR2_PACKAGE_BLUEZ_UTILS # bluez5_utils -> conflicts with 4.x version
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils
select BR2_PACKAGE_BLUEZ5_UTILS
help help
Bluetooth audio A2DP/AVDTP sink, AVDTP source plugin Bluetooth audio A2DP/AVDTP sink, AVDTP source plugin
comment "bluez plugin needs a toolchain w/ wchar, threads, dynamic library" comment "bluez plugin needs a toolchain w/ wchar, threads, headers >= 3.4, dynamic library"
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
comment "bluez plugin conflicts with older bluez-utils version"
depends on BR2_PACKAGE_BLUEZ_UTILS
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2
bool "bz2" bool "bz2"

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

@ -84,7 +84,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc
endif endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ),y) ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ),y)
GST1_PLUGINS_BAD_DEPENDENCIES += bluez_utils GST1_PLUGINS_BAD_DEPENDENCIES += bluez5_utils
GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez
else else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-bluez GST1_PLUGINS_BAD_CONF_OPTS += --disable-bluez