diff options
3 files changed, 67 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-StringBuffer-Include-cstddef-for-size_t.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-StringBuffer-Include-cstddef-for-size_t.patch new file mode 100644 index 0000000000..1d869aa833 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-StringBuffer-Include-cstddef-for-size_t.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From c14877071f14b218835f7fb034dea11bd1ba56f5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 25 Dec 2019 09:40:16 -0800 | ||
4 | Subject: [PATCH] StringBuffer: Include cstddef for size_t | ||
5 | |||
6 | Fixes | ||
7 | a.cpp:3:1: error: 'size_t' does not name a type | ||
8 | 3 | size_t s; | ||
9 | | ^~~~~~ | ||
10 | a.cpp:2:1: note: 'size_t' is defined in header '<cstddef>'; did you forget to '#include <cstddef>'? | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/MusicPlayerDaemon/MPD/pull/697] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/util/StringBuffer.hxx | 1 + | ||
16 | 1 file changed, 1 insertion(+) | ||
17 | |||
18 | --- a/src/util/StringBuffer.hxx | ||
19 | +++ b/src/util/StringBuffer.hxx | ||
20 | @@ -31,6 +31,7 @@ | ||
21 | #define STRING_BUFFER_HPP | ||
22 | |||
23 | #include <array> | ||
24 | +#include <cstddef> | ||
25 | |||
26 | /** | ||
27 | * A statically allocated string buffer. | ||
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0002-Include-stdexcept-for-runtime_error.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0002-Include-stdexcept-for-runtime_error.patch new file mode 100644 index 0000000000..1f11867191 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd/0002-Include-stdexcept-for-runtime_error.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 06f78ced45f6622a2e02cd09e6a2c0c22a98b89e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 25 Dec 2019 09:41:55 -0800 | ||
4 | Subject: [PATCH 2/2] Include <stdexcept> for runtime_error | ||
5 | |||
6 | Fixes | ||
7 | |||
8 | ../git/src/LocateUri.cxx:65:14: error: 'runtime_error' is not a member of 'std' | ||
9 | 65 | throw std::runtime_error("Unsupported URI scheme"); | ||
10 | | ^~~~~~~~~~~~~ | ||
11 | |||
12 | Upstream-Status: Inappropriate [ Fixed differently upstream ] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/LocateUri.cxx | 1 + | ||
16 | src/pcm/PcmConvert.cxx | 1 + | ||
17 | 2 files changed, 2 insertions(+) | ||
18 | |||
19 | --- a/src/LocateUri.cxx | ||
20 | +++ b/src/LocateUri.cxx | ||
21 | @@ -17,6 +17,7 @@ | ||
22 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
23 | */ | ||
24 | |||
25 | +#include <stdexcept> | ||
26 | #include "config.h" | ||
27 | #include "LocateUri.hxx" | ||
28 | #include "client/Client.hxx" | ||
29 | --- a/src/pcm/PcmConvert.cxx | ||
30 | +++ b/src/pcm/PcmConvert.cxx | ||
31 | @@ -17,6 +17,7 @@ | ||
32 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
33 | */ | ||
34 | |||
35 | +#include <stdexcept> | ||
36 | #include "config.h" | ||
37 | #include "PcmConvert.hxx" | ||
38 | #include "ConfiguredResampler.hxx" | ||
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb index 6c6ad42375..133ee6e792 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb | |||
@@ -19,6 +19,8 @@ DEPENDS += " \ | |||
19 | SRC_URI = " \ | 19 | SRC_URI = " \ |
20 | git://github.com/MusicPlayerDaemon/MPD;branch=v0.20.x \ | 20 | git://github.com/MusicPlayerDaemon/MPD;branch=v0.20.x \ |
21 | file://mpd.conf.in \ | 21 | file://mpd.conf.in \ |
22 | file://0001-StringBuffer-Include-cstddef-for-size_t.patch \ | ||
23 | file://0002-Include-stdexcept-for-runtime_error.patch \ | ||
22 | " | 24 | " |
23 | SRCREV = "9274bc15bc41bbe490fde847f8422468cc20375d" | 25 | SRCREV = "9274bc15bc41bbe490fde847f8422468cc20375d" |
24 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |