diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-06-06 14:01:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-07 21:21:54 +0100 |
commit | 65045442271c41c71b314c8ac0f086a6db7aef4b (patch) | |
tree | 21ce571bf93fc47eacdb27de38b31d653096c392 | |
parent | 570991487424397bf8374e77320820ce89493b3a (diff) | |
download | poky-65045442271c41c71b314c8ac0f086a6db7aef4b.tar.gz |
pulseaudio: update 15.0 -> 16.0
Drop patch as issue fixed upstream:
https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/1b96b49f65744930050b927a548a3d2e771c7310
(From OE-Core rev: e5399a09bf44700f97607b283379172dac0cf9c7)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch | 82 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_16.0.bb (renamed from meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb) | 3 |
3 files changed, 2 insertions, 85 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 821ce7d1df..602d7263ce 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -213,7 +213,7 @@ pkg_postinst:${PN}-server() { | |||
213 | } | 213 | } |
214 | 214 | ||
215 | python populate_packages:prepend() { | 215 | python populate_packages:prepend() { |
216 | plugindir = d.expand('${libdir}/pulse-${PV}/modules/') | 216 | plugindir = d.expand('${libdir}/pulseaudio/modules/') |
217 | do_split_packages(d, plugindir, r'^module-(.*)\.so$', '${PN}-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) | 217 | do_split_packages(d, plugindir, r'^module-(.*)\.so$', '${PN}-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) |
218 | do_split_packages(d, plugindir, r'^lib(.*)\.so$', '${PN}-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) | 218 | do_split_packages(d, plugindir, r'^lib(.*)\.so$', '${PN}-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) |
219 | } | 219 | } |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch deleted file mode 100644 index c9d8abcbf2..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | From 9d0dc8aedd08d77797f90fa6075a59613f18bf0d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 20 Dec 2020 07:56:07 -0800 | ||
4 | Subject: [PATCH] meson: Check for __get_cpuid | ||
5 | |||
6 | checking for presence of cpuid.h header alone is not sufficient in some case to use | ||
7 | cpuid related functions. e.g. when using clang which is built for | ||
8 | multiple targets will have cpuid.h header as part of compiler headers in | ||
9 | distribution but one maybe compiling pulseaudion for non-x86 target. The | ||
10 | current check in meson succeeds and then compile fails later because | ||
11 | cpuid.h is x86-specific header. Therefore checking for symbol that is | ||
12 | needed makes this robust, so even if header exist it will try to ensure | ||
13 | the given symbol can be used | ||
14 | |||
15 | Fixes | ||
16 | src/pulsecore/core-util.c:113: | ||
17 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/pulseaudio/14.0-r0/recipe-sysroot-native/usr/lib/clang/11.0.1/include/cpuid.h:11:2: error: this header is for x86 only | ||
18 | | #error this header is for x86 only | ||
19 | | ^ | ||
20 | |||
21 | Upstream-Status: Pending | ||
22 | |||
23 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
24 | Cc: Tanu Kaskinen <tanuk@iki.fi> | ||
25 | --- | ||
26 | meson.build | 5 ++++- | ||
27 | src/pulsecore/core-util.c | 2 +- | ||
28 | src/pulsecore/cpu-x86.c | 2 +- | ||
29 | 3 files changed, 6 insertions(+), 3 deletions(-) | ||
30 | |||
31 | diff --git a/meson.build b/meson.build | ||
32 | index 2589627..5f5127e 100644 | ||
33 | --- a/meson.build | ||
34 | +++ b/meson.build | ||
35 | @@ -185,7 +185,6 @@ endif | ||
36 | check_headers = [ | ||
37 | 'arpa/inet.h', | ||
38 | 'byteswap.h', | ||
39 | - 'cpuid.h', | ||
40 | 'dlfcn.h', | ||
41 | 'execinfo.h', | ||
42 | 'grp.h', | ||
43 | @@ -243,6 +242,10 @@ if cc.has_header_symbol('pthread.h', 'PTHREAD_PRIO_INHERIT') | ||
44 | cdata.set('HAVE_PTHREAD_PRIO_INHERIT', 1) | ||
45 | endif | ||
46 | |||
47 | +if cc.has_header_symbol('cpuid.h', '__get_cpuid') | ||
48 | + cdata.set('HAVE_GET_CPUID', 1) | ||
49 | +endif | ||
50 | + | ||
51 | # Functions | ||
52 | |||
53 | check_functions = [ | ||
54 | diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c | ||
55 | index 601b1d1..6f34e7c 100644 | ||
56 | --- a/src/pulsecore/core-util.c | ||
57 | +++ b/src/pulsecore/core-util.c | ||
58 | @@ -109,7 +109,7 @@ | ||
59 | #include <sys/personality.h> | ||
60 | #endif | ||
61 | |||
62 | -#ifdef HAVE_CPUID_H | ||
63 | +#ifdef HAVE_GET_CPUID | ||
64 | #include <cpuid.h> | ||
65 | #endif | ||
66 | |||
67 | diff --git a/src/pulsecore/cpu-x86.c b/src/pulsecore/cpu-x86.c | ||
68 | index 4e59e14..86595d4 100644 | ||
69 | --- a/src/pulsecore/cpu-x86.c | ||
70 | +++ b/src/pulsecore/cpu-x86.c | ||
71 | @@ -24,7 +24,7 @@ | ||
72 | |||
73 | #include <stdint.h> | ||
74 | |||
75 | -#ifdef HAVE_CPUID_H | ||
76 | +#ifdef HAVE_GET_CPUID | ||
77 | #include <cpuid.h> | ||
78 | #endif | ||
79 | |||
80 | -- | ||
81 | 2.29.2 | ||
82 | |||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_16.0.bb index 239d31810b..f9940d4c85 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_16.0.bb | |||
@@ -3,9 +3,8 @@ 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-meson-Check-for-__get_cpuid.patch \ | ||
7 | file://volatiles.04_pulse \ | 6 | file://volatiles.04_pulse \ |
8 | file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ | 7 | file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ |
9 | " | 8 | " |
10 | SRC_URI[sha256sum] = "a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0" | 9 | SRC_URI[sha256sum] = "b4ec6271910a1a86803f165056547f700dfabaf8d5c6c69736f706b5bb889f47" |
11 | UPSTREAM_CHECK_REGEX = "pulseaudio-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" | 10 | UPSTREAM_CHECK_REGEX = "pulseaudio-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" |