diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-08-22 14:50:22 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-23 08:25:52 +0100 |
commit | 235a906b67eb04f08a9dbfacbd28eb22c6bf2bee (patch) | |
tree | e010f42383ec1872b3d1be10868b4e55475a2785 /meta/recipes-multimedia/pulseaudio | |
parent | e524aca196466309904fd98bbd2fa2645f1ec609 (diff) | |
download | poky-235a906b67eb04f08a9dbfacbd28eb22c6bf2bee.tar.gz |
pulseaudio: update 14.2 -> 15.0
Drop backports.
(From OE-Core rev: 29bf058368e4a6336b74d9aa6880d3176cadb913)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch | 67 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch | 71 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb (renamed from meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb) | 5 |
4 files changed, 2 insertions, 143 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 2fb107797a..4a1456d407 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -108,7 +108,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5' | |||
108 | " | 108 | " |
109 | 109 | ||
110 | PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus" | 110 | PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus" |
111 | PACKAGECONFIG[bluez5] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" | 111 | PACKAGECONFIG[bluez5] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc" |
112 | PACKAGECONFIG[gsettings] = "-Dgsettings=enabled,-Dgsettings=disabled,glib-2.0-native glib-2.0" | 112 | PACKAGECONFIG[gsettings] = "-Dgsettings=enabled,-Dgsettings=disabled,glib-2.0-native glib-2.0" |
113 | PACKAGECONFIG[ofono] = "-Dbluez5-ofono-headset=true,-Dbluez5-ofono-headset=false,ofono" | 113 | PACKAGECONFIG[ofono] = "-Dbluez5-ofono-headset=true,-Dbluez5-ofono-headset=false,ofono" |
114 | PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" | 114 | PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch deleted file mode 100644 index d60a9a211f..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | From 6d202833a5ae241eeb648631cf95090c452198f9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tanu Kaskinen <tanuk@iki.fi> | ||
3 | Date: Fri, 14 Feb 2020 07:29:33 +0200 | ||
4 | Subject: [PATCH] build-sys: Add an option for enabling/disabling Valgrind | ||
5 | |||
6 | In OpenEmbedded the PulseAudio recipe currently disables Valgrind | ||
7 | support by passing "ac_cv_header_valgrind_memcheck_h=no" to the | ||
8 | configure script (this was added to make it deterministic whether | ||
9 | Valgrdind support gets enabled or not). I'm converting the PulseAudio | ||
10 | recipe to use Meson, and I needed an option to disable Valgrind. | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> | ||
15 | --- | ||
16 | meson.build | 6 +++++- | ||
17 | meson_options.txt | 3 +++ | ||
18 | 2 files changed, 8 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/meson.build b/meson.build | ||
21 | index 658eeee57..258962724 100644 | ||
22 | --- a/meson.build | ||
23 | +++ b/meson.build | ||
24 | @@ -220,7 +220,6 @@ check_headers = [ | ||
25 | 'sys/un.h', | ||
26 | 'sys/wait.h', | ||
27 | 'syslog.h', | ||
28 | - 'valgrind/memcheck.h', | ||
29 | 'xlocale.h', | ||
30 | ] | ||
31 | |||
32 | @@ -231,6 +230,10 @@ foreach h : check_headers | ||
33 | endif | ||
34 | endforeach | ||
35 | |||
36 | +if cc.has_header('valgrind/memcheck.h', required: get_option('valgrind')) | ||
37 | + cdata.set('HAVE_VALGRIND_MEMCHECK_H', 1) | ||
38 | +endif | ||
39 | + | ||
40 | # FIXME: move this to the above set | ||
41 | if cc.has_header('pthread.h') | ||
42 | cdata.set('HAVE_PTHREAD', 1) | ||
43 | @@ -841,6 +844,7 @@ summary = [ | ||
44 | 'Enable SoXR (resampler): @0@'.format(soxr_dep.found()), | ||
45 | 'Enable WebRTC echo canceller: @0@'.format(webrtc_dep.found()), | ||
46 | 'Enable Gcov coverage: @0@'.format(get_option('gcov')), | ||
47 | + 'Enable Valgrind: @0@'.format(cdata.has('HAVE_VALGRIND_MEMCHECK_H')), | ||
48 | 'Enable man pages: @0@'.format(get_option('man')), | ||
49 | 'Enable unit tests: @0@'.format(get_option('tests')), | ||
50 | '', | ||
51 | diff --git a/meson_options.txt b/meson_options.txt | ||
52 | index 824f24e08..115cc84af 100644 | ||
53 | --- a/meson_options.txt | ||
54 | +++ b/meson_options.txt | ||
55 | @@ -138,6 +138,9 @@ option('systemd', | ||
56 | option('udev', | ||
57 | type : 'feature', value : 'auto', | ||
58 | description : 'Optional udev support') | ||
59 | +option('valgrind', | ||
60 | + type : 'feature', value : 'auto', | ||
61 | + description : 'Optional Valgrind support') | ||
62 | option('x11', | ||
63 | type : 'feature', value : 'auto', | ||
64 | description : 'Optional X11 support') | ||
65 | -- | ||
66 | 2.20.1 | ||
67 | |||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch deleted file mode 100644 index 5d9370fb16..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | From 09f846fbdeb19193e778ce51baa77bd03c38372e Mon Sep 17 00:00:00 2001 | ||
2 | From: garrison <garrison@qemu15.qemu-network> | ||
3 | Date: Fri, 4 Jun 2021 22:13:02 +0000 | ||
4 | Subject: [PATCH] build-sys: meson: check if NEON code can be compiled on arm | ||
5 | |||
6 | When Meson SIMD module returns HAVE_NEON=1 on arm host, do extra compile check | ||
7 | to verify compiler can actually handle NEON code. | ||
8 | |||
9 | Related Meson issue #6361 https://github.com/mesonbuild/meson/issues/6361 | ||
10 | |||
11 | Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/574> | ||
12 | |||
13 | Upstream-Status: Backport[https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/6d2a49a6a1eacc2096d0d9473a074421c181ab56] | ||
14 | |||
15 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
16 | --- | ||
17 | src/pulsecore/meson.build | 41 +++++++++++++++++++++++++++++---------- | ||
18 | 1 file changed, 31 insertions(+), 10 deletions(-) | ||
19 | |||
20 | diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build | ||
21 | index 99a702e..d0b7990 100644 | ||
22 | --- a/src/pulsecore/meson.build | ||
23 | +++ b/src/pulsecore/meson.build | ||
24 | @@ -172,16 +172,37 @@ endif | ||
25 | |||
26 | # FIXME: SIMD support (ORC) | ||
27 | simd = import('unstable-simd') | ||
28 | -libpulsecore_simd = simd.check('libpulsecore_simd', | ||
29 | - mmx : ['remap_mmx.c', 'svolume_mmx.c'], | ||
30 | - sse : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'], | ||
31 | - neon : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'], | ||
32 | - c_args : [pa_c_args], | ||
33 | - include_directories : [configinc, topinc], | ||
34 | - implicit_include_directories : false, | ||
35 | - compiler : cc) | ||
36 | -libpulsecore_simd_lib = libpulsecore_simd[0] | ||
37 | -cdata.merge_from(libpulsecore_simd[1]) | ||
38 | +simd_variants = [ | ||
39 | + { 'mmx' : ['remap_mmx.c', 'svolume_mmx.c'] }, | ||
40 | + { 'sse' : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'] }, | ||
41 | + { 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] }, | ||
42 | +] | ||
43 | + | ||
44 | +libpulsecore_simd_lib = [] | ||
45 | + | ||
46 | +foreach simd_kwargs : simd_variants | ||
47 | + | ||
48 | + if host_machine.cpu_family() == 'arm' and 'neon' in simd_kwargs | ||
49 | + if not cc.compiles(''' | ||
50 | + #include <arm_neon.h> | ||
51 | + int main() { | ||
52 | + return sizeof(uint8x8_t) + sizeof(int32x4_t) + sizeof(float32x4_t); | ||
53 | + } | ||
54 | + ''', name : 'neon code') | ||
55 | + continue | ||
56 | + endif | ||
57 | + endif | ||
58 | + | ||
59 | + libpulsecore_simd = simd.check('libpulsecore_simd', | ||
60 | + kwargs : simd_kwargs, | ||
61 | + c_args : [pa_c_args], | ||
62 | + include_directories : [configinc, topinc], | ||
63 | + implicit_include_directories : false, | ||
64 | + compiler : cc) | ||
65 | + | ||
66 | + libpulsecore_simd_lib += libpulsecore_simd[0] | ||
67 | + cdata.merge_from(libpulsecore_simd[1]) | ||
68 | +endforeach | ||
69 | |||
70 | # FIXME: Implement Windows support | ||
71 | #'mutex-win32.c', | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb index a7ea8caccb..239d31810b 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb | |||
@@ -3,12 +3,9 @@ require pulseaudio.inc | |||
3 | SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ | 3 | SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ |
4 | file://0001-client-conf-Add-allow-autospawn-for-root.patch \ | 4 | file://0001-client-conf-Add-allow-autospawn-for-root.patch \ |
5 | file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ | 5 | file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ |
6 | file://0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch \ | ||
7 | file://0001-meson-Check-for-__get_cpuid.patch \ | 6 | file://0001-meson-Check-for-__get_cpuid.patch \ |
8 | file://volatiles.04_pulse \ | 7 | file://volatiles.04_pulse \ |
9 | file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ | 8 | file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ |
10 | file://0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch \ | ||
11 | " | 9 | " |
12 | SRC_URI[md5sum] = "1efc916251910f1e9d4df7810e3e69f8" | 10 | SRC_URI[sha256sum] = "a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0" |
13 | SRC_URI[sha256sum] = "75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1" | ||
14 | UPSTREAM_CHECK_REGEX = "pulseaudio-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" | 11 | UPSTREAM_CHECK_REGEX = "pulseaudio-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" |