diff --git a/srcpkgs/pipewire/patches/fix-building-when-systemd-is-false.patch b/srcpkgs/pipewire/patches/fix-building-when-systemd-is-false.patch deleted file mode 100644 index 5a1398d4636..00000000000 --- a/srcpkgs/pipewire/patches/fix-building-when-systemd-is-false.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9c4d1422f29367be6fa21da2cb027ebe85466939 Mon Sep 17 00:00:00 2001 -From: maxice8 -Date: Thu, 22 Nov 2018 17:36:59 -0200 -Subject: [PATCH] meson: Fix configure when systemd option is set to false - -Otherwise it fails with systemd variable not found. ---- - src/daemon/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/meson.build b/src/daemon/meson.build -index fb694e7c..f2a327fb 100644 ---- src/daemon/meson.build -+++ src/daemon/meson.build -@@ -29,6 +29,6 @@ executable('pipewire', - dependencies : [pipewire_dep], - ) - --if systemd.found() -+if get_option('systemd') and systemd.found() - subdir('systemd') - endif --- -2.19.2 - - diff --git a/srcpkgs/pipewire/patches/fix-usage-of-rlimit-rttime.patch b/srcpkgs/pipewire/patches/fix-usage-of-rlimit-rttime.patch deleted file mode 100644 index 9a4f4dd700d..00000000000 --- a/srcpkgs/pipewire/patches/fix-usage-of-rlimit-rttime.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f38ad123abd730258a483ca224a01ca059ce8a06 Mon Sep 17 00:00:00 2001 -From: maxice8 -Date: Thu, 22 Nov 2018 19:16:24 -0200 -Subject: [PATCH] module-rtkit: define RLIMIT_RTTIME in case it isn't defined. - -musl libc doesn't define RLIMIT_RTTIME ---- - src/modules/module-rtkit.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c -index b83db9c4..3670cdeb 100644 ---- src/modules/module-rtkit.c -+++ src/modules/module-rtkit.c -@@ -95,6 +95,10 @@ struct impl { - #define RTKIT_SERVICE_NAME "org.freedesktop.RealtimeKit1" - #define RTKIT_OBJECT_PATH "/org/freedesktop/RealtimeKit1" - -+#ifndef RLIMIT_RTTIME -+#define RLIMIT_RTTIME 15 -+#endif -+ - /** \cond */ - struct pw_rtkit_bus { - DBusConnection *bus; --- -2.19.2 - - diff --git a/srcpkgs/pipewire/patches/remove-dependency-on-systemd_dep.patch b/srcpkgs/pipewire/patches/remove-dependency-on-systemd_dep.patch deleted file mode 100644 index 193d1d827f5..00000000000 --- a/srcpkgs/pipewire/patches/remove-dependency-on-systemd_dep.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 005e518af7e6bc116a78187d4221d6fd70621c41 Mon Sep 17 00:00:00 2001 -From: maxice8 -Date: Thu, 22 Nov 2018 18:07:53 -0200 -Subject: [PATCH] meson: don't add systemd_dep to dependencies if systemd - option is false. - ---- - src/modules/meson.build | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/modules/meson.build b/src/modules/meson.build -index 4dcb6e59..619ca2ec 100644 ---- src/modules/meson.build -+++ src/modules/meson.build -@@ -71,6 +71,12 @@ pipewire_module_link_factory = shared_library('pipewire-module-link-factory', - # dependencies : [glib_dep, gio_dep, mathlib, dl_lib, pipewire_dep], - #) - -+pipewire_module_protocol_native_deps = [mathlib, dl_lib, pipewire_dep] -+ -+if get_option('systemd') -+ pipewire_module_protocol_native_deps += systemd_dep -+endif -+ - pipewire_module_protocol_native = shared_library('pipewire-module-protocol-native', - [ 'module-protocol-native.c', - 'module-protocol-native/local-socket.c', -@@ -81,7 +87,7 @@ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-nativ - include_directories : [configinc, spa_inc], - install : true, - install_dir : modules_install_dir, -- dependencies : [mathlib, dl_lib, pipewire_dep, systemd_dep], -+ dependencies : pipewire_module_protocol_native_deps, - ) - - pipewire_module_audio_dsp = shared_library('pipewire-module-audio-dsp', --- -2.19.2 - - diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index c35bd781515..13f5f533f90 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,7 +1,7 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.2.4 -revision=2 +version=0.2.5 +revision=1 build_style=meson configure_args="-Dman=true -Dgstreamer=enabled -Ddocs=true -Dsystemd=false" hostmakedepends="doxygen graphviz pkg-config xmltoman" @@ -13,7 +13,7 @@ license="LGPL-2.1-or-later" homepage="https://pipewire.org/" changelog="https://raw.githubusercontent.com/PipeWire/pipewire/master/NEWS" distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz" -checksum=228487683f4a4553787eecff97276ac4ab6c3cace9ccf6514d1c30904b9b2f57 +checksum=6e75bb88a329f97984925bd303643075788df8d51b345bb43feb1be2c3b7102c libpipewire_package() { short_desc+=" - pipewire library"