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

build-sys: meson: Require bluez dependency if bluez5 feature is enabled

Browse source 
Build breaks if bluez5 and bluez5-native-headset are both enabled
but bluez headers are not available.

Fix this by changing `bluez5` to Meson feature requiring `bluez` dependency.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/583>
This commit is contained in:
Igor V. Kovalenko 2021-06-18 20:48:12 +03:00 • committed by PulseAudio Marge Bot
parent 58052e0e04
commit c817dfb5a4
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -706,7 +706,9 @@ endif
sbc_dep = dependency('sbc', version : '>= 1.0', required : false) sbc_dep = dependency('sbc', version : '>= 1.0', required : false)
if get_option('bluez5') bluez_dep = dependency('bluez', required : get_option('bluez5'))
if bluez_dep.found()
assert(dbus_dep.found(), 'BlueZ requires D-Bus support') assert(dbus_dep.found(), 'BlueZ requires D-Bus support')
assert(sbc_dep.found(), 'BlueZ requires SBC support') assert(sbc_dep.found(), 'BlueZ requires SBC support')
cdata.set('HAVE_SBC', 1) cdata.set('HAVE_SBC', 1)
@ -914,9 +916,9 @@ summary = [
'Enable Async DNS: @0@'.format(asyncns_dep.found()), 'Enable Async DNS: @0@'.format(asyncns_dep.found()),
'Enable LIRC: @0@'.format(lirc_dep.found()), 'Enable LIRC: @0@'.format(lirc_dep.found()),
'Enable D-Bus: @0@'.format(dbus_dep.found()), 'Enable D-Bus: @0@'.format(dbus_dep.found()),
' Enable BlueZ 5: @0@'.format(get_option('bluez5')), ' Enable BlueZ 5: @0@'.format(cdata.has('HAVE_BLUEZ_5')),
' Enable native headsets: @0@'.format(get_option('bluez5-native-headset')), ' Enable native headsets: @0@'.format(cdata.has('HAVE_BLUEZ_5_NATIVE_HEADSET')),
' Enable ofono headsets: @0@'.format(get_option('bluez5-ofono-headset')), ' Enable ofono headsets: @0@'.format(cdata.has('HAVE_BLUEZ_5_OFONO_HEADSET')),
' Enable GStreamer based codecs: @0@'.format(have_bluez5_gstreamer), ' Enable GStreamer based codecs: @0@'.format(have_bluez5_gstreamer),
'Enable udev: @0@'.format(udev_dep.found()), 'Enable udev: @0@'.format(udev_dep.found()),
' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')), ' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')),

2
meson_options.txt
View file

@ -85,7 +85,7 @@ option('avahi',
type : 'feature', value : 'auto', type : 'feature', value : 'auto',
description : 'Optional Avahi support') description : 'Optional Avahi support')
option('bluez5', option('bluez5',
type : 'boolean', value : 'true', type : 'feature', value : 'auto',
description : 'Optional BlueZ 5 support') description : 'Optional BlueZ 5 support')
option('bluez5-gstreamer', option('bluez5-gstreamer',
type : 'feature', value: 'auto', type : 'feature', value: 'auto',

2
src/modules/bluetooth/meson.build
View file

@ -35,7 +35,7 @@ libbluez5_util = shared_library('bluez5-util',
c_args : [pa_c_args, server_c_args], c_args : [pa_c_args, server_c_args],
link_args : [nodelete_link_args], link_args : [nodelete_link_args],
include_directories : [configinc, topinc], include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep], dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, bluez_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep],
install : true, install : true,
install_rpath : privlibdir, install_rpath : privlibdir,
install_dir : modlibexecdir, install_dir : modlibexecdir,

2
src/modules/meson.build
View file

@ -118,7 +118,7 @@ if avahi_dep.found()
] ]
endif endif
if get_option('bluez5') if cdata.has('HAVE_BLUEZ_5')
subdir('bluetooth') subdir('bluetooth')
all_modules += [ all_modules += [
[ 'module-bluetooth-discover', 'bluetooth/module-bluetooth-discover.c' ], [ 'module-bluetooth-discover', 'bluetooth/module-bluetooth-discover.c' ],