gentoo resync : 07.01.2022

6 files changed, 413 insertions, 4 deletions

diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 98377ae5c44c..63e02876421a 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -1,11 +1,15 @@
 AUX wireplumber-0.4.5-access-config-add-restricted-access-permissions.patch 1103 BLAKE2B 6015043a5baa391be05c11387fcab418d9cb9fe050f2c1f88fe08d209fc2c813e6b5b8d99a14159d56d2e89db994c13e55e2af6b60001d6d64a0527a33be2319 SHA512 291c6833685e0b8e96b4187dadd1496c747493fd385f572d8f211177d278fc82cf4dd9466da3e1a359e9e2217dee1150cdad394ba0c54019f859fd571f6ea630
 AUX wireplumber-0.4.5-alsa-handle-the-release-requested-signal.patch 1009 BLAKE2B 32d9e359a705db1b60d0ed8c53a6e7c7bab85c73b0e8bce02fac5ee76e090393969a4abe041e585f0b32724f7946540677dd85b5ebdc380e6982823352ecfc75 SHA512 1b9a8aba86969dfb3a0372147596181e34088b42eacd4725df99ec627fa70cbe23d55c56d46f4f1780cb396e40c39720de96ce7fa4893af8e5acf697709614f6
+AUX wireplumber-0.4.5-default-routes.lua-reevaluate-current-profile-only-f.patch 3138 BLAKE2B aa0f7a0bbf121b8582c4afa31711f95724b374dc590bde1bd802b3966c38d4fb2bff7bde1796d6049953836b1985f648c4de7ac10ffcf05d2bda803f4b0c13ba SHA512 7e9efe4d5c11889c7834ab29734ff52171bf3e63e2273ce285b46a0997078d32644a0bfd1c66fd9cc4d09a7e566705e21803f21afeea60dba24f72f1bac4b2a8
 AUX wireplumber-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch 742 BLAKE2B 480dfc48954a13323bc171e3b4672cedad27fdde05d8f28e263eddffd80c51ecdaa5046c30f57cd1a28a08270e59a38a3202fe496e4af84494d3b52614858880 SHA512 5400a2d4d1e61abe8d6c22c6540a83fafb25b6f4555156b66de9ad8350ce176faed00099c7a40b5286c82644ee09b5890da2521078f91e51d5a66fce7ed82a2a
 AUX wireplumber-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch 1672 BLAKE2B a5d8911754670c9303e35d15df45ecdd5bb4b2d837dea2000ff5e102bfb789ea678ace39356579f0fc86273ec58a7c5cc6eea701c3b7a274d742cddfaa3575d3 SHA512 8605622ed43fef37e1ca49edaae4812618e5ad83904b682b2b903e9de92060fd9b4a0a025d5716cd16339b94ae67b1ee9622949fae73153df0bbc5b9b3c2ebd9
 AUX wireplumber-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch 1203 BLAKE2B 12e07a42d99187cba61d5428c235aba9207bd708e9346d53618b92c0ed06893e6295dbb49b9529e198f53c7ce4b573b897c349de8bb688273656de237ab3bca1 SHA512 4a5bb0a79c507945652a5600304fae1c9bf6fe028053a890c1633be2c82491ada487c9943ac29c6ed26f9e86a5d7f76140ec78bbaa394e41e1f082d50a7b56ef
+AUX wireplumber-0.4.6-endianness-fixes.patch 8766 BLAKE2B b66d2176c88e1df5a3c9ecd78bff307bf97633c02e2a905fd70bf6d3a08d6cbaa935d769d763e76a95bf94240ff764a349758b9115d08aba6fb772388692a989 SHA512 ec75f535af1933f0432c87a3370156ffddc1acd7b2def92b7e4ff92a86d7d2758596acee9eed067cfb5fa4b465845ae93bad0db23414f06ce32ccad2ec0831fd
 DIST wireplumber-0.4.5-endianness-fixes.patch.bz2 2341 BLAKE2B 225b164a4624128b50fe8691e3577de9aea35e85ed0527c605a617227d96ad49646b658da120d118ab45fd1ed82ed188ad1073b0a8954632ec6501535d533009 SHA512 d5b64612aad6d462ffbc78a24cf50ebde83b29e183a6d169976f5d8fdb0ec3c72984135ee75d52f7d7e8261716482ca277c49cf5824028bfaf33e596857de97f
 DIST wireplumber-0.4.5.tar.gz 345035 BLAKE2B 177984901790228d8ddeb8ee2a548eb53db07c8077734590c3f964df36cfa47a4099e049ae9a19a136f4147c75b7122359a73b8387a641768f71484b9c4ab119 SHA512 b0d5962e7a83709cc3115fbf0a04b63660085aeea2ebda6d78d692065ccb193cea8b44bb506fa440cf0b88bfae71a4f69a192cd6cba885ebf3c9270bea50c67a
+DIST wireplumber-0.4.6.tar.gz 357392 BLAKE2B 03942930b1eafb37071c0f38071567fb6117a9a64b91f064982eafa34a8662e1cba26b634db9c74a4e0bd0a8765d9b827ab2afd5e364c6377fa7ecbc7e32c5d1 SHA512 4b4b9aff6e0e6d7c567e20e4df533cfd16287f2e7498ae8533a9a4251066e6d0a9cd99e3da48f525bb2010053f7c9918fe09a5ade39c8830ec08c24292527684
 EBUILD wireplumber-0.4.5-r2.ebuild 3056 BLAKE2B 2485dea8d7a93b14231de12023ed023483abe1135a9dfed26779d4e4b14b514c01d0aa8fed279156be9165c60a5907ce01bc621a4f188e572246cba96d1c3a5b SHA512 a10e4d07bf89f035d4b81d6f1162d5dc584a4981dbb106451f6c7d45fbe8b1f71311cbafc2cdaea2d953ede18bb1f7743911ad06d99dd5a1a3b8d5577c027817
-EBUILD wireplumber-0.4.5-r3.ebuild 3192 BLAKE2B 2e237888607e6c09236053474dcd1c59618505f31ac97a6f005eb63fbd1383cfd421cbec0f1cf4f478db12669bfa4dc587e9c677d89ef8e4f723c8ee11347d3d SHA512 a96bc09c82a7e6cca8649a4e4a2d59329f46f476ceedeb09784ba6751518c082235f88f80a3075f240b1e345864773e1749e8ce96d6d2f666ac9785964f515c1
-EBUILD wireplumber-9999.ebuild 2556 BLAKE2B d640e9b432b335eb9de2e994070e88fc32eb8136e75f6b29e2109c58c7a050315a539774e7d688efde4ce9cabf5472eeae4b6045c3e6f3ff7cd9e9275371fa51 SHA512 2e76113b6e302af9601b72525e62293b375411dde8beb0f241df2031dca874334afd5dfe0556a811362f3fbf8a3cc3f12d1e8f6dc89008e0e1ff9c9a2fa52369
+EBUILD wireplumber-0.4.5-r4.ebuild 3271 BLAKE2B f69305218c798f6f34aa3e3716d8abfe2f32795286d46aa5412bad3d5d1fc717bbb92249e1c2ae3449a5f93e50b0d0ef942f02835140ca764c768ecfbf16435e SHA512 8f00d21c53f7911bf325133c4aedcc2b215630e2e7736e4f8f06557becd2d394f8006cc83fd4d0f2e26a3c40dd0b372e94520119e9a59902c46940ec574fef7f
+EBUILD wireplumber-0.4.6.ebuild 2619 BLAKE2B 1fb3e7a073e1e043c1eed9785a385e72fd6df3f10b2225e8c123ec930d8a6f2da8ac96424cc9147a4215ff05861a142c0744d173b1a87a72c17ed78ce2bd8436 SHA512 99b07db549ff61cb44cdd937cdfb637aeec49ed902e3f7e595e605b841490a85881513c0c618e45b4026c2362137c510ec9a6deb5ca935cf42d5d0ca8faff9f0
+EBUILD wireplumber-9999.ebuild 2563 BLAKE2B cb53fa8c1fe7b0dadd01ae5b703b10d1b3202104039bff37a06e22777e822fe3178a89f42a3172acccb575c0c9dda14c420095587b66ee2baa530a41fe2a5235 SHA512 6558a682dfff705adf1aa10c2e3e2b6cc2efed6330b0b57a9744e6e620bd264f4c1cf236770f1178f668a7931c5fa710b51cb195a5b6911200ae8fb404fa5a05
 MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96
diff --git a/media-video/wireplumber/files/wireplumber-0.4.5-default-routes.lua-reevaluate-current-profile-only-f.patch b/media-video/wireplumber/files/wireplumber-0.4.5-default-routes.lua-reevaluate-current-profile-only-f.patch
new file mode 100644
index 000000000000..423a1fcb6139
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.5-default-routes.lua-reevaluate-current-profile-only-f.patch
@@ -0,0 +1,81 @@
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/22fd4292ab35786b09561508778ab49cc6488dc6
+
+From 22fd4292ab35786b09561508778ab49cc6488dc6 Mon Sep 17 00:00:00 2001
+From: Julian Bouzas <julian.bouzas@collabora.com>
+Date: Tue, 7 Dec 2021 14:10:32 -0500
+Subject: [PATCH] default-routes.lua: reevaluate current profile only for its
+ own routes
+
+Only check the current active profile when some routes changed that are part of
+the profile. If some other route changed, just ignore it.
+---
+ src/scripts/default-routes.lua | 39 +++++++++++++++++++---------------
+ 1 file changed, 22 insertions(+), 17 deletions(-)
+
+diff --git a/src/scripts/default-routes.lua b/src/scripts/default-routes.lua
+index 1840989f..953cba33 100644
+--- a/src/scripts/default-routes.lua
++++ b/src/scripts/default-routes.lua
+@@ -352,6 +352,12 @@ function handleDevice(device)
+   local dev_info = dev_infos[device["bound-id"]]
+   local new_route_infos = {}
+   local avail_routes_changed = false
++  local profile = nil
++
++  -- get current profile
++  for p in device:iterate_params("Profile") do
++    profile = parseParam(p, "Profile")
++  end
+ 
+   -- look at all the routes and update/reset cached information
+   for p in device:iterate_params("EnumRoute") do
+@@ -370,7 +376,9 @@ function handleDevice(device)
+       Log.info(device, "route " .. route.name .. " available changed " ..
+                        route_info.available .. " -> " .. route.available)
+       route_info.available = route.available
+-      avail_routes_changed = true
++      if profile and arrayContains(route.profiles, profile.index) then
++        avail_routes_changed = true
++      end
+     end
+     route_info.prev_active = route_info.active
+     route_info.active = false
+@@ -419,23 +427,20 @@ function handleDevice(device)
+     ::skip_route::
+   end
+ 
+-  -- now get the profile and restore routes for it
+-  for p in device:iterate_params("Profile") do
+-    local profile = parseParam(p, "Profile")
+-    if profile then
+-      local profile_changed = (dev_info.active_profile ~= profile.index)
+-
+-      -- if the profile changed, restore routes for that profile
+-      -- if any of the routes of the current profile changed in availability,
+-      -- then try to select a new "best" route for each device and ignore
+-      -- what was stored
+-      if profile_changed or avail_routes_changed then
+-        dev_info.active_profile = profile.index
+-        restoreProfileRoutes(device, dev_info, profile, profile_changed)
+-      end
+-
+-      saveProfile(dev_info, profile.name)
++  -- restore routes for profile
++  if profile then
++    local profile_changed = (dev_info.active_profile ~= profile.index)
++
++    -- if the profile changed, restore routes for that profile
++    -- if any of the routes of the current profile changed in availability,
++    -- then try to select a new "best" route for each device and ignore
++    -- what was stored
++    if profile_changed or avail_routes_changed then
++      dev_info.active_profile = profile.index
++      restoreProfileRoutes(device, dev_info, profile, profile_changed)
+     end
++
++    saveProfile(dev_info, profile.name)
+   end
+ end
+ 
+-- 
+GitLab
diff --git a/media-video/wireplumber/files/wireplumber-0.4.6-endianness-fixes.patch b/media-video/wireplumber/files/wireplumber-0.4.6-endianness-fixes.patch
new file mode 100644
index 000000000000..9b8bba93a8ab
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.6-endianness-fixes.patch
@@ -0,0 +1,229 @@
+Bunch of patches from https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+Requires pipewire 0.3.42 for 03f0a7c9bac3e61126fc852e543b8ea254471eb7.
+
+--- a/tests/wp/spa-pod.c
++++ b/tests/wp/spa-pod.c
+@@ -6,6 +6,8 @@
+  * SPDX-License-Identifier: MIT
+  */
+ 
++#include <stdbool.h>
++
+ #include <wp/wp.h>
+ 
+ static void
+@@ -428,12 +430,12 @@ test_spa_pod_object (void)
+         wp_spa_type_name (wp_spa_pod_get_spa_type (pod)));
+ 
+     const char *id_name;
+-    gboolean mute = TRUE;
++    bool mute = true;
+     float vol = 0.0;
+     gint32 frequency;
+     const char *device;
+     gint64 device_fd;
+-    gboolean custom = FALSE;
++    bool custom = false;
+     g_assert_true (wp_spa_pod_get_object (pod,
+         &id_name,
+         "mute", "b", &mute,
+@@ -475,12 +477,12 @@ test_spa_pod_object (void)
+         wp_spa_type_name (wp_spa_pod_get_spa_type (pod)));
+ 
+     const char *id_name;
+-    gboolean mute = TRUE;
++    bool mute = true;
+     float vol = 0.0;
+     gint32 frequency;
+     const char *device;
+     gint64 device_fd;
+-    gboolean custom = FALSE;
++    bool custom = false;
+     g_autoptr (WpSpaPodParser) p = wp_spa_pod_parser_new_object (pod, &id_name);
+     g_assert_nonnull (pod);
+     g_assert_true (wp_spa_pod_parser_get (p, "mute", "b", &mute, NULL));
+@@ -603,7 +605,7 @@ test_spa_pod_struct (void)
+     g_assert_true (wp_spa_pod_parser_get (p, "P", &value_object, NULL));
+     g_assert_nonnull (value_object);
+     const char *id_name;
+-    gboolean mute = TRUE;
++    bool mute = true;
+ 
+     g_assert_true (wp_spa_pod_get_object (value_object,
+         &id_name,
+--- a/tests/wp/endpoint.c
++++ b/tests/wp/endpoint.c
+@@ -499,7 +499,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+     g_auto (GValue) item = G_VALUE_INIT;
+     g_autoptr (WpSpaPod) pod = NULL;
+     gfloat float_value = 0.0f;
+-    gboolean boolean_value = TRUE;
++    bool boolean_value = true;
+ 
+     iterator = wp_pipewire_object_enum_params_sync (
+         WP_PIPEWIRE_OBJECT (fixture->proxy_endpoint), "Props", NULL);
+@@ -513,7 +513,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+             "mute", "b", &boolean_value,
+             NULL));
+     g_assert_cmpfloat_with_epsilon (float_value, 1.0f, 0.001);
+-    g_assert_cmpint (boolean_value, ==, FALSE);
++    g_assert_cmpint (boolean_value, ==, false);
+   }
+ 
+   /* setup change signals */
+@@ -541,7 +541,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+     g_auto (GValue) item = G_VALUE_INIT;
+     g_autoptr (WpSpaPod) pod = NULL;
+     gfloat float_value = 0.0f;
+-    gboolean boolean_value = TRUE;
++    bool boolean_value = true;
+ 
+     iterator = wp_pipewire_object_enum_params_sync (
+         WP_PIPEWIRE_OBJECT (fixture->proxy_endpoint), "Props", NULL);
+@@ -556,14 +556,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+             "mute", "b", &boolean_value,
+             NULL));
+     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
+-    g_assert_cmpint (boolean_value, ==, FALSE);
++    g_assert_cmpint (boolean_value, ==, false);
+   }
+   {
+     g_autoptr (WpIterator) iterator = NULL;
+     g_auto (GValue) item = G_VALUE_INIT;
+     g_autoptr (WpSpaPod) pod = NULL;
+     gfloat float_value = 0.0f;
+-    gboolean boolean_value = TRUE;
++    bool boolean_value = true;
+ 
+     iterator = wp_pipewire_object_enum_params_sync (
+         WP_PIPEWIRE_OBJECT (fixture->impl_endpoint), "Props", NULL);
+@@ -577,14 +577,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+             "mute", "b", &boolean_value,
+             NULL));
+     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
+-    g_assert_cmpint (boolean_value, ==, FALSE);
++    g_assert_cmpint (boolean_value, ==, false);
+   }
+   {
+     g_autoptr (WpIterator) iterator = NULL;
+     g_auto (GValue) item = G_VALUE_INIT;
+     g_autoptr (WpSpaPod) pod = NULL;
+     gfloat float_value = 0.0f;
+-    gboolean boolean_value = TRUE;
++    bool boolean_value = true;
+ 
+     iterator = wp_pipewire_object_enum_params_sync (
+         WP_PIPEWIRE_OBJECT (endpoint->node), "Props", NULL);
+@@ -598,7 +598,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+             "mute", "b", &boolean_value,
+             NULL));
+     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
+-    g_assert_cmpint (boolean_value, ==, FALSE);
++    g_assert_cmpint (boolean_value, ==, false);
+   }
+ 
+   /* change control on the impl */
+@@ -618,7 +618,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+     g_auto (GValue) item = G_VALUE_INIT;
+     g_autoptr (WpSpaPod) pod = NULL;
+     gfloat float_value = 0.0f;
+-    gboolean boolean_value = TRUE;
++    bool boolean_value = true;
+ 
+     iterator = wp_pipewire_object_enum_params_sync (
+         WP_PIPEWIRE_OBJECT (fixture->proxy_endpoint), "Props", NULL);
+@@ -633,14 +633,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+             "mute", "b", &boolean_value,
+             NULL));
+     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
+-    g_assert_cmpint (boolean_value, ==, TRUE);
++    g_assert_cmpint (boolean_value, ==, true);
+   }
+   {
+     g_autoptr (WpIterator) iterator = NULL;
+     g_auto (GValue) item = G_VALUE_INIT;
+     g_autoptr (WpSpaPod) pod = NULL;
+     gfloat float_value = 0.0f;
+-    gboolean boolean_value = TRUE;
++    bool boolean_value = true;
+ 
+     iterator = wp_pipewire_object_enum_params_sync (
+         WP_PIPEWIRE_OBJECT (fixture->impl_endpoint), "Props", NULL);
+@@ -654,14 +654,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+             "mute", "b", &boolean_value,
+             NULL));
+     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
+-    g_assert_cmpint (boolean_value, ==, TRUE);
++    g_assert_cmpint (boolean_value, ==, true);
+   }
+   {
+     g_autoptr (WpIterator) iterator = NULL;
+     g_auto (GValue) item = G_VALUE_INIT;
+     g_autoptr (WpSpaPod) pod = NULL;
+     gfloat float_value = 0.0f;
+-    gboolean boolean_value = TRUE;
++    bool boolean_value = true;
+ 
+     iterator = wp_pipewire_object_enum_params_sync (
+         WP_PIPEWIRE_OBJECT (endpoint->node), "Props", NULL);
+@@ -675,7 +675,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+             "mute", "b", &boolean_value,
+             NULL));
+     g_assert_cmpfloat_with_epsilon (float_value, 0.7f, 0.001);
+-    g_assert_cmpint (boolean_value, ==, TRUE);
++    g_assert_cmpint (boolean_value, ==, true);
+   }
+ 
+   /* change control on the node */
+@@ -695,7 +695,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+     g_auto (GValue) item = G_VALUE_INIT;
+     g_autoptr (WpSpaPod) pod = NULL;
+     gfloat float_value = 0.0f;
+-    gboolean boolean_value = TRUE;
++    bool boolean_value = true;
+ 
+     iterator = wp_pipewire_object_enum_params_sync (
+         WP_PIPEWIRE_OBJECT (fixture->proxy_endpoint), "Props", NULL);
+@@ -709,14 +709,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+             "mute", "b", &boolean_value,
+             NULL));
+     g_assert_cmpfloat_with_epsilon (float_value, 0.2f, 0.001);
+-    g_assert_cmpint (boolean_value, ==, TRUE);
++    g_assert_cmpint (boolean_value, ==, true);
+   }
+   {
+     g_autoptr (WpIterator) iterator = NULL;
+     g_auto (GValue) item = G_VALUE_INIT;
+     g_autoptr (WpSpaPod) pod = NULL;
+     gfloat float_value = 0.0f;
+-    gboolean boolean_value = TRUE;
++    bool boolean_value = true;
+ 
+     iterator = wp_pipewire_object_enum_params_sync (
+         WP_PIPEWIRE_OBJECT (fixture->impl_endpoint), "Props", NULL);
+@@ -730,14 +730,14 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+             "mute", "b", &boolean_value,
+             NULL));
+     g_assert_cmpfloat_with_epsilon (float_value, 0.2f, 0.001);
+-    g_assert_cmpint (boolean_value, ==, TRUE);
++    g_assert_cmpint (boolean_value, ==, true);
+   }
+   {
+     g_autoptr (WpIterator) iterator = NULL;
+     g_auto (GValue) item = G_VALUE_INIT;
+     g_autoptr (WpSpaPod) pod = NULL;
+     gfloat float_value = 0.0f;
+-    gboolean boolean_value = TRUE;
++    bool boolean_value = true;
+ 
+     iterator = wp_pipewire_object_enum_params_sync (
+         WP_PIPEWIRE_OBJECT (endpoint->node), "Props", NULL);
+@@ -751,7 +751,7 @@ test_endpoint_with_props (TestEndpointFixture *fixture, gconstpointer data)
+             "mute", "b", &boolean_value,
+             NULL));
+     g_assert_cmpfloat_with_epsilon (float_value, 0.2f, 0.001);
+-    g_assert_cmpint (boolean_value, ==, TRUE);
++    g_assert_cmpint (boolean_value, ==, true);
+   }
+ 
+   /* destroy impl endpoint */
diff --git a/media-video/wireplumber/wireplumber-0.4.5-r3.ebuild b/media-video/wireplumber/wireplumber-0.4.5-r4.ebuild
index e39673240df7..faf7c563e19f 100644
--- a/media-video/wireplumber/wireplumber-0.4.5-r3.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.5-r4.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-lib-don-t-read-hidden-files-from-the-config-director.patch
 	"${FILESDIR}"/${P}-alsa-handle-the-release-requested-signal.patch
 	"${FILESDIR}"/${P}-access-config-add-restricted-access-permissions.patch
+	"${FILESDIR}"/${P}-default-routes.lua-reevaluate-current-profile-only-f.patch
 	"${WORKDIR}"/${P}-endianness-fixes.patch
 )
 
diff --git a/media-video/wireplumber/wireplumber-0.4.6.ebuild b/media-video/wireplumber/wireplumber-0.4.6.ebuild
new file mode 100644
index 000000000000..92ffe0cec0a2
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.4.6.ebuild
@@ -0,0 +1,94 @@
+# 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 ~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 systemd test"
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind 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
+"
+
+DEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.62
+	>=media-video/pipewire-0.3.43:=
+	virtual/libc
+	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}"
+
+DOCS=( {NEWS,README}.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-endianness-fixes.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)
+		-Dsystemd-system-service=false # Matches upstream
+		$(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
+}
+
+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
+	ewarn
+}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 43f426dd14b9..2e6c068b1ee9 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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
@@ -40,7 +40,7 @@ BDEPEND="
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.42:=
+	>=media-video/pipewire-0.3.43:=
 	virtual/libc
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )