[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 3 commits: meson: fix build files list when building with NEON

[Arun Raghavan]

Arun Raghavan pushed to branch master at PulseAudio / pulseaudio


Commits:
eb70672c by Lucas Stach at 2019-08-14T08:16:34Z
meson: fix build files list when building with NEON

Sync the meson NEON build files list with the autotools build
sources list. Fixes "ERROR: File svolume_neon.c does not exist."

- - - - -
1911ef16 by Lucas Stach at 2019-08-14T08:16:34Z
meson: allow to build bluez support without libbluetooth

pulseaudio does not link against libbluetooth, as it's only talking to the
bluez daemon over dbus. So the build dependency on libbluetooth is overly
restrictive, as some embedded systems choose to ship without libbluetooth
but still have bluez daemon support.

This syncs the meson to the autotools configuration behavior by changing
the bluez option to a default on boolean.

- - - - -
25308fe8 by Lucas Stach at 2019-08-14T08:16:34Z
meson: add stdint.h to checked headers

Without this check we won't ever define HAVE_STDINT_H, which isn't used
in pulse directly, but is needed by e.g. the speex headers to work
correctly.

- - - - -


4 changed files:

- meson.build
- meson_options.txt
- src/modules/meson.build
- src/pulsecore/meson.build


Changes:

=====================================
meson.build
=====================================
@@ -189,6 +189,7 @@ check_headers = [
   'pwd.h',
   'regex.h',
   'sched.h',
+  'stdint.h',
   'sys/capability.h',
   'sys/dl.h',
   'sys/eventfd.h',
@@ -510,9 +511,8 @@ if avahi_dep.found()
   cdata.set('HAVE_AVAHI', 1)
 endif
 
-bluez_dep = dependency('bluez', version : '>= 5.0', required : get_option('bluez5'))
 sbc_dep = dependency('sbc', version : '>= 1.0', required : false)
-if bluez_dep.found()
+if get_option('bluez5')
   assert(dbus_dep.found(), 'BlueZ requires D-Bus support')
   assert(sbc_dep.found(), 'BlueZ requires SBC support')
   cdata.set('HAVE_SBC', 1)
@@ -695,7 +695,7 @@ summary = [
   'Enable Async DNS:              @0@'.format(asyncns_dep.found()),
   'Enable LIRC:                   @0@'.format(lirc_dep.found()),
   'Enable D-Bus:                  @0@'.format(dbus_dep.found()),
-  '  Enable BlueZ 5:              @0@'.format(bluez_dep.found()),
+  '  Enable BlueZ 5:              @0@'.format(get_option('bluez5')),
   '    Enable native headsets:    @0@'.format(get_option('bluez5-native-headset')),
   '    Enable  ofono headsets:    @0@'.format(get_option('bluez5-ofono-headset')),
   'Enable udev:                   @0@'.format(udev_dep.found()),


=====================================
meson_options.txt
=====================================
@@ -67,7 +67,7 @@ option('avahi',
        type : 'feature', value : 'auto',
        description : 'Optional Avahi support')
 option('bluez5',
-       type : 'feature', value : 'auto',
+       type : 'boolean', value : 'true',
        description : 'Optional BlueZ 5 support')
 option('bluez5-native-headset',
        type : 'boolean',


=====================================
src/modules/meson.build
=====================================
@@ -101,7 +101,7 @@ if avahi_dep.found()
   ]
 endif
 
-if bluez_dep.found()
+if get_option('bluez5')
   subdir('bluetooth')
   all_modules += [
     [ 'module-bluetooth-discover', 'bluetooth/module-bluetooth-discover.c' ],


=====================================
src/pulsecore/meson.build
=====================================
@@ -174,7 +174,7 @@ simd = import('unstable-simd')
 libpulsecore_simd = simd.check('libpulsecore_simd',
   mmx : ['remap_mmx.c', 'svolume_mmx.c'],
   sse : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'],
-  neon : ['remap_neon.c', 'sconv_neon.c', 'svolume_neon.c'],
+  neon : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'],
   c_args : [pa_c_args],
   include_directories : [configinc, topinc],
   implicit_include_directories : false,



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/728a4402eb85983eb9ad160470e79c57201b572a...25308fe88f83bed2f4554bdaf6cefa8e18100c3f

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/728a4402eb85983eb9ad160470e79c57201b572a...25308fe88f83bed2f4554bdaf6cefa8e18100c3f
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20190814/df816e82/attachment-0001.html>