summaryrefslogtreecommitdiff
path: root/media-video/pipewire/files
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/pipewire/files')
-rw-r--r--media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch23
-rw-r--r--media-video/pipewire/files/pipewire-0.3.54-fortify-source.patch33
-rw-r--r--media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch20
3 files changed, 20 insertions, 56 deletions
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
deleted file mode 100644
index 9c231a9f28f5..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.54-audioconvert-samples.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
diff --git a/media-video/pipewire/files/pipewire-0.3.54-fortify-source.patch b/media-video/pipewire/files/pipewire-0.3.54-fortify-source.patch
deleted file mode 100644
index 0c93f105375a..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.54-fortify-source.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/240d21282271dce7d2eeff03185a61ffca0c12c5
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2526
-https://bugs.gentoo.org/857201
-
-From 240d21282271dce7d2eeff03185a61ffca0c12c5 Mon Sep 17 00:00:00 2001
-From: Pauli Virtanen <pav@iki.fi>
-Date: Sun, 10 Jul 2022 16:05:27 +0300
-Subject: [PATCH] pipewire-v4l2: disable _FORTIFY_SOURCE when defining override
- functions
-
-_FORTIFY_SOURCE defines always_inline versions of open etc. functions,
-which conflict with our exported override versions. Disable it for the
-file that defines the override functions.
---- a/pipewire-v4l2/src/v4l2-func.c
-+++ b/pipewire-v4l2/src/v4l2-func.c
-@@ -22,6 +22,16 @@
- * DEALINGS IN THE SOFTWARE.
- */
-
-+
-+/*
-+ * We need to export open* etc., but _FORTIFY_SOURCE defines conflicting
-+ * always_inline versions. Disable _FORTIFY_SOURCE for this file, so we
-+ * can define our overrides.
-+ */
-+#ifdef _FORTIFY_SOURCE
-+#undef _FORTIFY_SOURCE
-+#endif
-+
- #include <stdio.h>
- #include <errno.h>
- #include <fcntl.h>
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch b/media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch
new file mode 100644
index 000000000000..8667b3a6d167
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch
@@ -0,0 +1,20 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/40552a0e914c3aef48ce59ce1bfb9d80516aa893
+
+From 40552a0e914c3aef48ce59ce1bfb9d80516aa893 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 12 Jul 2022 15:10:02 +0200
+Subject: [PATCH] jack: only mix when we have input to mix
+
+Avoids a crash when starting ardour6.
+--- a/pipewire-jack/src/pipewire-jack.c
++++ b/pipewire-jack/src/pipewire-jack.c
+@@ -4449,7 +4449,7 @@ static void *get_buffer_input_float(struct port *p, jack_nframes_t frames)
+ }
+ if (n_ptr == 1) {
+ ptr = mix_ptr[0];
+- } else {
++ } else if (n_ptr > 1) {
+ ptr = p->emptyptr;
+ mix_function(ptr, mix_ptr, n_ptr, ptr_aligned, frames);
+ p->zeroed = false;
+GitLab