summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2023-09-26 19:53:54 +0200
committerArmin Kuster <akuster808@gmail.com>2023-10-04 07:52:48 -0700
commitd9fd94096ad16aff0e4a0daf80410b54fe69dfb1 (patch)
treeaa42bbf5bcc6910eda76eaa81dfa9f1022cc6651
parent4c0783cbedae1ad2ff0be6f907e779fe473d0d4f (diff)
downloadmeta-openembedded-d9fd94096ad16aff0e4a0daf80410b54fe69dfb1.tar.gz
gupnp: 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 15c8096177edbf2e05915d6b8df2139434eef83d) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch25
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb1
2 files changed, 26 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch
new file mode 100644
index 0000000000..66f07094c5
--- /dev/null
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch
@@ -0,0 +1,25 @@
1From 7a4515a356a3d5eb2af1f602c77a42a544e71efa Mon Sep 17 00:00:00 2001
2From: Jan Beich <jbeich@FreeBSD.org>
3Date: Sun, 9 Jul 2023 03:30:47 +0000
4Subject: [PATCH] build: properly spell [provide] in *.wrap files
5
6meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"?
7
8Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
9Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1]
10---
11 subprojects/gssdp-1.2.wrap | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap
15index 469c75d..466b83b 100644
16--- a/subprojects/gssdp-1.2.wrap
17+++ b/subprojects/gssdp-1.2.wrap
18@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git
19 revision = gssdp-1.4
20 depth = 1
21
22-[provides]
23+[provide]
24 dependency_name = gssdp-1.2
25
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb
index c21e7a05bf..efeb66f28f 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb
@@ -9,6 +9,7 @@ inherit meson pkgconfig vala gobject-introspection
9 9
10SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz \ 10SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz \
11 file://0001-all-Drop-xmlRecoverMemory.patch \ 11 file://0001-all-Drop-xmlRecoverMemory.patch \
12 file://0001-build-properly-spell-provide-in-.wrap-files.patch \
12" 13"
13SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c" 14SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c"
14 15