Re: [PR PATCH] [Updated] [Testing needed] New package: wireplumber-0.3.0

[PaperMountainStudio <PaperMountainStudio@users.noreply.github.com>]

[-- 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
+}