diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /media-video/wireplumber | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'media-video/wireplumber')
11 files changed, 647 insertions, 10 deletions
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest index 21993bd9f6f1..51dd01897706 100644 --- a/media-video/wireplumber/Manifest +++ b/media-video/wireplumber/Manifest @@ -1,9 +1,15 @@ +AUX wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch 3969 BLAKE2B 9d9fcdf2327834329e120e2322f03acb0a541b3095bba194be132b153769120e59d617bf4b64ebeb4cbc73caaf2fcbe2c6345da3aeef43ab88891edb93750f87 SHA512 406159756795c208ff809489dcd88fd0095681d9867a8c193f73e40709a27ce33a22a635bada6b5594f097113a5af47375d8814016554cbd6ad809ae18ad1502 +AUX wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch 4475 BLAKE2B baa62d342e3a5f753044f4f4f757064792424e05535b540c09ecef4ac70edf32edbae6a4a36ee87d9c041cccdd24d229ba828e50cdc303c50b1f6d4afef7b075 SHA512 4cce604cd7aa754b53d7473f0a12e764449f76932f7ee0fea6e2b5f6b1f11bc2a38a28eedea5f003a112836ecc6a209c3d5e4b29a582749be742d075e51e6518 +AUX wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch 7122 BLAKE2B bd4eee8b49d7bff9bb309c954576340ed336004a91240ebe96ed6e2cf46ffb2cef3c4546847bcd3ae911eea4ad62c65b7154555771524525512ffbee5eae4257 SHA512 cd241cfd3578fff49b9f6be8fbbb291ccdcfc9e65ceb45a3a92410a7914557614ff57959d94fa9954bf5933b61632b430410860887b6d7578182cbd9b7be75e1 +AUX wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch 1256 BLAKE2B 0e3148edf9811b2a090c1127afee5c8c9094e1b80fb2186980b38faf08b3eedc11d394261676a1416b7d22a9f21b45c5b1522a60a1a2383474cd5d7c4bf93da3 SHA512 2e9b94dcb5daa8e85a56222d2570c5085d322c4bfe251edad1792e8fe870686473bb52a4ef43be034bccb68093e01b5c0bf1e035778edb985568d9f01b45afbb +AUX wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch 1200 BLAKE2B ee73f3555418dad6a5c20e401e6f77ec22673b7079d04babe517617771c3d3b29e69ec37a933b1993fc5cfaa0200ee0a70178b7383b4086d9a63765a0d986301 SHA512 fa9fb26868b96742c972574eb2e82e91f54a3a3fe3911136b0c4886ff6324fcf35683059801113a0cc409f9a79383155e7cac1f4b18e0566da724c1fd3679d3d AUX wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch 3610 BLAKE2B d473e299a6c22de630786ea4e8ff739aae2975614c79b6fc195a908b4431cc0eba57cfd688865f5c9fe91adf105b75fd6bbe8c00872b8640a8a7a36caabcb620 SHA512 f9770ec2afd83908d473d28cb8972212f57e7e12a64490417f5c301872e3c4cec644090480e60ad9085bbea8f0fc86c521e90b8853534acfe6959dfd5ed9a832 AUX wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch 1102 BLAKE2B 2a1e2cbe901e6284002f1393621f26d9c7eebee9eb4edc334dc9712095724a32de9f5a3def5121c28f1690b9ed634c9d3fe843c4ae221567e60f6140fe6b9339 SHA512 25a70e02e403cf155a4aaa6bc63a8f3d4cae712814932a5529366ea4ad2ef31d6c14080294ae4b9a1bab7ad433c26dde71df88123815159206d3f3c76481824a DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ccccebbf72b75d35d10990fac11b5228275f27e5320885ff1ec SHA512 342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f DIST wireplumber-0.4.9.tar.gz 376170 BLAKE2B 50f552c730ac543fc2e8b0e054c861bcd22ed281a62f2921fb956f39b917cce6eb53287dfcfc81db240476f82f5cf1d7556fa34be8bf507ff847089536b81f44 SHA512 39b9e9be014489042fe480219b99d7591e0b68dd44b889bd5c6aeee73e771adb807bc21f48d031217f097182827bd2f48b68d52291036d52e95d4fa75e7f9929 -EBUILD wireplumber-0.4.10.ebuild 3554 BLAKE2B 5fffbb92a92c479a326e111215ebecfcc675494cb804913eede2252193629fdf09cd11bcaf63bcb0cd7767926b931e3041b6a9eee1a775e9e144525da673c8d1 SHA512 d3e0cb716523df0ff5be7491992b71d7d576d9929dd75434abcf00e81a46e17e2a11a228b897c25b669a0e2df4151b3595f14c2330fabf53935cb4c9e78e387f -EBUILD wireplumber-0.4.9-r1.ebuild 3689 BLAKE2B fbc08a9345afaabe31c270b60ce69daf78834a165c64aadf0eb6e6ad7ad5a300676107c377ee11f720df9cd11a8ca300cfea902679679ba1a0e67b0fdd043b5c SHA512 738d760ede5bd05047f399987e7266ee0c732e62f5449468c90dab39385e11e37d67d7559d96229467550e380ba30afbbbb72c08e0c733872ef6f961c4169e27 -EBUILD wireplumber-0.4.9.ebuild 3512 BLAKE2B edd21937127291c47bf9d87566172a22cde8a1aeb24eda1be76355abf5c734192c1b18cb62eade6fab59df8cb1cbf590201a77f9e4eee1e806384f7d9b2b10d6 SHA512 9751335866a253c0598653638600dc3b713adc7377d5f453a2286b7ef0d0a75751f32819c3bdb76a91e7d874109c5e9d511c12c882971c7ff716928c42119081 -EBUILD wireplumber-9999.ebuild 3554 BLAKE2B 5fffbb92a92c479a326e111215ebecfcc675494cb804913eede2252193629fdf09cd11bcaf63bcb0cd7767926b931e3041b6a9eee1a775e9e144525da673c8d1 SHA512 d3e0cb716523df0ff5be7491992b71d7d576d9929dd75434abcf00e81a46e17e2a11a228b897c25b669a0e2df4151b3595f14c2330fabf53935cb4c9e78e387f +EBUILD wireplumber-0.4.10-r1.ebuild 3654 BLAKE2B 43f15fe7997b85dd0cade5c0393f7088766482914e7767926a2d714dc73b17efee6614984200a694c3ce2bcdd2325a6a63768d958fefc044c513d516b6981129 SHA512 dba2d1bff0f1a90bfce06df57e9464a71a27aad3ffe1720cd39402da76579aafb363e3a0fe450d392dff57d3c12f6a1480141c5cb95f7e510b948b654faa63a4 +EBUILD wireplumber-0.4.10-r3.ebuild 3948 BLAKE2B 19ffa6b1593b745fc0fc29a106e0587f286170513833ba7dd6288afd2cadc16c5ca0e54022958948f4ef6bb557313ffbbe6af808c1fd06c5cd3684b9bab5b8d6 SHA512 7140723b2261c05eefc08edef705af56a2a1631d9124e7f4a489c7bc4aeae1ee1a92ab67afad0d6b701a9f92fd6db5b5c80d252c1142a89e05a376f6b5b7d431 +EBUILD wireplumber-0.4.9-r1.ebuild 3691 BLAKE2B 63ffe1aa2c86a4fe5cccb29e294189341aa9f70264a2026f16475e52fc6c313c8370dce17753206b7be4ce760f374ad38c8ee3621591e77b6eaa9f84bc75922e SHA512 f37f3130a79ea3898e79ca6abfee456c85b4357620b82aa80f8a119e3c12fcbabf5af55527bf0bee9cc40d5b98a6d707579b8f9be95609fe6abc0ce9071616f4 +EBUILD wireplumber-0.4.9.ebuild 3514 BLAKE2B fcd3cc2a795ba63c467fc46c7480553f9472e6c75f3bb54cd7701c0b28af294afeebdbad4b68f63a1c4adcab4a879c80465c00eb280cbf8db91604a67c493959 SHA512 0284553b29d7ac9b1f7df8f7b99207de4314601ded59df7f2bab33c6d8c538516b8041462221386e477217d43615462f28df6a2ecc81c0d3a2923f506fe565ab +EBUILD wireplumber-9999.ebuild 3563 BLAKE2B bbd86c4a9cfaaec2dc039b486b6737fc9770783860c755ae6d0bd9b1d9c803f608627273e95d8df68a6acfe81e5080258549ae08f0890f605eaf9c1a66a03bc7 SHA512 1bb23ba5ceff7f46934d0312040d594ab8a33007a15be3a71f5e16f07b8e70f15a3dee3bafa6553fca0cf53522b035df3ecb0468832ba0655223f8b81ce9f81a MISC metadata.xml 803 BLAKE2B d05f76db401a8f71c5c1504d17dd8c0a87686f4b0ab2da450a47f71b1a15eeee2aef17107a3a987af70a097c3004c582fdda4c46e37c89466bfb470d032446dd SHA512 cfa42b1862175344b23fe65fb97d86783ded19352988790aefc6a062da212423dd81d8147525e4256025cdcfc6850909ca61d77d6b4243add0a3339b2eb319ee diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch b/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch new file mode 100644 index 000000000000..610db0e11e89 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch @@ -0,0 +1,117 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c00c5a6675b6640db13111c808eaa3251917c412 + +From c00c5a6675b6640db13111c808eaa3251917c412 Mon Sep 17 00:00:00 2001 +From: Julian Bouzas <julian.bouzas@collabora.com> +Date: Wed, 18 May 2022 10:51:41 -0400 +Subject: [PATCH] alsa.lua: fix device name deduplication when reservation is + enabled + +Fixes #241 +--- + src/scripts/monitors/alsa.lua | 47 +++++++++++++++++++---------------- + 1 file changed, 25 insertions(+), 22 deletions(-) + +diff --git a/src/scripts/monitors/alsa.lua b/src/scripts/monitors/alsa.lua +index 01d241db..7beed3a8 100644 +--- a/src/scripts/monitors/alsa.lua ++++ b/src/scripts/monitors/alsa.lua +@@ -11,6 +11,10 @@ local config = ... or {} + -- ensure config.properties is not nil + config.properties = config.properties or {} + ++-- unique device/node name tables ++device_names_table = nil ++node_names_table = nil ++ + -- preprocess rules and create Interest objects + for _, r in ipairs(config.rules or {}) do + r.interests = {} +@@ -41,16 +45,6 @@ function rulesApplyProperties(properties) + end + end + +-function findDuplicate(parent, id, property, value) +- for i = 0, id - 1, 1 do +- local obj = parent:get_managed_object(i) +- if obj and obj.properties[property] == value then +- return true +- end +- end +- return false +-end +- + function nonempty(str) + return str ~= "" and str or nil + end +@@ -125,11 +119,11 @@ function createNode(parent, id, type, factory, properties) + + -- deduplicate nodes with the same name + for counter = 2, 99, 1 do +- if findDuplicate(parent, id, "node.name", properties["node.name"]) then +- properties["node.name"] = name .. "." .. counter +- else ++ if node_names_table[properties["node.name"]] ~= true then ++ node_names_table[properties["node.name"]] = true + break + end ++ properties["node.name"] = name .. "." .. counter + end + end + +@@ -186,6 +180,10 @@ function createDevice(parent, id, factory, properties) + local device = SpaDevice(factory, properties) + if device then + device:connect("create-object", createNode) ++ device:connect("object-removed", function (parent, id) ++ local node = parent:get_managed_object(id) ++ node_names_table[node.properties["node.name"]] = nil ++ end) + device:activate(Feature.SpaDevice.ENABLED | Feature.Proxy.BOUND) + parent:store_managed_object(id, device) + else +@@ -205,11 +203,11 @@ function prepareDevice(parent, id, type, factory, properties) + + -- deduplicate devices with the same name + for counter = 2, 99, 1 do +- if findDuplicate(parent, id, "device.name", properties["device.name"]) then +- properties["device.name"] = name .. "." .. counter +- else ++ if device_names_table[properties["device.name"]] ~= true then ++ device_names_table[properties["device.name"]] = true + break + end ++ properties["device.name"] = name .. "." .. counter + end + + -- ensure the device has a description +@@ -337,16 +335,21 @@ function createMonitor () + -- handle create-object to prepare device + m:connect("create-object", prepareDevice) + +- -- if dbus reservation, handle object-removed to destroy device reservations +- if rd_plugin then +- m:connect("object-removed", function (parent, id) +- local device = parent:get_managed_object(id) ++ -- handle object-removed to destroy device reservations and recycle device name ++ m:connect("object-removed", function (parent, id) ++ local device = parent:get_managed_object(id) ++ if rd_plugin then + local rd_name = device.properties["api.dbus.ReserveDevice1"] + if rd_name then + rd_plugin:call("destroy-reservation", rd_name) + end +- end) +- end ++ end ++ device_names_table[device.properties["device.name"]] = nil ++ end) ++ ++ -- reset the name tables to make sure names are recycled ++ device_names_table = {} ++ node_names_table = {} + + -- activate monitor + Log.info("Activating ALSA monitor") +-- +GitLab + diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch b/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch new file mode 100644 index 000000000000..40a486616580 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch @@ -0,0 +1,129 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/1f045309208ab5d927883b5adc2b7d1623fae162 + +From 1f045309208ab5d927883b5adc2b7d1623fae162 Mon Sep 17 00:00:00 2001 +From: George Kiagiadakis <george.kiagiadakis@collabora.com> +Date: Thu, 12 May 2022 12:19:38 +0300 +Subject: [PATCH] config: fix enabled property to default to "true" when not + defined + +Fixes backwards compatibility with older config files + +Fixes: #254 +--- + src/config/bluetooth.lua.d/30-bluez-monitor.lua | 2 +- + src/config/main.lua.d/20-default-access.lua | 2 +- + src/config/main.lua.d/30-alsa-monitor.lua | 2 +- + src/config/main.lua.d/30-libcamera-monitor.lua | 2 +- + src/config/main.lua.d/30-v4l2-monitor.lua | 2 +- + src/config/main.lua.d/40-device-defaults.lua | 2 +- + src/config/main.lua.d/40-stream-defaults.lua | 2 +- + src/config/policy.lua.d/10-default-policy.lua | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/config/bluetooth.lua.d/30-bluez-monitor.lua b/src/config/bluetooth.lua.d/30-bluez-monitor.lua +index b40026c2..a870aa5d 100644 +--- a/src/config/bluetooth.lua.d/30-bluez-monitor.lua ++++ b/src/config/bluetooth.lua.d/30-bluez-monitor.lua +@@ -3,7 +3,7 @@ bluez_monitor.properties = {} + bluez_monitor.rules = {} + + function bluez_monitor.enable() +- if not bluez_monitor.enabled then ++ if bluez_monitor.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/20-default-access.lua b/src/config/main.lua.d/20-default-access.lua +index a6ffb2ee..0a7eb955 100644 +--- a/src/config/main.lua.d/20-default-access.lua ++++ b/src/config/main.lua.d/20-default-access.lua +@@ -3,7 +3,7 @@ default_access.properties = {} + default_access.rules = {} + + function default_access.enable() +- if not default_access.enabled then ++ if default_access.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/30-alsa-monitor.lua b/src/config/main.lua.d/30-alsa-monitor.lua +index da0b2c70..8e45e434 100644 +--- a/src/config/main.lua.d/30-alsa-monitor.lua ++++ b/src/config/main.lua.d/30-alsa-monitor.lua +@@ -3,7 +3,7 @@ alsa_monitor.properties = {} + alsa_monitor.rules = {} + + function alsa_monitor.enable() +- if not alsa_monitor.enabled then ++ if alsa_monitor.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/30-libcamera-monitor.lua b/src/config/main.lua.d/30-libcamera-monitor.lua +index 4a8257ff..cd820a83 100644 +--- a/src/config/main.lua.d/30-libcamera-monitor.lua ++++ b/src/config/main.lua.d/30-libcamera-monitor.lua +@@ -3,7 +3,7 @@ libcamera_monitor.properties = {} + libcamera_monitor.rules = {} + + function libcamera_monitor.enable() +- if not libcamera_monitor.enabled then ++ if libcamera_monitor.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/30-v4l2-monitor.lua b/src/config/main.lua.d/30-v4l2-monitor.lua +index 7cfd4bcd..3fbdc9e7 100644 +--- a/src/config/main.lua.d/30-v4l2-monitor.lua ++++ b/src/config/main.lua.d/30-v4l2-monitor.lua +@@ -3,7 +3,7 @@ v4l2_monitor.properties = {} + v4l2_monitor.rules = {} + + function v4l2_monitor.enable() +- if not v4l2_monitor.enabled then ++ if v4l2_monitor.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/40-device-defaults.lua b/src/config/main.lua.d/40-device-defaults.lua +index 55aafe85..2204c4ac 100644 +--- a/src/config/main.lua.d/40-device-defaults.lua ++++ b/src/config/main.lua.d/40-device-defaults.lua +@@ -38,7 +38,7 @@ device_defaults.persistent_profiles = { + } + + function device_defaults.enable() +- if not device_defaults.enabled then ++ if device_defaults.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/40-stream-defaults.lua b/src/config/main.lua.d/40-stream-defaults.lua +index 2975f4f6..307d83df 100644 +--- a/src/config/main.lua.d/40-stream-defaults.lua ++++ b/src/config/main.lua.d/40-stream-defaults.lua +@@ -25,7 +25,7 @@ stream_defaults.rules = { + } + + function stream_defaults.enable() +- if not stream_defaults.enabled then ++ if stream_defaults.enabled == false then + return + end + +diff --git a/src/config/policy.lua.d/10-default-policy.lua b/src/config/policy.lua.d/10-default-policy.lua +index 7b00e94e..edfdeb1c 100644 +--- a/src/config/policy.lua.d/10-default-policy.lua ++++ b/src/config/policy.lua.d/10-default-policy.lua +@@ -38,7 +38,7 @@ bluetooth_policy.policy = { + } + + function default_policy.enable() +- if not default_policy.enabled then ++ if default_policy.enabled == false then + return + end + +-- +GitLab + diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch new file mode 100644 index 000000000000..d9c51489a893 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch @@ -0,0 +1,187 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/392cce2136e81ac3146078eacbbae85b694c917a + +From 392cce2136e81ac3146078eacbbae85b694c917a Mon Sep 17 00:00:00 2001 +From: Julian Bouzas <julian.bouzas@collabora.com> +Date: Fri, 20 May 2022 07:38:24 -0400 +Subject: [PATCH] m-default-nodes: don't check if all device nodes are ready + when finding default node + +This check was originally added to avoid a small audio glitch when changing +default nodes while also changing the device profile (eg Gnome Sound Settings). +The check is removed because it causes issues when disabling alsa nodes. There +are plans to fix the audio glitch issue in the future with the planned +event-dispatcher architecture. + +Fixes #279 +--- + modules/module-default-nodes.c | 136 --------------------------------- + 1 file changed, 136 deletions(-) + +diff --git a/modules/module-default-nodes.c b/modules/module-default-nodes.c +index 0fdaed5..577f9bb 100644 +--- a/modules/module-default-nodes.c ++++ b/modules/module-default-nodes.c +@@ -345,135 +345,6 @@ reevaluate_default_node (WpDefaultNodes * self, WpMetadata *m, gint node_t) + } + } + +-static guint +-get_device_total_nodes (WpPipewireObject * proxy) +-{ +- g_autoptr (WpIterator) profiles = NULL; +- g_auto (GValue) item = G_VALUE_INIT; +- +- profiles = wp_pipewire_object_enum_params_sync (proxy, "Profile", NULL); +- if (!profiles) +- return 0; +- +- for (; wp_iterator_next (profiles, &item); g_value_unset (&item)) { +- WpSpaPod *pod = g_value_get_boxed (&item); +- gint idx = -1; +- const gchar *name = NULL; +- g_autoptr (WpSpaPod) classes = NULL; +- +- /* Parse */ +- if (!wp_spa_pod_get_object (pod, NULL, +- "index", "i", &idx, +- "name", "s", &name, +- "classes", "?P", &classes, +- NULL)) +- continue; +- if (!classes) +- continue; +- +- /* Parse profile classes */ +- { +- g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (classes); +- g_auto (GValue) v = G_VALUE_INIT; +- gint total_nodes = 0; +- for (; wp_iterator_next (it, &v); g_value_unset (&v)) { +- WpSpaPod *entry = g_value_get_boxed (&v); +- g_autoptr (WpSpaPodParser) pp = NULL; +- const gchar *media_class = NULL; +- gint n_nodes = 0; +- g_return_val_if_fail (entry, 0); +- if (!wp_spa_pod_is_struct (entry)) +- continue; +- pp = wp_spa_pod_parser_new_struct (entry); +- g_return_val_if_fail (pp, 0); +- g_return_val_if_fail (wp_spa_pod_parser_get_string (pp, &media_class), 0); +- g_return_val_if_fail (wp_spa_pod_parser_get_int (pp, &n_nodes), 0); +- wp_spa_pod_parser_end (pp); +- +- total_nodes += n_nodes; +- } +- +- if (total_nodes > 0) +- return total_nodes; +- } +- } +- +- return 0; +-} +- +-static gboolean +-nodes_ready (WpDefaultNodes * self) +-{ +- g_autoptr (WpIterator) it = NULL; +- g_auto (GValue) val = G_VALUE_INIT; +- +- /* Get the total number of nodes for each device and make sure they exist +- * and have at least 1 port */ +- it = wp_object_manager_new_filtered_iterator (self->rescan_om, +- WP_TYPE_DEVICE, NULL); +- for (; wp_iterator_next (it, &val); g_value_unset (&val)) { +- WpPipewireObject *device = g_value_get_object (&val); +- guint total_nodes = get_device_total_nodes (device); +- if (total_nodes > 0) { +- guint32 device_id = wp_proxy_get_bound_id (WP_PROXY (device)); +- g_autoptr (WpIterator) node_it = NULL; +- g_auto (GValue) node_val = G_VALUE_INIT; +- guint ready_nodes = 0; +- +- node_it = wp_object_manager_new_filtered_iterator (self->rescan_om, +- WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, +- PW_KEY_DEVICE_ID, "=i", device_id, NULL); +- for (; wp_iterator_next (node_it, &node_val); g_value_unset (&node_val)) { +- WpPipewireObject *node = g_value_get_object (&node_val); +- g_autoptr (WpPort) port = +- wp_object_manager_lookup (self->rescan_om, +- WP_TYPE_PORT, WP_CONSTRAINT_TYPE_PW_PROPERTY, +- PW_KEY_NODE_ID, "=u", wp_proxy_get_bound_id (WP_PROXY (node)), +- NULL); +- if (port) +- ready_nodes++; +- } +- +- if (ready_nodes < total_nodes) { +- const gchar *device_name = wp_pipewire_object_get_property ( +- WP_PIPEWIRE_OBJECT (device), PW_KEY_DEVICE_NAME); +- wp_debug_object (self, "device '%s' is not ready (%d/%d)", device_name, +- ready_nodes, total_nodes); +- return FALSE; +- } +- } +- } +- +- /* Make sure Audio and Video virtual sources have ports */ +- { +- g_autoptr (WpIterator) node_it = NULL; +- g_auto (GValue) node_val = G_VALUE_INIT; +- node_it = wp_object_manager_new_filtered_iterator (self->rescan_om, +- WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, PW_KEY_DEVICE_ID, "-", +- NULL); +- for (; wp_iterator_next (node_it, &node_val); g_value_unset (&node_val)) { +- WpPipewireObject *node = g_value_get_object (&node_val); +- const gchar *media_class = wp_pipewire_object_get_property ( +- WP_PIPEWIRE_OBJECT (node), PW_KEY_MEDIA_CLASS); +- g_autoptr (WpPort) port = +- wp_object_manager_lookup (self->rescan_om, +- WP_TYPE_PORT, WP_CONSTRAINT_TYPE_PW_PROPERTY, +- PW_KEY_NODE_ID, "=u", wp_proxy_get_bound_id (WP_PROXY (node)), +- NULL); +- if (!port && +- (g_strcmp0 ("Audio/Source/Virtual", media_class) == 0 || +- g_strcmp0 ("Video/Source/Virtual", media_class) == 0)) { +- const gchar *node_name = wp_pipewire_object_get_property ( +- WP_PIPEWIRE_OBJECT (node), PW_KEY_NODE_NAME); +- wp_debug_object (self, "virtual node '%s' is not ready", node_name); +- return FALSE; +- } +- } +- } +- +- return TRUE; +-} +- + static void + sync_rescan (WpCore * core, GAsyncResult * res, WpDefaultNodes * self) + { +@@ -491,10 +362,6 @@ sync_rescan (WpCore * core, GAsyncResult * res, WpDefaultNodes * self) + if (!metadata) + return; + +- /* Make sure nodes are ready for current profile */ +- if (!nodes_ready (self)) +- return; +- + wp_trace_object (self, "re-evaluating defaults"); + reevaluate_default_node (self, metadata, AUDIO_SINK); + reevaluate_default_node (self, metadata, AUDIO_SOURCE); +@@ -584,13 +451,10 @@ on_metadata_added (WpObjectManager *om, WpMetadata *metadata, gpointer d) + self->rescan_om = wp_object_manager_new (); + wp_object_manager_add_interest (self->rescan_om, WP_TYPE_DEVICE, NULL); + wp_object_manager_add_interest (self->rescan_om, WP_TYPE_NODE, NULL); +- wp_object_manager_add_interest (self->rescan_om, WP_TYPE_PORT, NULL); + wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_DEVICE, + WP_OBJECT_FEATURES_ALL); + wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_NODE, + WP_OBJECT_FEATURES_ALL); +- wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_PORT, +- WP_OBJECT_FEATURES_ALL); + g_signal_connect_object (self->rescan_om, "objects-changed", + G_CALLBACK (schedule_rescan), self, G_CONNECT_SWAPPED); + g_signal_connect_object (self->rescan_om, "object-added", +-- +2.35.1 + diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch new file mode 100644 index 000000000000..c319ac4a617b --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch @@ -0,0 +1,36 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c2f31bb550755acba31da2e9f5bbdf646ed5e805 + +From c2f31bb550755acba31da2e9f5bbdf646ed5e805 Mon Sep 17 00:00:00 2001 +From: Julian Bouzas <julian.bouzas@collabora.com> +Date: Mon, 16 May 2022 15:41:10 -0400 +Subject: [PATCH] m-lua-scripting: allow converting GValue holding NULL objects + to Lua + +--- + modules/module-lua-scripting/wplua/value.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/modules/module-lua-scripting/wplua/value.c b/modules/module-lua-scripting/wplua/value.c +index 133051a4..e31ae4ac 100644 +--- a/modules/module-lua-scripting/wplua/value.c ++++ b/modules/module-lua-scripting/wplua/value.c +@@ -314,9 +314,14 @@ wplua_gvalue_to_lua (lua_State *L, const GValue *v) + wplua_pushboxed (L, G_VALUE_TYPE (v), g_value_dup_boxed (v)); + break; + case G_TYPE_OBJECT: +- case G_TYPE_INTERFACE: +- wplua_pushobject (L, g_value_dup_object (v)); ++ case G_TYPE_INTERFACE: { ++ GObject *object = g_value_dup_object (v); ++ if (object) ++ wplua_pushobject (L, g_value_dup_object (v)); ++ else ++ lua_pushnil (L); + break; ++ } + case G_TYPE_ENUM: + wplua_enum_to_lua (L, g_value_get_enum (v), G_VALUE_TYPE (v)); + break; +-- +GitLab + diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch new file mode 100644 index 000000000000..0b86979ce732 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch @@ -0,0 +1,32 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/7908b8d7be2a2992c57cd549054eda7ce46e4b44 + +From 13b85bd4a25ab374f5e5e90b7288e6987996856e Mon Sep 17 00:00:00 2001 +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 24 May 2022 11:35:15 +0200 +Subject: [PATCH] m-lua-scripting: fix object refcounting + +7908b8d7be2a2992c57cd549054eda7ce46e4b44 ("m-lua-scripting: allow +converting GValue holding NULL objects to Lua") accidentally added a second +refcount. As a result, the objects are never freeded. + +Remove the second refcount to fix this. +--- + modules/module-lua-scripting/wplua/value.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/module-lua-scripting/wplua/value.c b/modules/module-lua-scripting/wplua/value.c +index e31ae4a..a7927dc 100644 +--- a/modules/module-lua-scripting/wplua/value.c ++++ b/modules/module-lua-scripting/wplua/value.c +@@ -317,7 +317,7 @@ wplua_gvalue_to_lua (lua_State *L, const GValue *v) + case G_TYPE_INTERFACE: { + GObject *object = g_value_dup_object (v); + if (object) +- wplua_pushobject (L, g_value_dup_object (v)); ++ wplua_pushobject (L, object); + else + lua_pushnil (L); + break; +-- +2.35.1 + diff --git a/media-video/wireplumber/wireplumber-0.4.10.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild index 9bae3695faf2..4c9a4ce04761 100644 --- a/media-video/wireplumber/wireplumber-0.4.10.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="Replacement for pipewire-media-session" @@ -62,6 +62,10 @@ RDEPEND="${DEPEND} DOCS=( {NEWS,README}.rst ) +PATCHES=( + "${FILESDIR}"/${P}-config-fix-enabled-property-to-default-to-true-when.patch +) + src_configure() { local emesonargs=( -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) @@ -88,7 +92,7 @@ src_install() { # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files # will not actually get stored twice until modified. insinto /etc - doins -r ${ED}/usr/share/wireplumber + doins -r "${ED}"/usr/share/wireplumber } pkg_postinst() { diff --git a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild new file mode 100644 index 000000000000..ae1bbb1ec14c --- /dev/null +++ b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson systemd + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" + EGIT_BRANCH="master" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86" +fi + +DESCRIPTION="Replacement for pipewire-media-session" +HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" + +LICENSE="MIT" +SLOT="0/0.4" +IUSE="elogind system-service systemd test" + +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + ?? ( elogind systemd ) + system-service? ( systemd ) +" + +RESTRICT="!test? ( test )" + +# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building +BDEPEND=" + dev-libs/glib + dev-util/gdbus-codegen + dev-util/glib-utils + sys-devel/gettext +" + +DEPEND=" + ${LUA_DEPS} + >=dev-libs/glib-2.62 + >=media-video/pipewire-0.3.48:= + virtual/libc + virtual/libintl + elogind? ( sys-auth/elogind ) + systemd? ( sys-apps/systemd ) +" + +# Any dev-lua/* deps get declared like this inside RDEPEND: +# $(lua_gen_cond_dep ' +# dev-lua/<NAME>[${LUA_USEDEP}] +# ') +RDEPEND="${DEPEND} + system-service? ( + acct-user/pipewire + acct-group/pipewire + ) +" + +DOCS=( {NEWS,README}.rst ) + +PATCHES=( + "${FILESDIR}"/${P}-config-fix-enabled-property-to-default-to-true-when.patch + "${FILESDIR}"/${P}-m-lua-scripting-allow-converting-GValue-holding-NUL.patch + "${FILESDIR}"/${P}-alsa.lua-fix-device-name-deduplication-when-reserva.patch + "${FILESDIR}"/${P}-m-default-nodes-don-t-check-if-all-device-nodes-are.patch + "${FILESDIR}"/${P}-m-lua-scripting-fix-object-refcounting.patch +) + +src_configure() { + local emesonargs=( + -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) + -Dintrospection=disabled # Only used for Sphinx doc generation + -Dsystem-lua=true # We always unbundle everything we can + -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) + $(meson_feature elogind) + $(meson_feature systemd) + $(meson_use system-service systemd-system-service) + $(meson_use systemd systemd-user-service) + -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) + -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) + $(meson_use test tests) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + # We copy the default config, so that Gentoo tools can pick up on any + # updates and /etc does not end up with stale overrides. + # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files + # will not actually get stored twice until modified. + insinto /etc + doins -r "${ED}"/usr/share/wireplumber +} + +pkg_postinst() { + if systemd_is_booted ; then + ewarn "pipewire-media-session.service is no longer installed. You must switch" + ewarn "to wireplumber.service user unit before your next logout/reboot:" + ewarn "systemctl --user disable pipewire-media-session.service" + ewarn "systemctl --user --force enable wireplumber.service" + else + ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" + ewarn "is started (a replacement for directly calling pipewire binary)." + ewarn + ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" + ewarn "or, if it does exist, that any reference to" + ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." + fi + if use system-service; then + ewarn + ewarn "WARNING: you have enabled the system-service USE flag, which installs" + ewarn "the system-wide systemd units that enable WirePlumber to run as a system" + ewarn "service. This is more than likely NOT what you want. You are strongly" + ewarn "advised not to enable this mode and instead stick with systemd user" + ewarn "units. The default configuration files will likely not work out of" + ewarn "box, and you are on your own with configuration." + ewarn + fi +} diff --git a/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild index f269c7faf59c..b2cb2a7e4d87 100644 --- a/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild @@ -91,7 +91,7 @@ src_install() { # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files # will not actually get stored twice until modified. insinto /etc - doins -r ${ED}/usr/share/wireplumber + doins -r "${ED}"/usr/share/wireplumber } pkg_postinst() { diff --git a/media-video/wireplumber/wireplumber-0.4.9.ebuild b/media-video/wireplumber/wireplumber-0.4.9.ebuild index 4f4c698eaf54..0c71a9ba7f9b 100644 --- a/media-video/wireplumber/wireplumber-0.4.9.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.9.ebuild @@ -86,7 +86,7 @@ src_install() { # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files # will not actually get stored twice until modified. insinto /etc - doins -r ${ED}/usr/share/wireplumber + doins -r "${ED}"/usr/share/wireplumber } pkg_postinst() { diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild index 9bae3695faf2..ca50e19600e4 100644 --- a/media-video/wireplumber/wireplumber-9999.ebuild +++ b/media-video/wireplumber/wireplumber-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="Replacement for pipewire-media-session" @@ -88,7 +88,7 @@ src_install() { # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files # will not actually get stored twice until modified. insinto /etc - doins -r ${ED}/usr/share/wireplumber + doins -r "${ED}"/usr/share/wireplumber } pkg_postinst() { |