summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-multimedia/recipes-multimedia/pipewire/files/0001-meson-Add-option-to-enable-disable-legacy-RTKit-modu.patch44
-rw-r--r--meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.50.bb (renamed from meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.49.bb)6
2 files changed, 2 insertions, 48 deletions
diff --git a/meta-multimedia/recipes-multimedia/pipewire/files/0001-meson-Add-option-to-enable-disable-legacy-RTKit-modu.patch b/meta-multimedia/recipes-multimedia/pipewire/files/0001-meson-Add-option-to-enable-disable-legacy-RTKit-modu.patch
deleted file mode 100644
index 61bcdb3dd..000000000
--- a/meta-multimedia/recipes-multimedia/pipewire/files/0001-meson-Add-option-to-enable-disable-legacy-RTKit-modu.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From b311f9e75f13205fd0738f7e89fd2062b9e7b237 Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <crg7475@mailbox.org>
3Date: Wed, 30 Mar 2022 19:44:38 +0200
4Subject: [PATCH] meson: Add option to enable/disable legacy RTKit module
5
6The RTKit module is being replaced by the RT module. Currently, it is
7always built if D-Bus is present. For packagers, it can be beneficial to
8be able to disable the legacy module. Add a Meson option to allow for
9exactly that. Make it enabled by default to not change default behavior.
10
11Upstream-Status: Submitted [https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1204]
12---
13 meson_options.txt | 4 ++++
14 src/modules/meson.build | 2 +-
15 2 files changed, 5 insertions(+), 1 deletion(-)
16
17diff --git a/meson_options.txt b/meson_options.txt
18index 49d5b2203..2687bfe7e 100644
19--- a/meson_options.txt
20+++ b/meson_options.txt
21@@ -237,3 +237,7 @@ option('libcanberra',
22 description: 'Enable code that depends on libcanberra',
23 type: 'feature',
24 value: 'auto')
25+option('legacy-rtkit',
26+ description: 'Build legacy rtkit module',
27+ type: 'boolean',
28+ value: 'true')
29diff --git a/src/modules/meson.build b/src/modules/meson.build
30index ee724bf52..2d26cc459 100644
31--- a/src/modules/meson.build
32+++ b/src/modules/meson.build
33@@ -139,7 +139,7 @@ pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ],
34 dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep],
35 )
36
37-build_module_rtkit = dbus_dep.found()
38+build_module_rtkit = dbus_dep.found() and (get_option('legacy-rtkit') == true)
39 if build_module_rtkit
40 # TODO: This serves as a temporary alias to prevent breaking existing setups
41 # while `module-rtkit` is being migrated to `module-rt`
42--
432.32.0
44
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.49.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.50.bb
index b821f4400..0d725b9ee 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.49.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.50.bb
@@ -13,10 +13,8 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS = "dbus ncurses" 14DEPENDS = "dbus ncurses"
15 15
16SRCREV = "075e7b266876802eab0077afd13ea8e1cee5e1fd" 16SRCREV = "64cf5e80e6240284e6b757907b900507fe56f1b5"
17SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https \ 17SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https"
18 file://0001-meson-Add-option-to-enable-disable-legacy-RTKit-modu.patch \
19 "
20 18
21S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
22 20