diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-05 17:18:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-09 23:30:15 +0100 |
commit | 9f137c86a8e9b961cbc5b9093da3fa21aac53217 (patch) | |
tree | f5206e6ca7cb1406daee7fcea04ec44f15226d7b /meta/recipes-multimedia/pulseaudio | |
parent | 038eb82ad62776dc3bf696f27b6a373c84934094 (diff) | |
download | poky-9f137c86a8e9b961cbc5b9093da3fa21aac53217.tar.gz |
pulseaudio: unbreak build with latest meson
(From OE-Core rev: 3ac3c5dad3e9a434b421c654b3d375c2fee044a9)
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/0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch | 26 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch new file mode 100644 index 0000000000..b1a43bd7f0 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 4ee244d0824e772ab35abb0f9df5e8088e16fc5d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 26 Apr 2021 19:30:40 +0200 | ||
4 | Subject: [PATCH] doxygen/meson.build: remove dependency on doxygen binary | ||
5 | |||
6 | New meson refuses to complete confuguration if doxygen is absent | ||
7 | even if this target is never actually run. As we never run it, | ||
8 | let's remove it, until upstream and/or meson figure out that it's | ||
9 | optional and should be treated as such. | ||
10 | |||
11 | Upstream-Status: Inappropriate [needs proper upstream fix] | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | doxygen/meson.build | 2 -- | ||
15 | 1 file changed, 2 deletions(-) | ||
16 | |||
17 | diff --git a/doxygen/meson.build b/doxygen/meson.build | ||
18 | index afc0e49..df55c83 100644 | ||
19 | --- a/doxygen/meson.build | ||
20 | +++ b/doxygen/meson.build | ||
21 | @@ -6,5 +6,3 @@ doxygen_conf = configure_file( | ||
22 | configuration : cdata, | ||
23 | ) | ||
24 | |||
25 | -run_target('doxygen', | ||
26 | - command : ['doxygen', doxygen_conf]) | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb index 03b99306b3..9b8338a665 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb | |||
@@ -6,6 +6,7 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ | |||
6 | file://0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch \ | 6 | file://0001-build-sys-Add-an-option-for-enabling-disabling-Valgr.patch \ |
7 | file://0001-meson-Check-for-__get_cpuid.patch \ | 7 | file://0001-meson-Check-for-__get_cpuid.patch \ |
8 | file://volatiles.04_pulse \ | 8 | file://volatiles.04_pulse \ |
9 | file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ | ||
9 | " | 10 | " |
10 | SRC_URI[md5sum] = "1efc916251910f1e9d4df7810e3e69f8" | 11 | SRC_URI[md5sum] = "1efc916251910f1e9d4df7810e3e69f8" |
11 | SRC_URI[sha256sum] = "75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1" | 12 | SRC_URI[sha256sum] = "75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1" |