mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: fix dependency checking

Browse source 
Don't do subdir_done() in bluez5/meson.build, since the presence of
dependencies is supposed to be checked in spa/meson.build.
This commit is contained in:
Pauli Virtanen 2023-02-04 15:39:27 +02:00 • committed by Wim Taymans
parent 73cc5d1dde
commit 417f1dc02a
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spa/meson.build
View file

@ -41,14 +41,23 @@ if get_option('spa-plugins').allowed()
# plugin-specific dependencies # plugin-specific dependencies
alsa_dep = dependency('alsa', required: get_option('alsa')) alsa_dep = dependency('alsa', required: get_option('alsa'))
summary({'ALSA': alsa_dep.found()}, bool_yn: true, section: 'Backend') summary({'ALSA': alsa_dep.found()}, bool_yn: true, section: 'Backend')
bluez_dep = dependency('bluez', version : '>= 4.101', required: get_option('bluez5')) bluez_dep = dependency('bluez', version : '>= 4.101', required: get_option('bluez5'))
gio_dep = dependency('gio-2.0', required : get_option('bluez5')) gio_dep = dependency('gio-2.0', required : get_option('bluez5'))
gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5')) gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5'))
bluez_deps_found = bluez_dep.found() and gio_dep.found() and gio_unix_dep.found() bluez_glib2_dep = dependency('glib-2.0', required : get_option('bluez5'))
sbc_dep = dependency('sbc', required: get_option('bluez5'))
summary({'SBC': sbc_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, gio_dep, gio_unix_dep ]
bluez_deps_found = get_option('bluez5').allowed()
foreach dep: bluez5_deps
if get_option('bluez5').enabled() and not dep.found()
error('bluez5 enabled, but dependency not found: ' + dep.name())
endif
bluez_deps_found = bluez_deps_found and dep.found()
endforeach
summary({'Bluetooth audio': bluez_deps_found}, bool_yn: true, section: 'Backend') summary({'Bluetooth audio': bluez_deps_found}, bool_yn: true, section: 'Backend')
if bluez_deps_found if bluez_deps_found
sbc_dep = dependency('sbc', required: get_option('bluez5'))
summary({'SBC': sbc_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
ldac_dep = dependency('ldacBT-enc', required : get_option('bluez5-codec-ldac')) ldac_dep = dependency('ldacBT-enc', required : get_option('bluez5-codec-ldac'))
summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac')) ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))

7
spa/plugins/bluez5/meson.build
View file

@ -1,12 +1,5 @@
gnome = import('gnome') gnome = import('gnome')
bluez5_deps = [ mathlib, dbus_dep, glib2_dep, sbc_dep, bluez_dep, gio_dep, gio_unix_dep ]
foreach dep: bluez5_deps
if not dep.found()
subdir_done()
endif
endforeach
cdata.set('HAVE_BLUEZ_5_BACKEND_NATIVE', cdata.set('HAVE_BLUEZ_5_BACKEND_NATIVE',
get_option('bluez5-backend-hsp-native').allowed() or get_option('bluez5-backend-hsp-native').allowed() or
get_option('bluez5-backend-hfp-native').allowed()) get_option('bluez5-backend-hfp-native').allowed())