guix_mirror_bot pushed a commit to branch master
in repository guix.
commit a0e6027e3b2f0c878b92f75e19a8f65ba91375fa
Author: kestrel <[email protected]>
AuthorDate: Thu Oct 9 10:25:04 2025 +0300
gnu: Update ffmpeg-jami patches.
* gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch: Update
file provided from upstream.
* gnu/packages/video.scm (ffmpeg-jami) [source]: Apply omitted patch.
Change-Id: I73e6850c1c5f8d995b57eb28ff6f109130710307
Signed-off-by: Maxim Cournoyer <[email protected]>
---
.../patches/ffmpeg-jami-pipewiregrab-source-filter.patch | 9 +++++----
gnu/packages/video.scm | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch
b/gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch
index 53b6ad7da2..b8da1e428a 100644
--- a/gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch
+++ b/gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch
@@ -72,10 +72,10 @@ index d7db46c2af..87204fec71 100644
extern const AVFilter ff_vsrc_smptebars;
diff --git a/libavfilter/vsrc_pipewiregrab.c b/libavfilter/vsrc_pipewiregrab.c
new file mode 100644
-index 0000000000..ff9c3468ab
+index 0000000000..44d64b1eac
--- /dev/null
+++ b/libavfilter/vsrc_pipewiregrab.c
-@@ -0,0 +1,1375 @@
+@@ -0,0 +1,1376 @@
+/*
+ * PipeWire input grabber (ScreenCast)
+ * Copyright (C) 2024 Savoir-faire Linux, Inc.
@@ -117,8 +117,6 @@ index 0000000000..ff9c3468ab
+#include <sys/mman.h>
+#include <sys/queue.h>
+
-+#include "libavfilter/formats.h"
-+#include "libavfilter/video.h"
+#include "libavutil/internal.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
@@ -129,7 +127,9 @@ index 0000000000..ff9c3468ab
+#include "libavformat/internal.h"
+#include "libavutil/avassert.h"
+#include "avfilter.h"
++#include "formats.h"
+#include "internal.h"
++#include "video.h"
+
+#include <pipewire/pipewire.h>
+#include <pipewire/thread-loop.h>
@@ -671,6 +671,7 @@ index 0000000000..ff9c3468ab
+ memcpy(pw_ctx->current_frame->data[0], sdata,
spa_buf->datas[0].chunk->size);
+ pw_ctx->current_frame->width = frame_width;
+ pw_ctx->current_frame->height = frame_height;
++ pw_ctx->current_frame->linesize[0] = spa_buf->datas[0].chunk->stride;
+ pthread_mutex_unlock(&pw_ctx->current_frame_mutex);
+
+ // Cleanup
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d6f67a0c5b..d9985b4b73 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2004,6 +2004,7 @@ audio/video codec library.")
"ffmpeg-jami-change-RTCP-ratio.patch"
"ffmpeg-jami-rtp_ext_abs_send_time.patch"
"ffmpeg-jami-libopusdec-enable-FEC.patch"
+ "ffmpeg-jami-libopusenc-enable-FEC.patch"
"ffmpeg-jami-libopusenc-reload-packet-loss-at-encode.patch"
"ffmpeg-jami-screen-sharing-x11-fix.patch"
"ffmpeg-jami-pipewiregrab-source-filter.patch"))))))
