git: a088dbb45bd9 - main - net/gupnp-tools: unbreak build with Meson 1.2.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 29 Jul 2023 00:49:49 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a088dbb45bd994ff8aa98e4d50bf7e4fa3fe5fb5
commit a088dbb45bd994ff8aa98e4d50bf7e4fa3fe5fb5
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-03-25 14:46:05 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-07-29 00:11:01 +0000
net/gupnp-tools: unbreak build with Meson 1.2.0
meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"?
meson.build:1:0: ERROR: Multiple wrap files provide 'dependency_name' dependency: gupnp-av-1.0.wrap and gupnp-1.6.wrap
PR: 272276
Reported by: antoine (via exp-run)
Regressed by: https://github.com/mesonbuild/meson/commit/6f4973abad9e
---
net/gupnp-tools/files/patch-meson | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/net/gupnp-tools/files/patch-meson b/net/gupnp-tools/files/patch-meson
new file mode 100644
index 000000000000..37deaa3b9bc3
--- /dev/null
+++ b/net/gupnp-tools/files/patch-meson
@@ -0,0 +1,35 @@
+Reference: https://github.com/mesonbuild/meson/commit/6f4973abad9eec9fcc915117f1c3d1a93ccc948c
+
+--- subprojects/gssdp-1.6.wrap.orig 2022-10-11 21:00:49 UTC
++++ subprojects/gssdp-1.6.wrap
+@@ -3,6 +3,6 @@ depth = 1
+ revision = master
+ depth = 1
+
+-[provides]
+-dependency_name = gssdp-1.2
++[provide]
++dependency_names = gssdp-1.6
+
+--- subprojects/gupnp-1.6.wrap.orig 2022-10-11 21:00:49 UTC
++++ subprojects/gupnp-1.6.wrap
+@@ -3,6 +3,6 @@ depth = 1
+ revision = master
+ depth = 1
+
+-[provides]
+-dependency_name = gupnp-1.2
++[provide]
++dependency_names = gupnp-1.6
+
+--- subprojects/gupnp-av-1.0.wrap.orig 2022-10-11 21:00:49 UTC
++++ subprojects/gupnp-av-1.0.wrap
+@@ -3,6 +3,6 @@ depth = 1
+ revision = master
+ depth = 1
+
+-[provides]
+-dependency_name = gupnp-av-1.0
++[provide]
++dependency_names = gupnp-av-1.0
+