* Re: [PR PATCH] [Updated] [Testing needed] New package: wireplumber-0.3.0
2020-11-07 9:43 [PR PATCH] [Testing needed] New package: wireplumber-0.3.0 PaperMountainStudio
@ 2020-11-07 9:54 ` PaperMountainStudio
2020-11-07 12:49 ` ericonr
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: PaperMountainStudio @ 2020-11-07 9:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
There is an updated pull request by PaperMountainStudio against master on the void-packages repository
https://github.com/PaperMountainStudio/void-packages 0001-New-package-wireplumber-0.3.0.patch
https://github.com/void-linux/void-packages/pull/26194
[Testing needed] New package: wireplumber-0.3.0
A patch file from https://github.com/void-linux/void-packages/pull/26194.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-New-package-wireplumber-0.3.0.patch-26194.patch --]
[-- Type: text/x-diff, Size: 4660 bytes --]
From e9a36869743fe4c90c9af39e336be228b0cf4d1a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 7 Nov 2020 10:53:49 +0100
Subject: [PATCH 1/2] New package: cpptoml-0.1.1
---
srcpkgs/cpptoml/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/cpptoml/template
diff --git a/srcpkgs/cpptoml/template b/srcpkgs/cpptoml/template
new file mode 100644
index 00000000000..d71d29e8ffb
--- /dev/null
+++ b/srcpkgs/cpptoml/template
@@ -0,0 +1,15 @@
+# Template file for 'cpptoml'
+pkgname=cpptoml
+version=0.1.1
+revision=1
+build_style=cmake
+short_desc="Header-only library for parsing TOML"
+maintainer="Paper <paper@tilde.institute>"
+license="MIT"
+homepage="https://github.com/skystrife/cpptoml/"
+distfiles="https://github.com/skystrife/cpptoml/archive/v${version}.tar.gz"
+checksum=23af72468cfd4040984d46a0dd2a609538579c78ddc429d6b8fd7a10a6e24403
+
+post_install() {
+ vlicense LICENSE
+}
From 5582ec8cac80909e84b64c1fee269c09d07de3a1 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 7 Nov 2020 10:54:03 +0100
Subject: [PATCH 2/2] New package: wireplumber-0.3.0
---
.../wireplumber-0.3.0-devendor_cpptoml.patch | 66 +++++++++++++++++++
srcpkgs/wireplumber/template | 17 +++++
2 files changed, 83 insertions(+)
create mode 100644 srcpkgs/wireplumber/patches/wireplumber-0.3.0-devendor_cpptoml.patch
create mode 100644 srcpkgs/wireplumber/template
diff --git a/srcpkgs/wireplumber/patches/wireplumber-0.3.0-devendor_cpptoml.patch b/srcpkgs/wireplumber/patches/wireplumber-0.3.0-devendor_cpptoml.patch
new file mode 100644
index 00000000000..8ba655a2d7b
--- /dev/null
+++ b/srcpkgs/wireplumber/patches/wireplumber-0.3.0-devendor_cpptoml.patch
@@ -0,0 +1,66 @@
+patch from arch linux
+diff -ruN lib/wptoml/array.cpp lib/wptoml/array.cpp
+--- lib/wptoml/array.cpp 2020-06-29 18:36:49.000000000 +0200
++++ lib/wptoml/array.cpp 2020-07-19 09:50:14.930311451 +0200
+@@ -10,7 +10,7 @@
+ #include <functional>
+
+ /* CPPTOML */
+-#include <include/cpptoml.h>
++#include <cpptoml.h>
+
+ /* TOML */
+ #include "private.h"
+diff -ruN lib/wptoml/file.cpp lib/wptoml/file.cpp
+--- lib/wptoml/file.cpp 2020-06-29 18:36:49.000000000 +0200
++++ lib/wptoml/file.cpp 2020-07-19 09:50:28.923522152 +0200
+@@ -7,7 +7,7 @@
+ */
+
+ /* CPPTOML */
+-#include <include/cpptoml.h>
++#include <cpptoml.h>
+
+ /* TOML */
+ #include "private.h"
+diff -ruN lib/wptoml/table.cpp lib/wptoml/table.cpp
+--- lib/wptoml/table.cpp 2020-06-29 18:36:49.000000000 +0200
++++ lib/wptoml/table.cpp 2020-07-19 09:50:46.786698703 +0200
+@@ -10,7 +10,7 @@
+ #include <functional>
+
+ /* CPPTOML */
+-#include <include/cpptoml.h>
++#include <cpptoml.h>
+
+ /* TOML */
+ #include "private.h"
+diff -ruN meson.build meson.build
+--- meson.build 2020-06-29 18:36:49.000000000 +0200
++++ meson.build 2020-07-19 10:17:13.288978511 +0200
+@@ -26,9 +26,13 @@
+ wireplumber_config_dir = join_paths(get_option('prefix'), get_option('sysconfdir'), 'wireplumber')
+ endif
+
+-cmake = import('cmake')
+-cpptoml = cmake.subproject('cpptoml')
+-cpptoml_dep = cpptoml.dependency('cpptoml')
++if get_option('wrap_mode') == 'nodownload'
++ cpptoml_dep = dependency('cpptoml')
++else
++ cmake = import('cmake')
++ cpptoml = cmake.subproject('cpptoml')
++ cpptoml_dep = cpptoml.dependency('cpptoml')
++endif
+
+ gobject_dep = dependency('gobject-2.0', version : '>= 2.58')
+ gmodule_dep = dependency('gmodule-2.0', version : '== ' + gobject_dep.version())
+diff -ruN subprojects/cpptoml.wrap subprojects/cpptoml.wrap
+--- subprojects/cpptoml.wrap 2020-06-29 18:36:49.000000000 +0200
++++ subprojects/cpptoml.wrap 2020-07-19 10:16:27.232734437 +0200
+@@ -1,4 +1,4 @@
+ [wrap-git]
+ directory=cpptoml
+ url=https://github.com/skystrife/cpptoml.git
+-revision=master
++revision=v0.1.1
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
new file mode 100644
index 00000000000..05b8d680a84
--- /dev/null
+++ b/srcpkgs/wireplumber/template
@@ -0,0 +1,17 @@
+# Template file for 'wireplumber'
+pkgname=wireplumber
+version=0.3.0
+revision=1
+build_style=meson
+hostmakedepends="git gobject-introspection pkg-config cmake"
+makedepends="glib-devel cpptoml pipewire-devel"
+short_desc="Modular session / policy manager for PipeWire"
+maintainer="Paper <paper@tilde.institute>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/pipewire/wireplumber/"
+distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
+checksum=bb63a8cdd0b0a50a4faff4329ac2eacf986709ac1f98a7ceaaa94554534fc3c2
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Testing needed] New package: wireplumber-0.3.0
2020-11-07 9:43 [PR PATCH] [Testing needed] New package: wireplumber-0.3.0 PaperMountainStudio
2020-11-07 9:54 ` [PR PATCH] [Updated] " PaperMountainStudio
@ 2020-11-07 12:49 ` ericonr
2020-11-07 15:06 ` [PR PATCH] [Updated] " PaperMountainStudio
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-11-07 12:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26194#issuecomment-723442358
Comment:
Do you think other packages will come to use cpptoml? Otherwise having to carry a patch to devendor it doesn't sound super nice :/ (unless that goes upstream).
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [Testing needed] New package: wireplumber-0.3.0
2020-11-07 9:43 [PR PATCH] [Testing needed] New package: wireplumber-0.3.0 PaperMountainStudio
2020-11-07 9:54 ` [PR PATCH] [Updated] " PaperMountainStudio
2020-11-07 12:49 ` ericonr
@ 2020-11-07 15:06 ` PaperMountainStudio
2020-11-07 15:06 ` PaperMountainStudio
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: PaperMountainStudio @ 2020-11-07 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
There is an updated pull request by PaperMountainStudio against master on the void-packages repository
https://github.com/PaperMountainStudio/void-packages 0001-New-package-wireplumber-0.3.0.patch
https://github.com/void-linux/void-packages/pull/26194
[Testing needed] New package: wireplumber-0.3.0
A patch file from https://github.com/void-linux/void-packages/pull/26194.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-New-package-wireplumber-0.3.0.patch-26194.patch --]
[-- Type: text/x-diff, Size: 5383 bytes --]
From e9a36869743fe4c90c9af39e336be228b0cf4d1a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 7 Nov 2020 10:53:49 +0100
Subject: [PATCH 1/2] New package: cpptoml-0.1.1
---
srcpkgs/cpptoml/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/cpptoml/template
diff --git a/srcpkgs/cpptoml/template b/srcpkgs/cpptoml/template
new file mode 100644
index 00000000000..d71d29e8ffb
--- /dev/null
+++ b/srcpkgs/cpptoml/template
@@ -0,0 +1,15 @@
+# Template file for 'cpptoml'
+pkgname=cpptoml
+version=0.1.1
+revision=1
+build_style=cmake
+short_desc="Header-only library for parsing TOML"
+maintainer="Paper <paper@tilde.institute>"
+license="MIT"
+homepage="https://github.com/skystrife/cpptoml/"
+distfiles="https://github.com/skystrife/cpptoml/archive/v${version}.tar.gz"
+checksum=23af72468cfd4040984d46a0dd2a609538579c78ddc429d6b8fd7a10a6e24403
+
+post_install() {
+ vlicense LICENSE
+}
From b6c61dfbf4c94c4beb67c96da90d50ab680700a7 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 7 Nov 2020 10:54:03 +0100
Subject: [PATCH 2/2] New package: wireplumber-0.3.0
---
.../patches/allow-system-cpptoml.patch | 101 ++++++++++++++++++
srcpkgs/wireplumber/template | 19 ++++
2 files changed, 120 insertions(+)
create mode 100644 srcpkgs/wireplumber/patches/allow-system-cpptoml.patch
create mode 100644 srcpkgs/wireplumber/template
diff --git a/srcpkgs/wireplumber/patches/allow-system-cpptoml.patch b/srcpkgs/wireplumber/patches/allow-system-cpptoml.patch
new file mode 100644
index 00000000000..fd428440663
--- /dev/null
+++ b/srcpkgs/wireplumber/patches/allow-system-cpptoml.patch
@@ -0,0 +1,101 @@
+upstream: yes
+From fbe1e5177b9703366d121d9b5857a2d72e895590 Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Sun, 19 Jul 2020 10:25:29 +0200
+Subject: [PATCH] Allow system cpptoml
+
+meson.build:
+When the 'wrap_mode' option is set to 'nodownload' use a system version
+of cpptoml. This does not require using git and having a network
+connection during build, which is important for Linux packaging
+infrastructure.
+
+subprojects/cpptoml.wrap:
+Pin revision to last release tag (v0.1.1).
+
+lib/wptoml/*.cpp:
+Remove 'include/' prefix from all cpptoml related includes, at is not
+required.
+
+Closes #17
+---
+ lib/wptoml/array.cpp | 2 +-
+ lib/wptoml/file.cpp | 2 +-
+ lib/wptoml/table.cpp | 2 +-
+ meson.build | 10 +++++++---
+ subprojects/cpptoml.wrap | 2 +-
+ 5 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/lib/wptoml/array.cpp b/lib/wptoml/array.cpp
+index a907d262..92b51803 100644
+--- a/lib/wptoml/array.cpp
++++ b/lib/wptoml/array.cpp
+@@ -10,7 +10,7 @@
+ #include <functional>
+
+ /* CPPTOML */
+-#include <include/cpptoml.h>
++#include <cpptoml.h>
+
+ /* TOML */
+ #include "private.h"
+diff --git a/lib/wptoml/file.cpp b/lib/wptoml/file.cpp
+index d39e468b..4b53e036 100644
+--- a/lib/wptoml/file.cpp
++++ b/lib/wptoml/file.cpp
+@@ -7,7 +7,7 @@
+ */
+
+ /* CPPTOML */
+-#include <include/cpptoml.h>
++#include <cpptoml.h>
+
+ /* TOML */
+ #include "private.h"
+diff --git a/lib/wptoml/table.cpp b/lib/wptoml/table.cpp
+index 3224826b..40368f58 100644
+--- a/lib/wptoml/table.cpp
++++ b/lib/wptoml/table.cpp
+@@ -10,7 +10,7 @@
+ #include <functional>
+
+ /* CPPTOML */
+-#include <include/cpptoml.h>
++#include <cpptoml.h>
+
+ /* TOML */
+ #include "private.h"
+diff --git a/meson.build b/meson.build
+index 650daa7c..9f71356f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,9 +26,13 @@ else
+ wireplumber_config_dir = join_paths(get_option('prefix'), get_option('sysconfdir'), 'wireplumber')
+ endif
+
+-cmake = import('cmake')
+-cpptoml = cmake.subproject('cpptoml')
+-cpptoml_dep = cpptoml.dependency('cpptoml')
++if get_option('wrap_mode') == 'nodownload'
++ cpptoml_dep = dependency('cpptoml')
++else
++ cmake = import('cmake')
++ cpptoml = cmake.subproject('cpptoml')
++ cpptoml_dep = cpptoml.dependency('cpptoml')
++endif
+
+ gobject_dep = dependency('gobject-2.0', version : '>= 2.58')
+ gmodule_dep = dependency('gmodule-2.0', version : '== ' + gobject_dep.version())
+diff --git a/subprojects/cpptoml.wrap b/subprojects/cpptoml.wrap
+index 7fa60bd9..a342dcbd 100644
+--- a/subprojects/cpptoml.wrap
++++ b/subprojects/cpptoml.wrap
+@@ -1,4 +1,4 @@
+ [wrap-git]
+ directory=cpptoml
+ url=https://github.com/skystrife/cpptoml.git
+-revision=master
++revision=v0.1.1
+--
+GitLab
+
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
new file mode 100644
index 00000000000..178442ebc68
--- /dev/null
+++ b/srcpkgs/wireplumber/template
@@ -0,0 +1,19 @@
+# Template file for 'wireplumber'
+pkgname=wireplumber
+version=0.3.0
+revision=1
+build_style=meson
+#configure_args="--wrap-mode=default"
+hostmakedepends="git gobject-introspection cmake pkg-config"
+makedepends="glib-devel pipewire-devel cpptoml"
+short_desc="Modular session / policy manager for PipeWire"
+maintainer="Paper <paper@tilde.institute>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/pipewire/wireplumber/"
+distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
+checksum=bb63a8cdd0b0a50a4faff4329ac2eacf986709ac1f98a7ceaaa94554534fc3c2
+patch_args="-Np1"
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Testing needed] New package: wireplumber-0.3.0
2020-11-07 9:43 [PR PATCH] [Testing needed] New package: wireplumber-0.3.0 PaperMountainStudio
` (2 preceding siblings ...)
2020-11-07 15:06 ` [PR PATCH] [Updated] " PaperMountainStudio
@ 2020-11-07 15:06 ` PaperMountainStudio
2020-11-07 17:10 ` ericonr
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: PaperMountainStudio @ 2020-11-07 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
New comment by PaperMountainStudio on void-packages repository
https://github.com/void-linux/void-packages/pull/26194#issuecomment-723457013
Comment:
similar patch is upstream, I updated the PR to use that patch instead of the archlinux one
cmake can not be found on arm architectures, I am not sure why
```
Found CMake: NO
Run-time dependency cpptoml found: NO (tried pkgconfig and cmake)
```
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Testing needed] New package: wireplumber-0.3.0
2020-11-07 9:43 [PR PATCH] [Testing needed] New package: wireplumber-0.3.0 PaperMountainStudio
` (3 preceding siblings ...)
2020-11-07 15:06 ` PaperMountainStudio
@ 2020-11-07 17:10 ` ericonr
2020-11-07 22:37 ` ericonr
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-11-07 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26194#issuecomment-723470143
Comment:
meson can be kinda screwy when doing cross and using cmake for detecting libraries. I have a patch that might fix this in the meson build style, but it's ugly as sin. And I believe meson is looking to improve how they use cmake for cross, so I wasn't sure I should PR it. https://github.com/ericonr/void-packages/commit/a722a66affb8b1110cfd5741bb1f9b1e6d8c8d73
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Testing needed] New package: wireplumber-0.3.0
2020-11-07 9:43 [PR PATCH] [Testing needed] New package: wireplumber-0.3.0 PaperMountainStudio
` (4 preceding siblings ...)
2020-11-07 17:10 ` ericonr
@ 2020-11-07 22:37 ` ericonr
2020-11-11 23:34 ` PaperMountainStudio
2021-04-29 15:24 ` [PR PATCH] [Closed]: " paper42
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-11-07 22:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26194#issuecomment-723503694
Comment:
you might be able to get away with only adding `-Dcmake=cmake` to configure_args, though in that case I'd consider adding it to the build style.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Testing needed] New package: wireplumber-0.3.0
2020-11-07 9:43 [PR PATCH] [Testing needed] New package: wireplumber-0.3.0 PaperMountainStudio
` (5 preceding siblings ...)
2020-11-07 22:37 ` ericonr
@ 2020-11-11 23:34 ` PaperMountainStudio
2021-04-29 15:24 ` [PR PATCH] [Closed]: " paper42
7 siblings, 0 replies; 9+ messages in thread
From: PaperMountainStudio @ 2020-11-11 23:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 350 bytes --]
New comment by PaperMountainStudio on void-packages repository
https://github.com/void-linux/void-packages/pull/26194#issuecomment-725721974
Comment:
> you might be able to get away with only adding `-Dcmake=cmake` to configure_args, though in that case I'd consider adding it to the build style.
sadly, no. should I mark it as nocross for now?
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Closed]: [Testing needed] New package: wireplumber-0.3.0
2020-11-07 9:43 [PR PATCH] [Testing needed] New package: wireplumber-0.3.0 PaperMountainStudio
` (6 preceding siblings ...)
2020-11-11 23:34 ` PaperMountainStudio
@ 2021-04-29 15:24 ` paper42
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-04-29 15:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
There's a closed pull request on the void-packages repository
[Testing needed] New package: wireplumber-0.3.0
https://github.com/void-linux/void-packages/pull/26194
Description:
^ permalink raw reply [flat|nested] 9+ messages in thread