diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2023-09-27 18:45:58 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2023-10-04 07:52:48 -0700 |
commit | a858971740284f455324b66190584dd842f1b59e (patch) | |
tree | 061e7623f5127cc49c571a7e5ba47cd0e01da173 | |
parent | b5a68c60fe2a07820d576533eb913360585d1edc (diff) | |
download | meta-openembedded-a858971740284f455324b66190584dd842f1b59e.tar.gz |
gupnp-tools: fix build with meson-1.2.0
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 8a7c980d92145c02d7dbb1252a930293c301eee7)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch | 56 | ||||
-rw-r--r-- | meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb | 4 |
2 files changed, 59 insertions, 1 deletions
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch new file mode 100644 index 0000000000..5c13ce0bd5 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 4c86f814fbe17eb5774055d69102408bbfc1cd63 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jens Georg <mail@jensge.org> | ||
3 | Date: Sun, 9 Jul 2023 21:47:48 +0200 | ||
4 | Subject: [PATCH] build: Fix wrap file syntax | ||
5 | |||
6 | No idea why it worked in the first place | ||
7 | |||
8 | Fixes #26 | ||
9 | |||
10 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
11 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/1372f9ebe45180d58cefb6c0475fafe77de37ef2] | ||
12 | --- | ||
13 | subprojects/gssdp-1.2.wrap | 4 ++-- | ||
14 | subprojects/gupnp-1.2.wrap | 4 ++-- | ||
15 | subprojects/gupnp-av-1.0.wrap | 4 ++-- | ||
16 | 3 files changed, 6 insertions(+), 6 deletions(-) | ||
17 | |||
18 | diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap | ||
19 | index 34d9b0b..f78d2fa 100644 | ||
20 | --- a/subprojects/gssdp-1.2.wrap | ||
21 | +++ b/subprojects/gssdp-1.2.wrap | ||
22 | @@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git | ||
23 | revision = master | ||
24 | depth = 1 | ||
25 | |||
26 | -[provides] | ||
27 | -dependency_name = gssdp-1.2 | ||
28 | +[provide] | ||
29 | +dependency_names = gssdp-1.2 | ||
30 | |||
31 | diff --git a/subprojects/gupnp-1.2.wrap b/subprojects/gupnp-1.2.wrap | ||
32 | index c345910..f92c055 100644 | ||
33 | --- a/subprojects/gupnp-1.2.wrap | ||
34 | +++ b/subprojects/gupnp-1.2.wrap | ||
35 | @@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp.git | ||
36 | revision = master | ||
37 | depth = 1 | ||
38 | |||
39 | -[provides] | ||
40 | -dependency_name = gupnp-1.2 | ||
41 | +[provide] | ||
42 | +dependency_names = gupnp-1.2 | ||
43 | |||
44 | diff --git a/subprojects/gupnp-av-1.0.wrap b/subprojects/gupnp-av-1.0.wrap | ||
45 | index 967e6d3..8c3b490 100644 | ||
46 | --- a/subprojects/gupnp-av-1.0.wrap | ||
47 | +++ b/subprojects/gupnp-av-1.0.wrap | ||
48 | @@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp-av.git | ||
49 | revision = master | ||
50 | depth = 1 | ||
51 | |||
52 | -[provides] | ||
53 | -dependency_name = gupnp-av-1.0 | ||
54 | +[provide] | ||
55 | +dependency_names = gupnp-av-1.0 | ||
56 | |||
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb index 20aced8329..9731ede274 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb | |||
@@ -9,7 +9,9 @@ inherit features_check meson pkgconfig gettext gtk-icon-cache | |||
9 | 9 | ||
10 | REQUIRED_DISTRO_FEATURES = "x11" | 10 | REQUIRED_DISTRO_FEATURES = "x11" |
11 | 11 | ||
12 | SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz" | 12 | SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz \ |
13 | file://0001-build-Fix-wrap-file-syntax.patch \ | ||
14 | " | ||
13 | SRC_URI[sha256sum] = "6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c" | 15 | SRC_URI[sha256sum] = "6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c" |
14 | 16 | ||
15 | RRECOMMENDS:${PN} = "adwaita-icon-theme" | 17 | RRECOMMENDS:${PN} = "adwaita-icon-theme" |