From e5399a09bf44700f97607b283379172dac0cf9c7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 6 Jun 2022 14:01:17 +0200 Subject: pulseaudio: update 15.0 -> 16.0 Drop patch as issue fixed upstream: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/1b96b49f65744930050b927a548a3d2e771c7310 Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +- .../0001-meson-Check-for-__get_cpuid.patch | 82 ---------------------- .../pulseaudio/pulseaudio_15.0.bb | 11 --- .../pulseaudio/pulseaudio_16.0.bb | 10 +++ 4 files changed, 11 insertions(+), 94 deletions(-) delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0001-meson-Check-for-__get_cpuid.patch delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_16.0.bb 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() { } python populate_packages:prepend() { - plugindir = d.expand('${libdir}/pulse-${PV}/modules/') + plugindir = d.expand('${libdir}/pulseaudio/modules/') do_split_packages(d, plugindir, r'^module-(.*)\.so$', '${PN}-module-%s', 'PulseAudio module for %s', extra_depends='', prepend=True) do_split_packages(d, plugindir, r'^lib(.*)\.so$', '${PN}-lib-%s', 'PulseAudio library for %s', extra_depends='', prepend=True) } 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 @@ -From 9d0dc8aedd08d77797f90fa6075a59613f18bf0d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 20 Dec 2020 07:56:07 -0800 -Subject: [PATCH] meson: Check for __get_cpuid - -checking for presence of cpuid.h header alone is not sufficient in some case to use -cpuid related functions. e.g. when using clang which is built for -multiple targets will have cpuid.h header as part of compiler headers in -distribution but one maybe compiling pulseaudion for non-x86 target. The -current check in meson succeeds and then compile fails later because -cpuid.h is x86-specific header. Therefore checking for symbol that is -needed makes this robust, so even if header exist it will try to ensure -the given symbol can be used - -Fixes -src/pulsecore/core-util.c:113: -| /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 -| #error this header is for x86 only -| ^ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -Cc: Tanu Kaskinen ---- - meson.build | 5 ++++- - src/pulsecore/core-util.c | 2 +- - src/pulsecore/cpu-x86.c | 2 +- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 2589627..5f5127e 100644 ---- a/meson.build -+++ b/meson.build -@@ -185,7 +185,6 @@ endif - check_headers = [ - 'arpa/inet.h', - 'byteswap.h', -- 'cpuid.h', - 'dlfcn.h', - 'execinfo.h', - 'grp.h', -@@ -243,6 +242,10 @@ if cc.has_header_symbol('pthread.h', 'PTHREAD_PRIO_INHERIT') - cdata.set('HAVE_PTHREAD_PRIO_INHERIT', 1) - endif - -+if cc.has_header_symbol('cpuid.h', '__get_cpuid') -+ cdata.set('HAVE_GET_CPUID', 1) -+endif -+ - # Functions - - check_functions = [ -diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c -index 601b1d1..6f34e7c 100644 ---- a/src/pulsecore/core-util.c -+++ b/src/pulsecore/core-util.c -@@ -109,7 +109,7 @@ - #include - #endif - --#ifdef HAVE_CPUID_H -+#ifdef HAVE_GET_CPUID - #include - #endif - -diff --git a/src/pulsecore/cpu-x86.c b/src/pulsecore/cpu-x86.c -index 4e59e14..86595d4 100644 ---- a/src/pulsecore/cpu-x86.c -+++ b/src/pulsecore/cpu-x86.c -@@ -24,7 +24,7 @@ - - #include - --#ifdef HAVE_CPUID_H -+#ifdef HAVE_GET_CPUID - #include - #endif - --- -2.29.2 - diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb deleted file mode 100644 index 239d31810b..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_15.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require pulseaudio.inc - -SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ - file://0001-client-conf-Add-allow-autospawn-for-root.patch \ - file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ - file://0001-meson-Check-for-__get_cpuid.patch \ - file://volatiles.04_pulse \ - file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ - " -SRC_URI[sha256sum] = "a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0" -UPSTREAM_CHECK_REGEX = "pulseaudio-(?P\d+(\.(?!99)\d+)+)\.tar" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_16.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_16.0.bb new file mode 100644 index 0000000000..f9940d4c85 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_16.0.bb @@ -0,0 +1,10 @@ +require pulseaudio.inc + +SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ + file://0001-client-conf-Add-allow-autospawn-for-root.patch \ + file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ + file://volatiles.04_pulse \ + file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ + " +SRC_URI[sha256sum] = "b4ec6271910a1a86803f165056547f700dfabaf8d5c6c69736f706b5bb889f47" +UPSTREAM_CHECK_REGEX = "pulseaudio-(?P\d+(\.(?!99)\d+)+)\.tar" -- cgit 1.2.3-korg