From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- ...-0.4.10-config-disable-sound-server-parts.patch | 26 +++++++ .../files/wireplumber-0.4.11-alsa-lua-crash.patch | 33 ++++++++ ...ment-which-options-need-to-be-turned-off-.patch | 87 ---------------------- ...icy-device-profile-clear-tables-when-devi.patch | 33 -------- 4 files changed, 59 insertions(+), 120 deletions(-) create mode 100644 media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch create mode 100644 media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch delete mode 100644 media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch delete mode 100644 media-video/wireplumber/files/wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch (limited to 'media-video/wireplumber/files') diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch b/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch new file mode 100644 index 000000000000..a8bf6f106129 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch @@ -0,0 +1,26 @@ +commit 3d86f51d2c43fd76be2450a8c27836fdd8619cfa +Author: Igor V. Kovalenko +Date: Sun May 15 18:19:03 2022 +0300 + + config: Disable alsa and bluez monitors by default + +diff --git a/src/config/bluetooth.lua.d/50-bluez-config.lua b/src/config/bluetooth.lua.d/50-bluez-config.lua +index d5727d3..938eae0 100644 +--- a/src/config/bluetooth.lua.d/50-bluez-config.lua ++++ b/src/config/bluetooth.lua.d/50-bluez-config.lua +@@ -1,4 +1,4 @@ +-bluez_monitor.enabled = true ++bluez_monitor.enabled = false + + bluez_monitor.properties = { + -- These features do not work on all headsets, so they are enabled +diff --git a/src/config/main.lua.d/50-alsa-config.lua b/src/config/main.lua.d/50-alsa-config.lua +index 3468333..d4c065b 100644 +--- a/src/config/main.lua.d/50-alsa-config.lua ++++ b/src/config/main.lua.d/50-alsa-config.lua +@@ -1,4 +1,4 @@ +-alsa_monitor.enabled = true ++alsa_monitor.enabled = false + + alsa_monitor.properties = { + -- Create a JACK device. This is not enabled by default because diff --git a/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch b/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch new file mode 100644 index 000000000000..3bc8bbd08bb6 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch @@ -0,0 +1,33 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c16e637c329bc9dda8544b18f5bd47a8d63ee253 + +From c16e637c329bc9dda8544b18f5bd47a8d63ee253 Mon Sep 17 00:00:00 2001 +From: George Kiagiadakis +Date: Thu, 7 Jul 2022 20:58:36 +0300 +Subject: [PATCH] alsa: use "obj_type" as a variable name to avoid shadowing + lua's "type" function + +This causes a crash when running in a VM because the code tries to +execute lua's "type()" and ends up executing the local string variable... + +Fixes: #303 +--- a/src/scripts/monitors/alsa.lua ++++ b/src/scripts/monitors/alsa.lua +@@ -49,7 +49,7 @@ function nonempty(str) + return str ~= "" and str or nil + end + +-function createNode(parent, id, type, factory, properties) ++function createNode(parent, id, obj_type, factory, properties) + local dev_props = parent.properties + + -- set the device id and spa factory name; REQUIRED, do not change +@@ -199,7 +199,7 @@ function createDevice(parent, id, factory, properties) + end + end + +-function prepareDevice(parent, id, type, factory, properties) ++function prepareDevice(parent, id, obj_type, factory, properties) + -- ensure the device has an appropriate name + local name = "alsa_card." .. + (properties["device.name"] or +GitLab diff --git a/media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch b/media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch deleted file mode 100644 index 9e664ec56564..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch +++ /dev/null @@ -1,87 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/0da29f38181e391160fa8702623050b8544ec775 - -From 0da29f38181e391160fa8702623050b8544ec775 Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis -Date: Mon, 4 Apr 2022 14:38:28 +0300 -Subject: [PATCH] config: document which options need to be turned off to use - wp without D-Bus - -and actually implement an option for the logind module - -Related to: #237 ---- - src/config/bluetooth.lua.d/30-bluez-monitor.lua | 4 +++- - src/config/bluetooth.lua.d/50-bluez-config.lua | 8 ++++++++ - src/config/main.lua.d/50-alsa-config.lua | 4 +++- - src/config/main.lua.d/50-default-access-config.lua | 3 +++ - 4 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/src/config/bluetooth.lua.d/30-bluez-monitor.lua b/src/config/bluetooth.lua.d/30-bluez-monitor.lua -index 266d3e2f..ba86657f 100644 ---- a/src/config/bluetooth.lua.d/30-bluez-monitor.lua -+++ b/src/config/bluetooth.lua.d/30-bluez-monitor.lua -@@ -8,5 +8,7 @@ function bluez_monitor.enable() - rules = bluez_monitor.rules, - }) - -- load_optional_module("logind") -+ if bluez_monitor.properties["with-logind"] then -+ load_optional_module("logind") -+ end - end -diff --git a/src/config/bluetooth.lua.d/50-bluez-config.lua b/src/config/bluetooth.lua.d/50-bluez-config.lua -index 072504ec..dd8033ff 100644 ---- a/src/config/bluetooth.lua.d/50-bluez-config.lua -+++ b/src/config/bluetooth.lua.d/50-bluez-config.lua -@@ -34,6 +34,14 @@ bluez_monitor.properties = { - -- Register dummy AVRCP player, required for AVRCP volume function. - -- Disable if you are running mpris-proxy or equivalent. - --["bluez5.dummy-avrcp-player"] = true, -+ -+ -- Enable the logind module, which arbitrates which user will be allowed -+ -- to have bluetooth audio enabled at any given time (particularly useful -+ -- if you are using GDM as a display manager, as the gdm user also launches -+ -- pipewire and wireplumber). -+ -- This requires access to the D-Bus user session; disable if you are running -+ -- a system-wide instance of wireplumber. -+ ["with-logind"] = true, - } - - bluez_monitor.rules = { -diff --git a/src/config/main.lua.d/50-alsa-config.lua b/src/config/main.lua.d/50-alsa-config.lua -index 6c97e8ad..d29b0b6f 100644 ---- a/src/config/main.lua.d/50-alsa-config.lua -+++ b/src/config/main.lua.d/50-alsa-config.lua -@@ -7,6 +7,8 @@ alsa_monitor.properties = { - --["alsa.jack-device"] = false, - - -- Reserve devices via org.freedesktop.ReserveDevice1 on D-Bus -+ -- Disable if you are running a system-wide instance, which -+ -- doesn't have access to the D-Bus user session - ["alsa.reserve"] = true, - --["alsa.reserve.priority"] = -20, - --["alsa.reserve.application-name"] = "WirePlumber", -@@ -20,7 +22,7 @@ alsa_monitor.properties = { - - alsa_monitor.rules = { - -- An array of matches/actions to evaluate. -- -- -+ -- - -- If you want to disable some devices or nodes, you can apply properties per device as the following example. - -- The name can be found by running pw-cli ls Device, or pw-cli dump Device - --{ -diff --git a/src/config/main.lua.d/50-default-access-config.lua b/src/config/main.lua.d/50-default-access-config.lua -index 6cf18bed..45cc5b73 100644 ---- a/src/config/main.lua.d/50-default-access-config.lua -+++ b/src/config/main.lua.d/50-default-access-config.lua -@@ -1,4 +1,7 @@ - default_access.properties = { -+ -- Enable the use of the flatpak portal integration. -+ -- Disable if you are running a system-wide instance, which -+ -- doesn't have access to the D-Bus user session - ["enable-flatpak-portal"] = true, - } - --- -GitLab - diff --git a/media-video/wireplumber/files/wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch b/media-video/wireplumber/files/wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch deleted file mode 100644 index 4dc8e276fbfa..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/da5d25acbea5ae03336bd2b4ef2b0687b380978e - -From da5d25acbea5ae03336bd2b4ef2b0687b380978e Mon Sep 17 00:00:00 2001 -From: Pauli Virtanen -Date: Mon, 28 Mar 2022 20:16:52 +0300 -Subject: [PATCH] scripts: policy-device-profile: clear tables when devices - removed - -When device ids are invalidated, clear all local tables about them, -because the id may be reused by different object, or the same object -reappearing. ---- - src/scripts/policy-device-profile.lua | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/scripts/policy-device-profile.lua b/src/scripts/policy-device-profile.lua -index d0aa2696..9daeafaa 100644 ---- a/src/scripts/policy-device-profile.lua -+++ b/src/scripts/policy-device-profile.lua -@@ -229,4 +229,10 @@ self.om:connect("object-added", function (_, device) - handleProfiles (device, true) - end) - -+self.om:connect("object-removed", function (_, device) -+ local dev_id = device["bound-id"] -+ self.active_profiles[dev_id] = nil -+ self.best_profiles[dev_id] = nil -+end) -+ - self.om:activate() --- -GitLab - -- cgit v1.2.3