From 9e5c2053d2a0eeb1a2253012ecbfcc65e82be324 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 22 Nov 2018 19:25:53 -0200 Subject: [PATCH] pipewire: switch RLIMIT_RTTIME patch to one being upstreamed --- .../patches/fix-usage-of-rlimit-rttime.patch | 39 ++++++++++++------- srcpkgs/pipewire/template | 2 +- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/srcpkgs/pipewire/patches/fix-usage-of-rlimit-rttime.patch b/srcpkgs/pipewire/patches/fix-usage-of-rlimit-rttime.patch index a0110168592..9a4f4dd700d 100644 --- a/srcpkgs/pipewire/patches/fix-usage-of-rlimit-rttime.patch +++ b/srcpkgs/pipewire/patches/fix-usage-of-rlimit-rttime.patch @@ -1,18 +1,29 @@ +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 -@@ -417,6 +417,7 @@ static void idle_func(struct spa_source *source) - system_bus = pw_rtkit_bus_get_system(); +@@ -95,6 +95,10 @@ struct impl { + #define RTKIT_SERVICE_NAME "org.freedesktop.RealtimeKit1" + #define RTKIT_OBJECT_PATH "/org/freedesktop/RealtimeKit1" - rl.rlim_cur = rl.rlim_max = rttime; -+#ifdef RLIMIT_RTTIME - if ((r = setrlimit(RLIMIT_RTTIME, &rl)) < 0) - pw_log_debug("setrlimit() failed: %s", strerror(errno)); - -@@ -430,6 +431,7 @@ static void idle_func(struct spa_source *source) - pw_log_debug("setrlimit() failed: %s", strerror(errno)); - } - } ++#ifndef RLIMIT_RTTIME ++#define RLIMIT_RTTIME 15 +#endif - - if ((r = pw_rtkit_make_realtime(system_bus, 0, rtprio)) < 0) { - pw_log_debug("could not make thread realtime: %s", strerror(r)); ++ + /** \cond */ + struct pw_rtkit_bus { + DBusConnection *bus; +-- +2.19.2 + + diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 2cfbb649e36..c35bd781515 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,7 +1,7 @@ # Template file for 'pipewire' pkgname=pipewire version=0.2.4 -revision=1 +revision=2 build_style=meson configure_args="-Dman=true -Dgstreamer=enabled -Ddocs=true -Dsystemd=false" hostmakedepends="doxygen graphviz pkg-config xmltoman"