Re: [PATCH] contrib: Add missing includes to pipewiregrab patch.

[François-Simon Fauteux-Chapleau]

Hi Maxim,

Can you double-check that you're building against the right version of FFmpeg? 
Jami currently uses 6.0.1. As far as I know, these includes are only needed 
starting with version 7.0 (and indeed I already added them in the most recent 
version of the patch submitted to FFmpeg: 
https://patchwork.ffmpeg.org/project/ffmpeg/patch/20240510211219.213409-1-francois-simon.fauteux-chapleau@savoirfairelinux.com/).
 We do plan on upgrading to 7.0 at some point, we just haven't had the time to 
do it yet.

Best,
François-Simon

----- Original Message -----
From: "Maxim Cournoyer" <maxim.cournoyer@gmail.com>
To: jami@gnu.org
Cc: "Sébastien Blin" <sebastien.blin@savoirfairelinux.com>, "François-Simon 
Fauteux-Chapleau" <francois-simon.fauteux-chapleau@savoirfairelinux.com>, 
"Maxim Cournoyer" <maxim.cournoyer@gmail.com>
Sent: Wednesday, May 29, 2024 12:02:25 AM
Subject: [PATCH] contrib: Add missing includes to pipewiregrab patch.

Otherwise, GCC 13 would complain about implicit declaration of
functions, e.g.:

   libavfilter/vsrc_pipewiregrab.c:1352:12: error: implicit
   declaration of function ‘ff_set_common_formats_from_list’
   [-Werror=implicit-function-declaration]
    1352 |     return ff_set_common_formats_from_list(ctx, pix_fmts);
         |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

* contrib/src/ffmpeg/pipewiregrab-source-filter.patch: Include
libavfilter/formats.h and libavfilter/video.h.

---

 contrib/src/ffmpeg/pipewiregrab-source-filter.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/pipewiregrab-source-filter.patch 
b/contrib/src/ffmpeg/pipewiregrab-source-filter.patch
index f2da4f478..53b6ad7da 100644
--- a/contrib/src/ffmpeg/pipewiregrab-source-filter.patch
+++ b/contrib/src/ffmpeg/pipewiregrab-source-filter.patch
@@ -75,7 +75,7 @@ new file mode 100644
 index 0000000000..ff9c3468ab
 --- /dev/null
 +++ b/libavfilter/vsrc_pipewiregrab.c
-@@ -0,0 +1,1373 @@
+@@ -0,0 +1,1375 @@
 +/*
 + * PipeWire input grabber (ScreenCast)
 + * Copyright (C) 2024 Savoir-faire Linux, Inc.
@@ -117,6 +117,8 @@ 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"

base-commit: d9d9d08d0478eb36a320b8946ec7c6eee8949301
-- 
2.41.0