gentoo auto-resync : 18:04:2023 - 17:55:41

6 files changed, 122 insertions, 1 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index bf753d98707d..919337ac6e00 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 86a39250375d..1c9cdd1a8b88 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,3 +1,6 @@
+AUX 0.3.69/0001-context-improve-state-calculations.patch 2055 BLAKE2B d97130e6d1c00f29035bfbca6fa9bf3b943b593055dbcc0a12493adf25bbff7005102d7f10c3bd2c49b2e33e9fad81fb81c7ed86b72c39d3093680eeec3310fb SHA512 9fe6f193adf703cf0af24c00242d4be8e5f2ab21f79e3a6a82701dc3e5ec8de5125e4e2cf573949467300b21e022821b303a9e06d07d256013240ece5c251dad
+AUX 0.3.69/0002-revert-alsa-mixer-control-element.patch 2032 BLAKE2B c52203b8915c4bc62ccd7502e47e049a8f4ea786d3b20b1fce124a53da5db0636bd21145196a96a1cefde01efcfd4a9d04501d3a86661095a423b6a5861567d6 SHA512 5efdbc34471ea97539f7a3ade491938ad296c183282c66ffe8b184eafd6f38345d59f0948a912564af5b86978194f90cb252157f46cf7481c04298af9319f1f9
+AUX 0.3.69/0003-filter-chain-biquads.patch 731 BLAKE2B 933d7ee5bc19e41f4ad38dfcc2d1a870faa71f283b56a1d975be33b6a93c97fec439a3a94130a2f6c03ff9c6ec2d9d5ce667d2f060c9b883e0e8dbf16b1c86ec SHA512 6788b0b6d74617a970f7215c4a9592cd51eabd896fa5fed8e6f3f0a9e94d9d83081803ef55ea1d910ffe2c7f5425e09d0ac797b9663892a04991a2b753631c41
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
@@ -6,6 +9,6 @@ AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed5
 DIST pipewire-0.3.67.tar.bz2 1531871 BLAKE2B 59ea184ae11ad2999f37f0ded785551894ce6fbf478146c53f1dc6cdfeae7aa50cf6151b1e5e9c63c4f288682e5da7fde523251096af7da9d79bf96dd9d94809 SHA512 538b8ee905760775a0522dd3883d5db9bcaafe93d80eb5b588e21e73de22637a49cd139d3ed4dcfd1a5822af85e4cede624eee899c1e51a115f1ba0a6966c7a5
 DIST pipewire-0.3.69.tar.bz2 1567927 BLAKE2B 1b62e7cd359a4b1ee75793939026eef2c09d87cf7f0537fe77c081cd1b029463681b8838c9e4c0b82686ba628d74316e38d6471dbfab21ebb4d159fd052f2d6d SHA512 95e91006928b9596b47a1becfcd975dfa6bcfb2286fc6007a5bed4f127d2fd2b7477573facdb73f3ebd5cb6b77b8e9ef714e5c0c2aec97ef9d3a768b477b6477
 EBUILD pipewire-0.3.67.ebuild 17491 BLAKE2B c4778fa3e2a3e72691ee280e06b94dc68730851b8baccc7a8a1db630dcf89ec06a5229e826c5e7b53a7b1369047ffeb2782aba5b47b7db6f4b0acbacd678070d SHA512 d49074253b32fbf4da193e99c2e5b684b9adbe85d4a68d666ee30adadf0fab925195b63544b929b85eeb049ed23010f88a05806cb87ad33f836185b8430943e0
-EBUILD pipewire-0.3.69.ebuild 17542 BLAKE2B 91ea87322e38984dd97391cd96e5a85a463651d9133f4c5ced0ce8498aef6f20c2c517aed9668ee138b2dbeef92af42a8487b30e556f481ae7380621b54a5422 SHA512 6c678aceec2805be7319d8f0000e7e0749cf17684c0f080ad572ec1477f97141aecd9977e76afcd6e0d3d0b2220cf71387acee5934b93f7e7f9610ae0a642e1d
+EBUILD pipewire-0.3.69-r1.ebuild 17542 BLAKE2B 91ea87322e38984dd97391cd96e5a85a463651d9133f4c5ced0ce8498aef6f20c2c517aed9668ee138b2dbeef92af42a8487b30e556f481ae7380621b54a5422 SHA512 6c678aceec2805be7319d8f0000e7e0749cf17684c0f080ad572ec1477f97141aecd9977e76afcd6e0d3d0b2220cf71387acee5934b93f7e7f9610ae0a642e1d
 EBUILD pipewire-9999.ebuild 17542 BLAKE2B 91ea87322e38984dd97391cd96e5a85a463651d9133f4c5ced0ce8498aef6f20c2c517aed9668ee138b2dbeef92af42a8487b30e556f481ae7380621b54a5422 SHA512 6c678aceec2805be7319d8f0000e7e0749cf17684c0f080ad572ec1477f97141aecd9977e76afcd6e0d3d0b2220cf71387acee5934b93f7e7f9610ae0a642e1d
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/files/0.3.69/0001-context-improve-state-calculations.patch b/media-video/pipewire/files/0.3.69/0001-context-improve-state-calculations.patch
new file mode 100644
index 000000000000..29469205cf48
--- /dev/null
+++ b/media-video/pipewire/files/0.3.69/0001-context-improve-state-calculations.patch
@@ -0,0 +1,59 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a275e825c75c93775baaeb17479e38d035d9b79a
+
+From a275e825c75c93775baaeb17479e38d035d9b79a Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Fri, 14 Apr 2023 12:01:03 +0200
+Subject: [PATCH] context: improve state calculations
+
+Always make peers of non-passive links runnable, even if we already
+visited the peer node. This makes non-passive links between drivers set the
+drivers to runnable. (midi-bridge, source to sink). It also makes nodes
+collected from the (link-)group runnable when they are linked together.
+
+To calculate the runnable state of the other nodes, only start from
+non-driver runnable nodes (like we already did when following links).
+
+This makes a link from echo-cancel-source to echo-cancel-sink activate
+the echo-canceler chain instead of staying idle.
+--- a/src/pipewire/context.c
++++ b/src/pipewire/context.c
+@@ -788,9 +788,6 @@ static inline int run_nodes(struct pw_context *context, struct pw_impl_node *nod
+ 	struct pw_impl_port *p;
+ 	struct pw_impl_link *l;
+ 
+-	if (!node->runnable)
+-		return 0;
+-
+ 	pw_log_debug("node %p: '%s'", node, node->name);
+ 
+ 	spa_list_for_each(p, &node->input_ports, link) {
+@@ -885,7 +882,7 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
+ 
+ 				pw_impl_link_prepare(l);
+ 
+-				if (!l->prepared || (t != n && t->visited))
++				if (!l->prepared)
+ 					continue;
+ 
+ 				if (!l->passive)
+@@ -906,7 +903,7 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
+ 
+ 				pw_impl_link_prepare(l);
+ 
+-				if (!l->prepared || (t != n && t->visited))
++				if (!l->prepared)
+ 					continue;
+ 
+ 				if (!l->passive)
+@@ -936,7 +933,8 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
+ 		pw_log_debug(" next node %p: '%s' runnable:%u", n, n->name, n->runnable);
+ 	}
+ 	spa_list_for_each(n, collect, sort_link)
+-		run_nodes(context, n, collect);
++		if (!n->driver && n->runnable)
++			run_nodes(context, n, collect);
+ 
+ 	return 0;
+ }
+-- 
+GitLab
diff --git a/media-video/pipewire/files/0.3.69/0002-revert-alsa-mixer-control-element.patch b/media-video/pipewire/files/0.3.69/0002-revert-alsa-mixer-control-element.patch
new file mode 100644
index 000000000000..1076ad101d0f
--- /dev/null
+++ b/media-video/pipewire/files/0.3.69/0002-revert-alsa-mixer-control-element.patch
@@ -0,0 +1,38 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/916f1cdfbfdc414d83031aef941a9909d1e603bd
+
+From 916f1cdfbfdc414d83031aef941a9909d1e603bd Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Fri, 14 Apr 2023 16:32:18 +0200
+Subject: [PATCH] Revert "alsa-mixer: allow to re-attach the mixer control
+ element"
+
+This reverts commit b554fc20e9ff97064721c89eb15b1b45870584e5.
+--- a/spa/plugins/alsa/acp/alsa-util.c
++++ b/spa/plugins/alsa/acp/alsa-util.c
+@@ -1648,20 +1648,12 @@ static int mixer_class_event(snd_mixer_class_t *class, unsigned int mask,
+     } else if (mask & SND_CTL_EVENT_MASK_ADD) {
+         snd_ctl_elem_iface_t iface = snd_hctl_elem_get_interface(helem);
+         if (iface == SND_CTL_ELEM_IFACE_CARD || iface == SND_CTL_ELEM_IFACE_PCM) {
+-            snd_mixer_t *mixer = snd_mixer_class_get_mixer(class);
+-            snd_ctl_elem_iface_t iface = snd_hctl_elem_get_interface(helem);
+-            const char *name = snd_hctl_elem_get_name(helem);
+-            const int index = snd_hctl_elem_get_index(helem);
+-            const int device = snd_hctl_elem_get_device(helem);
+             snd_mixer_elem_t *new_melem;
+ 
+-            new_melem = pa_alsa_mixer_find(mixer, iface, name, index, device);
+-            if (!new_melem) {
+-                /* Put the hctl pointer as our private data - it will be useful for callbacks */
+-                if ((err = snd_mixer_elem_new(&new_melem, SND_MIXER_ELEM_PULSEAUDIO, 0, helem, NULL)) < 0) {
+-                    pa_log_warn("snd_mixer_elem_new failed: %s", pa_alsa_strerror(err));
+-                    return 0;
+-                }
++            /* Put the hctl pointer as our private data - it will be useful for callbacks */
++            if ((err = snd_mixer_elem_new(&new_melem, SND_MIXER_ELEM_PULSEAUDIO, 0, helem, NULL)) < 0) {
++                pa_log_warn("snd_mixer_elem_new failed: %s", pa_alsa_strerror(err));
++                return 0;
+             }
+ 
+             if ((err = snd_mixer_elem_attach(new_melem, helem)) < 0) {
+-- 
+GitLab
diff --git a/media-video/pipewire/files/0.3.69/0003-filter-chain-biquads.patch b/media-video/pipewire/files/0.3.69/0003-filter-chain-biquads.patch
new file mode 100644
index 000000000000..f01362604f51
--- /dev/null
+++ b/media-video/pipewire/files/0.3.69/0003-filter-chain-biquads.patch
@@ -0,0 +1,21 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/381be87e379996c502786883f90a19ac49e84c10
+
+From 381be87e379996c502786883f90a19ac49e84c10 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Sun, 16 Apr 2023 18:38:52 +0200
+Subject: [PATCH] filter-chain: config is only required for bq_raw
+
+Fixes #3161
+--- a/src/modules/module-filter-chain/builtin_plugin.c
++++ b/src/modules/module-filter-chain/builtin_plugin.c
+@@ -287,6 +287,8 @@ static void *bq_instantiate(const struct fc_descriptor * Descriptor,
+ 	impl->rate = SampleRate;
+ 	impl->b0 = impl->a0 = 1.0f;
+ 	impl->type = bq_type_from_name(Descriptor->name);
++	if (impl->type != BQ_NONE)
++		return impl;
+ 
+ 	if (config == NULL)
+ 		goto error;
+-- 
+GitLab
diff --git a/media-video/pipewire/pipewire-0.3.69.ebuild b/media-video/pipewire/pipewire-0.3.69-r1.ebuild
index a54b5c2d65dd..a54b5c2d65dd 100644
--- a/media-video/pipewire/pipewire-0.3.69.ebuild
+++ b/media-video/pipewire/pipewire-0.3.69-r1.ebuild