Date: Saturday, May 8, 2021 @ 17:22:15 Author: dvzrv Revision: 928893
upgpkg: wireplumber 0.3.95-1: Upgrade to 0.3.95. Remove patch for system toml as it is not in use anymore. Add lua as new optional dependency for lua scripting. Modified: wireplumber/trunk/PKGBUILD Deleted: wireplumber/trunk/wireplumber-0.3.0-devendor_cpptoml.patch ------------------------------------------+ PKGBUILD | 34 +++++---------- wireplumber-0.3.0-devendor_cpptoml.patch | 65 ----------------------------- 2 files changed, 12 insertions(+), 87 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-08 17:19:27 UTC (rev 928892) +++ PKGBUILD 2021-05-08 17:22:15 UTC (rev 928893) @@ -1,7 +1,7 @@ # Maintainer: David Runge <dv...@archlinux.org> pkgname=wireplumber -pkgver=0.3.0 +pkgver=0.3.95 pkgrel=1 pkgdesc="Session / policy manager implementation for PipeWire" arch=('x86_64') @@ -8,32 +8,22 @@ url="https://gitlab.freedesktop.org/pipewire/wireplumber" license=('MIT') depends=('gcc-libs' 'glibc') -makedepends=('cmake' 'cpptoml' 'glib2' 'gobject-introspection' 'meson' 'pipewire') +makedepends=('cmake' 'cpptoml' 'glib2' 'gobject-introspection' 'hotdoc' 'lua53' +'meson' 'pipewire' 'systemd') checkdepends=('pipewire-alsa' 'pipewire-jack' 'pipewire-pulse') +optdepends=('lua53: for LUA scripting') provides=('libwireplumber-0.3.so') -source=("$pkgname-$pkgver.tar.gz::https://gitlab.freedesktop.org/pipewire/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz" - "${pkgname}-0.3.0-devendor_cpptoml.patch") -sha512sums=('4cdfa5e91ae5e0b7b9899a3aaa761e57f01af727df63d47f784f4128811d22bc2b9f22e1b37169a259fbef3c41a8ec2347c157bcc3fbebc91db67c5d2958c913' - 'b1656d3f4ad510bd4942889ef8169387639f02a92de4c70a16d690908a807d3806617a668b07858acf8f43a6ab9f364c26827744c08b394d0d7b667bb81b5b0b') -b2sums=('29e64b646681e1a556a6367b98e55e944f3cce60905ca9b201ec373720a2d8af3cc60ca1991fd8485677165d47e5bc9f3ad9f9ecf009a1d7fd607a03e468c01d' - 'b589a0c88153f27c21ca4a1bdfeedd3b1a87b60abe8b4ed3568ba34b75919ef187aa686ee265c1444d44ff055d95d57e14a0947b1715c294cab380ecba0b68e7') +source=("$pkgname-$pkgver.tar.gz::https://gitlab.freedesktop.org/pipewire/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha512sums=('39e8eddc7152a062414dc19b51a8bfa105b1446a2cc9fca17f1ea7b42f6333d3e34e1eb996dfbe1222475ad9ce7b58f0bac2969e1763885c59e7aea160cb58fc') +b2sums=('b80f6b6f1fd25ce9e058cdcf97433df1b91b6ee8135f137c610e6bc0e0dcba5dc409855f3feede390ca88ec117346e1c4d6210bb9180c83553ca47ff3d39d037') -prepare() { - cd "$pkgname-$pkgver" - # allow using system cpptoml - # https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/17 - patch -Np1 -i "../${pkgname}-0.3.0-devendor_cpptoml.patch" -} - build() { cd "$pkgname-$pkgver" - meson --prefix='/usr' \ - --buildtype plain \ - --wrap-mode nodownload \ - -D b_lto=true \ - -D b_pie=true \ - -Dintrospection=enabled \ - build + arch-meson \ + -Dsystem-lua=true \ + -Dsystemd-system-service=true \ + -Dsystemd-user-service=true \ + build ninja -C build } Deleted: wireplumber-0.3.0-devendor_cpptoml.patch =================================================================== --- wireplumber-0.3.0-devendor_cpptoml.patch 2021-05-08 17:19:27 UTC (rev 928892) +++ wireplumber-0.3.0-devendor_cpptoml.patch 2021-05-08 17:22:15 UTC (rev 928893) @@ -1,65 +0,0 @@ -diff -ruN a/lib/wptoml/array.cpp b/lib/wptoml/array.cpp ---- a/lib/wptoml/array.cpp 2020-06-29 18:36:49.000000000 +0200 -+++ b/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 a/lib/wptoml/file.cpp b/lib/wptoml/file.cpp ---- a/lib/wptoml/file.cpp 2020-06-29 18:36:49.000000000 +0200 -+++ b/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 a/lib/wptoml/table.cpp b/lib/wptoml/table.cpp ---- a/lib/wptoml/table.cpp 2020-06-29 18:36:49.000000000 +0200 -+++ b/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 a/meson.build b/meson.build ---- a/meson.build 2020-06-29 18:36:49.000000000 +0200 -+++ b/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 a/subprojects/cpptoml.wrap b/subprojects/cpptoml.wrap ---- a/subprojects/cpptoml.wrap 2020-06-29 18:36:49.000000000 +0200 -+++ b/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