gentoo resync : 09.07.2022

8 files changed, 23 insertions, 166 deletions

diff --git a/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch
deleted file mode 100644
index 51455a3b84b8..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.25-non-systemd-integration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
---- a/src/daemon/pipewire.conf.in
-+++ b/src/daemon/pipewire.conf.in
-@@ -204,12 +204,12 @@ context.exec = [
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @comment@{ path = "@media_session_path@"  args = "" }
-+    { path = "@media_session_path@"  args = "" }
-     #
-     # You can optionally start the pulseaudio-server here as well
-     # but it is better to start it as a systemd service.
-     # It can be interesting to start another daemon here that listens
-     # on another address with the -a option (eg. -a tcp:4713).
-     #
--    @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
-+    { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
- ]
diff --git a/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch
deleted file mode 100644
index 9da495f12d0d..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6d2e45a67cadd9498b24e8e4ea7adc6cf627333d Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 3 Jun 2021 14:15:44 +0200
-Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
-
-This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
-
-Doesn't apply to us.
-
-Bug: https://bugs.gentoo.org/785634
----
- spa/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/meson.build b/spa/meson.build
-index 263af4c2..7671c74b 100644
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -23,7 +23,7 @@ if not get_option('spa-plugins').disabled()
-     sbc_dep = dependency('sbc', required: get_option('bluez5'))
-     ldac_dep = dependency('ldacBT-enc', required : get_option('bluez5-codec-ldac'))
-     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
--    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
-+    aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx'))
-     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
-   endif
-   avcodec_dep = dependency('libavcodec', required: get_option('ffmpeg'))
--- 
-2.32.0.rc3
-
diff --git a/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch
deleted file mode 100644
index 3edab5b924c8..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/daemon/pipewire.conf.in
-+++ b/src/daemon/pipewire.conf.in
-@@ -235,12 +235,12 @@ context.exec = [
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @sm_comment@{ path = "@session_manager_path@"  args = "@session_manager_args@" }
-+    { path = "@session_manager_path@"  args = "@session_manager_args@" }
-     #
-     # You can optionally start the pulseaudio-server here as well
-     # but it is better to start it as a systemd service.
-     # It can be interesting to start another daemon here that listens
-     # on another address with the -a option (eg. -a tcp:4713).
-     #
--    @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
-+    { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
- ]
--- 
-2.33.0
-
diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch
deleted file mode 100644
index 6080ff4fd7ab..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/39c8ed4f62172026036281691cd3b67b469a8629
-
-From 39c8ed4f62172026036281691cd3b67b469a8629 Mon Sep 17 00:00:00 2001
-From: Pauli Virtanen <pav@iki.fi>
-Date: Thu, 16 Sep 2021 19:18:52 +0300
-Subject: [PATCH] media-session: don't use-after-free if linking node removed
-
-Should fix an ASAN crash.
----
- src/examples/media-session/policy-node.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/examples/media-session/policy-node.c b/src/examples/media-session/policy-node.c
-index d83613d0b..e273434fa 100644
---- a/src/examples/media-session/policy-node.c
-+++ b/src/examples/media-session/policy-node.c
-@@ -869,6 +869,7 @@ static int link_nodes(struct node *node, struct node *peer)
- 	struct pw_properties *props;
- 	struct node *output, *input;
- 	int res;
-+	uint32_t node_id = node->id;
- 
- 	pw_log_debug(NAME " %p: link nodes %d %d remix:%d", impl,
- 			node->id, peer->id, !node->dont_remix);
-@@ -902,7 +903,7 @@ static int link_nodes(struct node *node, struct node *peer)
- 
- 	if (impl->linking_node_removed) {
- 		impl->linking_node_removed = false;
--		pw_log_info("linking node %d was removed", node->id);
-+		pw_log_info("linking node %d was removed", node_id);
- 		return -ENOENT;
- 	}
- 	node->linking = false;
--- 
-GitLab
-
diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch
deleted file mode 100644
index ace05b9e4a14..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/10abcd92d76ddd02b690ff06d67c013bfc5fa5c2
-
-From 10abcd92d76ddd02b690ff06d67c013bfc5fa5c2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 16 Sep 2021 17:57:47 +0200
-Subject: [PATCH] update version number as well
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index c9b98c8ba..ea35ac674 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,5 +1,5 @@
- project('pipewire', ['c' ],
--  version : '0.3.35',
-+  version : '0.3.36',
-   license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
-   meson_version : '>= 0.54.0',
-   default_options : [ 'warning_level=3',
--- 
-GitLab
-
diff --git a/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch b/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch
deleted file mode 100644
index c7ed7b973a91..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.36-missing-limits-include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/6168067cb2a45ffa3c92aff1135659feaf9c1240
-
-From: Leonardo Neumann <leonardo@neumann.dev.br>
-Date: Sat, 18 Sep 2021 04:36:20 -0300
-Subject: [PATCH] fix missing limits.h include
-
---- a/src/pipewire/impl-module.c
-+++ b/src/pipewire/impl-module.c
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <dlfcn.h>
- #include <dirent.h>
-+#include <limits.h>
- #include <sys/stat.h>
- #include <errno.h>
- 
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch b/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch
deleted file mode 100644
index 58b4b331e03e..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.49-x86-cast.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5a023c8c84fb053d452983a64a33a41b931fc99b
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2271
-
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 21 Apr 2022 22:12:38 +0200
-Subject: [PATCH] alsa: fix argument type for Long
-
-Fixes #2271
---- a/spa/plugins/alsa/alsa-pcm.c
-+++ b/spa/plugins/alsa/alsa-pcm.c
-@@ -311,7 +311,7 @@ struct spa_pod *spa_alsa_enum_propinfo(struct state *state,
- 			SPA_PROP_INFO_name, SPA_POD_String("latency.internal.ns"),
- 			SPA_PROP_INFO_description, SPA_POD_String("Internal latency in nanoseconds"),
- 			SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Long(state->process_latency.ns,
--				0, 2 * SPA_NSEC_PER_SEC),
-+				0LL, 2 * SPA_NSEC_PER_SEC),
- 			SPA_PROP_INFO_params, SPA_POD_Bool(true));
- 		break;
- 	case 15:
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch b/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch
new file mode 100644
index 000000000000..9c231a9f28f5
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch
@@ -0,0 +1,23 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/7b0106883716cb0fa72a2b3c4715175607ec658a
+
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Fri, 8 Jul 2022 09:23:31 +0200
+Subject: [PATCH] audioconvert: consume right amount of input samples
+
+When we are not using the resampler, we consume the same amount of
+input samples as output samples.
+
+Fixes #2519
+--- a/spa/plugins/audioconvert/audioconvert.c
++++ b/spa/plugins/audioconvert/audioconvert.c
+@@ -2542,8 +2542,8 @@ static int impl_node_process(void *object)
+ 		this->in_offset += in_len;
+ 		n_samples = out_len;
+ 	} else {
+-		this->in_offset += n_samples;
+ 		n_samples = SPA_MIN(n_samples, n_out);
++		this->in_offset += n_samples;
+ 	}
+ 	this->out_offset += n_samples;
+ 
+GitLab