[Buildroot] [PATCH 1/6] package/freeswitch: fix build with ffmpeg 8.x

[Buildroot] [PATCH 1/6] package/freeswitch: fix build with ffmpeg 8.x

[Bernd Kuhls]

Replaced patch 0002 with new upstream commit.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/freeswitch/0002-ffmpeg8.patch         |  52 ------
 ...mod_av-Add-support-for-FFmpeg-8-3250.patch | 157 ++++++++++++++++++
 2 files changed, 157 insertions(+), 52 deletions(-)
 delete mode 100644 package/freeswitch/0002-ffmpeg8.patch
 create mode 100644 package/freeswitch/0002-mod_av-Add-support-for-FFmpeg-8-3250.patch

diff --git a/package/freeswitch/0002-ffmpeg8.patch b/package/freeswitch/0002-ffmpeg8.patch
deleted file mode 100644
index 486231e79c..0000000000
--- a/package/freeswitch/0002-ffmpeg8.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0ce211af3a3ad0b1060b542d0a92a07dab5d2d59 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd@kuhls.net>
-Date: Sat, 23 Aug 2025 18:15:39 +0200
-Subject: [PATCH] [mod_av] Add support for FFmpeg 8.0
-
-remove deprecated FF_API_FF_PROFILE_LEVEL:
-https://github.com/FFmpeg/FFmpeg/commit/822432769868da325ba03774df1084aa78b9a5a0
-
-Upstream: https://github.com/signalwire/freeswitch/pull/2896
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- src/mod/applications/mod_av/avcodec.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/mod/applications/mod_av/avcodec.c b/src/mod/applications/mod_av/avcodec.c
-index a9d449b562c..9962b821d53 100644
---- a/src/mod/applications/mod_av/avcodec.c
-+++ b/src/mod/applications/mod_av/avcodec.c
-@@ -530,7 +530,7 @@ static void init_profile(avcodec_profile_t *aprofile, const char *name)
- 	aprofile->decoder_thread_count = avcodec_globals.dec_threads;
- 
- 	if (!strcasecmp(name, "H264")) {
--		aprofile->ctx.profile = FF_PROFILE_H264_BASELINE;
-+		aprofile->ctx.profile = AV_PROFILE_H264_BASELINE;
- 		aprofile->ctx.level = 31;
- #ifdef AV_CODEC_FLAG_PSNR
- 		aprofile->ctx.flags |= AV_CODEC_FLAG_PSNR;
-@@ -2071,7 +2071,7 @@ static void parse_profile(avcodec_profile_t *aprofile, switch_xml_t profile)
- 
- 	ctx = &aprofile->ctx;
- 
--	ctx->profile = FF_PROFILE_H264_BASELINE;
-+	ctx->profile = AV_PROFILE_H264_BASELINE;
- 	ctx->level = 31;
- 
- 	for (param = switch_xml_child(profile, "param"); param; param = param->next) {
-@@ -2094,11 +2094,11 @@ static void parse_profile(avcodec_profile_t *aprofile, switch_xml_t profile)
- 
- 			if (ctx->profile == 0 && !strcasecmp(aprofile->name, "H264")) {
- 				if (!strcasecmp(value, "baseline")) {
--					ctx->profile = FF_PROFILE_H264_BASELINE;
-+					ctx->profile = AV_PROFILE_H264_BASELINE;
- 				} else if (!strcasecmp(value, "main")) {
--					ctx->profile = FF_PROFILE_H264_MAIN;
-+					ctx->profile = AV_PROFILE_H264_MAIN;
- 				} else if (!strcasecmp(value, "high")) {
--					ctx->profile = FF_PROFILE_H264_HIGH;
-+					ctx->profile = AV_PROFILE_H264_HIGH;
- 				}
- 			}
- 		} else if (!strcmp(name, "level")) {
diff --git a/package/freeswitch/0002-mod_av-Add-support-for-FFmpeg-8-3250.patch b/package/freeswitch/0002-mod_av-Add-support-for-FFmpeg-8-3250.patch
new file mode 100644
index 0000000000..5596f834e5
--- /dev/null
+++ b/package/freeswitch/0002-mod_av-Add-support-for-FFmpeg-8-3250.patch
@@ -0,0 +1,157 @@
+From 9fdd2cdfaf3662740fbac6a406cc7c451c7ec0b4 Mon Sep 17 00:00:00 2001
+From: Andrey Volk <andywolk@gmail.com>
+Date: Wed, 28 Oct 2026 18:27:37 +0300
+Subject: [PATCH] [mod_av] Add support for FFmpeg 8 (#3250)
+
+Upstream: https://github.com/signalwire/freeswitch/commit/9fdd2cdfaf3662740fbac6a406cc7c451c7ec0b4
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ src/mod/applications/mod_av/avcodec.c  | 17 ++++++++++----
+ src/mod/applications/mod_av/avformat.c | 32 ++++++++++++++++++--------
+ src/mod/applications/mod_av/mod_av.h   |  1 +
+ 3 files changed, 36 insertions(+), 14 deletions(-)
+
+diff --git a/src/mod/applications/mod_av/avcodec.c b/src/mod/applications/mod_av/avcodec.c
+index a9d449b562..20f9abe719 100644
+--- a/src/mod/applications/mod_av/avcodec.c
++++ b/src/mod/applications/mod_av/avcodec.c
+@@ -42,6 +42,13 @@
+ #include <libavutil/opt.h>
+ #include <libavutil/imgutils.h>
+ 
++/* AV_PROFILE_* replaced FF_PROFILE_* in FFmpeg 6.1, FFmpeg 8 removed the latter */
++#ifndef AV_PROFILE_H264_BASELINE
++#define AV_PROFILE_H264_BASELINE FF_PROFILE_H264_BASELINE
++#define AV_PROFILE_H264_MAIN FF_PROFILE_H264_MAIN
++#define AV_PROFILE_H264_HIGH FF_PROFILE_H264_HIGH
++#endif
++
+ int SLICE_SIZE = (SWITCH_DEFAULT_VIDEO_SIZE + 100);
+ 
+ #define H264_NALU_BUFFER_SIZE 65536
+@@ -530,7 +537,7 @@ static void init_profile(avcodec_profile_t *aprofile, const char *name)
+ 	aprofile->decoder_thread_count = avcodec_globals.dec_threads;
+ 
+ 	if (!strcasecmp(name, "H264")) {
+-		aprofile->ctx.profile = FF_PROFILE_H264_BASELINE;
++		aprofile->ctx.profile = AV_PROFILE_H264_BASELINE;
+ 		aprofile->ctx.level = 31;
+ #ifdef AV_CODEC_FLAG_PSNR
+ 		aprofile->ctx.flags |= AV_CODEC_FLAG_PSNR;
+@@ -2071,7 +2078,7 @@ static void parse_profile(avcodec_profile_t *aprofile, switch_xml_t profile)
+ 
+ 	ctx = &aprofile->ctx;
+ 
+-	ctx->profile = FF_PROFILE_H264_BASELINE;
++	ctx->profile = AV_PROFILE_H264_BASELINE;
+ 	ctx->level = 31;
+ 
+ 	for (param = switch_xml_child(profile, "param"); param; param = param->next) {
+@@ -2094,11 +2101,11 @@ static void parse_profile(avcodec_profile_t *aprofile, switch_xml_t profile)
+ 
+ 			if (ctx->profile == 0 && !strcasecmp(aprofile->name, "H264")) {
+ 				if (!strcasecmp(value, "baseline")) {
+-					ctx->profile = FF_PROFILE_H264_BASELINE;
++					ctx->profile = AV_PROFILE_H264_BASELINE;
+ 				} else if (!strcasecmp(value, "main")) {
+-					ctx->profile = FF_PROFILE_H264_MAIN;
++					ctx->profile = AV_PROFILE_H264_MAIN;
+ 				} else if (!strcasecmp(value, "high")) {
+-					ctx->profile = FF_PROFILE_H264_HIGH;
++					ctx->profile = AV_PROFILE_H264_HIGH;
+ 				}
+ 			}
+ 		} else if (!strcmp(name, "level")) {
+diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c
+index d617a52dfe..92ec9ed9cf 100644
+--- a/src/mod/applications/mod_av/avformat.c
++++ b/src/mod/applications/mod_av/avformat.c
+@@ -281,6 +281,24 @@ GCC_DIAG_ON(deprecated-declarations)
+ #endif
+ }
+ 
++static inline int av_get_ticks_per_frame(AVCodecContext *c)
++{
++#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_8_V)
++	int ticks;
++
++GCC_DIAG_OFF(deprecated-declarations)
++	ticks = c->ticks_per_frame;
++GCC_DIAG_ON(deprecated-declarations)
++
++	return ticks;
++#else
++	/* FFmpeg 8 removed ticks_per_frame, which decoders of field based codecs set to 2 */
++	const AVCodecDescriptor *desc = avcodec_descriptor_get(c->codec_id);
++
++	return (desc && (desc->props & AV_CODEC_PROP_FIELDS)) ? 2 : 1;
++#endif
++}
++
+ static char *const get_error_text(const int error, char *error_buffer, switch_size_t error_buflen)
+ {
+ 	av_strerror(error, error_buffer, error_buflen);
+@@ -637,12 +655,14 @@ static switch_status_t add_stream(av_file_context_t *context, MediaStream *mst,
+ 		c->rc_initial_buffer_occupancy = buffer_bytes * 8;
+ 
+ 		if (codec_id == AV_CODEC_ID_H264) {
++#if (LIBAVCODEC_VERSION_MAJOR < LIBAVCODEC_8_V) /* FFmpeg 8 removed ticks_per_frame */
+ #if ((LIBAVFORMAT_VERSION_MAJOR == LIBAVFORMAT_6_V && LIBAVFORMAT_VERSION_MINOR >= LIBAVFORMAT_61_V) || LIBAVFORMAT_VERSION_MAJOR == LIBAVFORMAT_7_V)
+ GCC_DIAG_OFF(deprecated-declarations)
+ #endif
+ 			c->ticks_per_frame = 2;
+ #if ((LIBAVFORMAT_VERSION_MAJOR == LIBAVFORMAT_6_V && LIBAVFORMAT_VERSION_MINOR >= LIBAVFORMAT_61_V) || LIBAVFORMAT_VERSION_MAJOR == LIBAVFORMAT_7_V)
+ GCC_DIAG_ON(deprecated-declarations)
++#endif
+ #endif
+ 
+ 			c->flags|=AV_CODEC_FLAG_LOOP_FILTER;   // flags=+loop
+@@ -1431,7 +1451,7 @@ static switch_status_t open_input_file(av_file_context_t *context, switch_file_h
+ 		switch_goto_status(SWITCH_STATUS_FALSE, err);
+ 	}
+ 
+-#if (LIBAVFORMAT_VERSION_MAJOR == LIBAVFORMAT_7_V)
++#if (LIBAVFORMAT_VERSION_MAJOR >= LIBAVFORMAT_7_V)
+ 	handle->seekable = !(context->fc->iformat->flags & AVFMT_NOTIMESTAMPS);
+ #else
+ 	handle->seekable = context->fc->iformat->read_seek2 ? 1 : (context->fc->iformat->read_seek ? 1 : 0);
+@@ -3240,21 +3260,15 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f
+ 
+ 	if ((c = av_get_codec_context(mst)) && c->time_base.num) {
+ 		cp = av_stream_get_parser(st);
+-#if ((LIBAVFORMAT_VERSION_MAJOR == LIBAVFORMAT_6_V && LIBAVFORMAT_VERSION_MINOR >= LIBAVFORMAT_61_V) || LIBAVFORMAT_VERSION_MAJOR == LIBAVFORMAT_7_V)
+-GCC_DIAG_OFF(deprecated-declarations)
+-#endif
+-		ticks = cp ? cp->repeat_pict + 1 : c->ticks_per_frame;
++		ticks = cp ? cp->repeat_pict + 1 : av_get_ticks_per_frame(c);
+ 		// mst->next_pts += ((int64_t)AV_TIME_BASE * st->codec->time_base.num * ticks) / st->codec->time_base.den;
+ 	}
+ 
+ 	if (!context->video_start_time) {
+ 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "start: %" SWITCH_INT64_T_FMT " ticks: %d ticks_per_frame: %d st num:%d st den:%d codec num:%d codec den:%d start: %" SWITCH_TIME_T_FMT ", duration:%" SWITCH_INT64_T_FMT " nb_frames:%" SWITCH_INT64_T_FMT " q2d:%f\n",
+-			context->video_start_time, ticks, c ? c->ticks_per_frame : -1, st->time_base.num, st->time_base.den, c ? c->time_base.num : -1, c ? c->time_base.den : -1,
++			context->video_start_time, ticks, c ? av_get_ticks_per_frame(c) : -1, st->time_base.num, st->time_base.den, c ? c->time_base.num : -1, c ? c->time_base.den : -1,
+ 			st->start_time, st->duration == AV_NOPTS_VALUE ? context->fc->duration / AV_TIME_BASE * 1000 : st->duration, st->nb_frames, av_q2d(st->time_base));
+ 	}
+-#if ((LIBAVFORMAT_VERSION_MAJOR == LIBAVFORMAT_6_V && LIBAVFORMAT_VERSION_MINOR >= LIBAVFORMAT_61_V) || LIBAVFORMAT_VERSION_MAJOR == LIBAVFORMAT_7_V)
+-GCC_DIAG_ON(deprecated-declarations)
+-#endif
+ 
+  again:
+ 
+diff --git a/src/mod/applications/mod_av/mod_av.h b/src/mod/applications/mod_av/mod_av.h
+index 8152a77a81..92a6caaaa3 100644
+--- a/src/mod/applications/mod_av/mod_av.h
++++ b/src/mod/applications/mod_av/mod_av.h
+@@ -43,6 +43,7 @@
+ #define LIBAVCODEC_V 59 /* FFmpeg version >= 5.1 */
+ #define LIBAVCODEC_6_V 60 /* FFmpeg version >= 6.0 */
+ #define LIBAVCODEC_7_V 61 /* FFmpeg version >= 7.0 */
++#define LIBAVCODEC_8_V 62 /* FFmpeg version >= 8.0 */
+ #define LIBAVCODEC_61_V 31 /* FFmpeg version >= 6.1 */
+ #define LIBAVFORMAT_V 59 /* FFmpeg version >= 5.1 */
+ #define LIBAVFORMAT_6_V 60 /* FFmpeg version >= 6.0 */
+-- 
+2.47.3
+
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/6] package/gstreamer1/gst1-libav: fix build with ffmpeg 9.x

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...av-Fix-build-failure-with-FFmpeg-9.0.patch | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 package/gstreamer1/gst1-libav/0001-gst-libav-Fix-build-failure-with-FFmpeg-9.0.patch

diff --git a/package/gstreamer1/gst1-libav/0001-gst-libav-Fix-build-failure-with-FFmpeg-9.0.patch b/package/gstreamer1/gst1-libav/0001-gst-libav-Fix-build-failure-with-FFmpeg-9.0.patch
new file mode 100644
index 0000000000..31899e0a48
--- /dev/null
+++ b/package/gstreamer1/gst1-libav/0001-gst-libav-Fix-build-failure-with-FFmpeg-9.0.patch
@@ -0,0 +1,72 @@
+From be9bdb67f4fc868977f1f74e95b6ebe19ef792ec Mon Sep 17 00:00:00 2001
+From: Reilly Brogan <reilly@reillybrogan.com>
+Date: Tue, 4 Aug 2026 12:09:11 -0500
+Subject: [PATCH] gst-libav: Fix build failure with FFmpeg 9.0
+
+Closes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/work_items/5251
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/12217>
+
+Upstream: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/be9bdb67f4fc868977f1f74e95b6ebe19ef792ec
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ ext/libav/gstavviddec.c | 15 +++++++++------
+ ext/libav/gstavvidenc.c | 15 +++++++++------
+ 2 files changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
+index e21f3e1558..39335d98b1 100644
+--- a/ext/libav/gstavviddec.c
++++ b/ext/libav/gstavviddec.c
+@@ -2677,12 +2677,15 @@ gst_ffmpegviddec_register (GstPlugin * plugin)
+       continue;
+ 
+     /* no quasi codecs, please */
+-    if (in_plugin->id == AV_CODEC_ID_RAWVIDEO ||
+-        in_plugin->id == AV_CODEC_ID_V210 ||
+-        in_plugin->id == AV_CODEC_ID_V210X ||
+-        in_plugin->id == AV_CODEC_ID_V308 ||
+-        in_plugin->id == AV_CODEC_ID_V408 ||
+-        in_plugin->id == AV_CODEC_ID_V410 || in_plugin->id == AV_CODEC_ID_R210
++    if (in_plugin->id == AV_CODEC_ID_RAWVIDEO
++        || in_plugin->id == AV_CODEC_ID_V210
++        || in_plugin->id == AV_CODEC_ID_V210X
++        || in_plugin->id == AV_CODEC_ID_R210
++#if LIBAVCODEC_VERSION_MAJOR < 63
++        || in_plugin->id == AV_CODEC_ID_V308
++        || in_plugin->id == AV_CODEC_ID_V408
++        || in_plugin->id == AV_CODEC_ID_V410
++#endif
+ #if LIBAVCODEC_VERSION_MAJOR < 61
+         || in_plugin->id == AV_CODEC_ID_AYUV
+ #endif
+diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c
+index 2ae6a1b451..b8e010e70c 100644
+--- a/ext/libav/gstavvidenc.c
++++ b/ext/libav/gstavvidenc.c
+@@ -1025,12 +1025,15 @@ gst_ffmpegvidenc_register (GstPlugin * plugin)
+       continue;
+ 
+     /* no quasi codecs, please */
+-    if (in_plugin->id == AV_CODEC_ID_RAWVIDEO ||
+-        in_plugin->id == AV_CODEC_ID_V210 ||
+-        in_plugin->id == AV_CODEC_ID_V210X ||
+-        in_plugin->id == AV_CODEC_ID_V308 ||
+-        in_plugin->id == AV_CODEC_ID_V408 ||
+-        in_plugin->id == AV_CODEC_ID_V410 || in_plugin->id == AV_CODEC_ID_R210
++    if (in_plugin->id == AV_CODEC_ID_RAWVIDEO
++        || in_plugin->id == AV_CODEC_ID_V210
++        || in_plugin->id == AV_CODEC_ID_V210X
++        || in_plugin->id == AV_CODEC_ID_R210
++#if LIBAVCODEC_VERSION_MAJOR < 63
++        || in_plugin->id == AV_CODEC_ID_V308
++        || in_plugin->id == AV_CODEC_ID_V408
++        || in_plugin->id == AV_CODEC_ID_V410
++#endif
+ #if LIBAVCODEC_VERSION_MAJOR < 61
+         || in_plugin->id == AV_CODEC_ID_AYUV
+ #endif
+-- 
+2.47.3
+
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/6] package/gstreamer1/gst1-libav: fix build with ffmpeg 9.x

[Thomas Petazzoni via buildroot]

On Sun, Nov 01, 2026 at 11:45:30AM +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to master, thanks!

Best regards,

Thomas Petazzoni
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/6] package/libcamera: bump version to v0.7.2-167-g8fe1f4514

[Bernd Kuhls]

The releases of libcamera-apps and this package are not synced feature-
wise. To use the newest release of libcamera-apps, version 1.14.0, we
need to use a git tree newer than the current release 0.7.2 of libcamera.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Cc: Kieran Bingham <kieran.bingham@ideasonboard.com>
Cc: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 package/libcamera/libcamera.hash | 2 +-
 package/libcamera/libcamera.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash
index d1d7576533..1caad4f40c 100644
--- a/package/libcamera/libcamera.hash
+++ b/package/libcamera/libcamera.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256  7c5728f6a51d717542cfdd2ff368ac78fa2e50e8a7360a38bb37952e9293e008  libcamera-v0.7.1-git4.tar.gz
+sha256  58864d3ef4f14661187ce9871e2a2d38d6f0e89c76b6beff2f663021130359af  libcamera-v0.7.2-167-g8fe1f45140bace32677b1f7b9a17ae3b4fa85a59-git4.tar.gz
 
 # license files
 sha256  fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c  LICENSES/BSD-2-Clause.txt
diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk
index 256909ebc8..03c31eabb8 100644
--- a/package/libcamera/libcamera.mk
+++ b/package/libcamera/libcamera.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBCAMERA_SITE = https://gitlab.freedesktop.org/camera/libcamera.git
-LIBCAMERA_VERSION = v0.7.1
+LIBCAMERA_VERSION = v0.7.2-167-g8fe1f45140bace32677b1f7b9a17ae3b4fa85a59
 LIBCAMERA_SITE_METHOD = git
 LIBCAMERA_DEPENDENCIES = \
 	host-openssl \
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/6] package/libcamera: bump version to v0.7.2-167-g8fe1f4514

[Kieran Bingham]

Quoting Bernd Kuhls (2026-11-01 10:45:31)
> The releases of libcamera-apps and this package are not synced feature-
> wise. To use the newest release of libcamera-apps, version 1.14.0, we
> need to use a git tree newer than the current release 0.7.2 of libcamera.

I tagged and released libcamera-0.8.0 this morning.

Probably just as well to move to that. Can you check if the RPi apps
compile cleanly against it please ?

--
Kieran

> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> Cc: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Cc: Marcus Folkesson <marcus.folkesson@gmail.com>
> ---
>  package/libcamera/libcamera.hash | 2 +-
>  package/libcamera/libcamera.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash
> index d1d7576533..1caad4f40c 100644
> --- a/package/libcamera/libcamera.hash
> +++ b/package/libcamera/libcamera.hash
> @@ -1,5 +1,5 @@
>  # Locally computed
> -sha256  7c5728f6a51d717542cfdd2ff368ac78fa2e50e8a7360a38bb37952e9293e008  libcamera-v0.7.1-git4.tar.gz
> +sha256  58864d3ef4f14661187ce9871e2a2d38d6f0e89c76b6beff2f663021130359af  libcamera-v0.7.2-167-g8fe1f45140bace32677b1f7b9a17ae3b4fa85a59-git4.tar.gz
>  
>  # license files
>  sha256  fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c  LICENSES/BSD-2-Clause.txt
> diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk
> index 256909ebc8..03c31eabb8 100644
> --- a/package/libcamera/libcamera.mk
> +++ b/package/libcamera/libcamera.mk
> @@ -5,7 +5,7 @@
>  ################################################################################
>  
>  LIBCAMERA_SITE = https://gitlab.freedesktop.org/camera/libcamera.git
> -LIBCAMERA_VERSION = v0.7.1
> +LIBCAMERA_VERSION = v0.7.2-167-g8fe1f45140bace32677b1f7b9a17ae3b4fa85a59
>  LIBCAMERA_SITE_METHOD = git
>  LIBCAMERA_DEPENDENCIES = \
>         host-openssl \
> -- 
> 2.47.3
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/6] package/libcamera: bump version to v0.7.2-167-g8fe1f4514

[Bernd Kuhls]

Am 01.11.26 um 13:36 schrieb Kieran Bingham:
> Quoting Bernd Kuhls (2026-11-01 10:45:31)
>> The releases of libcamera-apps and this package are not synced feature-
>> wise. To use the newest release of libcamera-apps, version 1.14.0, we
>> need to use a git tree newer than the current release 0.7.2 of libcamera.
> 
> I tagged and released libcamera-0.8.0 this morning.
> 
> Probably just as well to move to that. Can you check if the RPi apps
> compile cleanly against it please ?
Hi Kieran,

no, libcamera-apps 1.14.0 (and git HEAD as well) is broken as expected 
after bisecting yesterday's git HEAD of libcamera. This was the last 
build error I found while testing from the youngest to older commits:

../core/options.cpp: In member function ‘bool 
OptsInternal::Parse(boost::program_options::variables_map&, RPiCamApp*)’:
../core/options.cpp:653:46: error: too many arguments to function 
‘std::optional<libcamera::Transform> libcamera::transformFromRotation(int)’

caused by
https://gitlab.freedesktop.org/camera/libcamera/-/commit/34911a1beb37fbdf00de748b4f17f4eda359d9fa

This commit is the reason I bumped libcamera to 
v0.7.2-167-g8fe1f45140bace32677b1f7b9a17ae3b4fa85a59 which is the commit 
right before that broken one.

But there is more:
https://gitlab.freedesktop.org/camera/libcamera/-/commit/974102049a41029ef2151931db1e24113ca5fe3f

also breaks libcamera-apps:

../core/options.cpp:668:52: error: ‘MeteringCentreWeighted’ is not a 
member of ‘libcamera::controls’; did you mean 
‘AeMeteringModeCentreWeighted’?

../core/options.cpp:669:56: error: ‘MeteringSpot’ is not a member of 
‘libcamera::controls’; did you mean ‘AfMeteringAuto’?

../core/options.cpp:670:59: error: ‘MeteringMatrix’ is not a member of 
‘libcamera::controls’; did you mean ‘AeMeteringModeMatrix’?

../core/options.cpp:671:58: error: ‘MeteringMatrix’ is not a member of 
‘libcamera::controls’; did you mean ‘AeMeteringModeMatrix’?

../core/options.cpp:672:58: error: ‘MeteringCustom’ is not a member of 
‘libcamera::controls’

and so on.

Please bear with me as I am not using these packages at all, just trying 
to get them build with ffmpeg 9.x which is possible with my current 
patch series. No open PRs are available for libcamera-apps.

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/6] package/libcamera: bump version to v0.7.2-167-g8fe1f4514

[Thomas Petazzoni via buildroot]

On Sun, Nov 01, 2026 at 11:45:31AM +0100, Bernd Kuhls wrote:
> The releases of libcamera-apps and this package are not synced feature-
> wise. To use the newest release of libcamera-apps, version 1.14.0, we
> need to use a git tree newer than the current release 0.7.2 of libcamera.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> Cc: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Cc: Marcus Folkesson <marcus.folkesson@gmail.com>

Applied to master, thanks!

Best regards,

Thomas Petazzoni
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 4/6] package/libcamera-apps: bump version to 1.14.0

[Bernd Kuhls]

This bump adds compatibility with ffmpeg 8.x while support for older
versions of ffmpeg was removed upstream:
https://github.com/raspberrypi/rpicam-apps/commit/cbe9921eeddd8e1c2e5798102f485baea5de3f65

Switched to tarball provided by upstream.

Rebased patch 0001.
Removed patches which are included in this release.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Cc: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 ...ecks-for-disable_rpi_features-option.patch |  9 ++--
 ...ore-Switch-libcamera-string-controls.patch | 46 ------------------
 ...ncoder-libav-Updates-for-ffmpeg-v7.1.patch | 48 -------------------
 ...oder-libav-fix-build-with-ffmpeg-7.0.patch | 37 --------------
 package/libcamera-apps/libcamera-apps.hash    |  3 +-
 package/libcamera-apps/libcamera-apps.mk      |  5 +-
 6 files changed, 10 insertions(+), 138 deletions(-)
 delete mode 100644 package/libcamera-apps/0002-core-Switch-libcamera-string-controls.patch
 delete mode 100644 package/libcamera-apps/0003-encoder-libav-Updates-for-ffmpeg-v7.1.patch
 delete mode 100644 package/libcamera-apps/0004-encoder-libav-fix-build-with-ffmpeg-7.0.patch

diff --git a/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch b/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch
index 1aba972d13..6c0469b249 100644
--- a/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch
+++ b/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch
@@ -20,8 +20,9 @@ Fixes:
   673 |                         controls_.set(controls::rpi::ScalerCrops, libcamera::Span<const Rectangle>(crops.data(), crops.size()));
       |                                                 ^~~
 
-Upstream: https://github.com/raspberrypi/rpicam-apps/pull/827
+Upstream: https://github.com/raspberrypi/rpicam-apps/pull/827 (rejected)
 
+[Bernd: rebased for 1.14.0]
 Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 ---
  core/rpicam_app.cpp | 2 ++
@@ -31,7 +32,7 @@ diff --git a/core/rpicam_app.cpp b/core/rpicam_app.cpp
 index bed69c0..1db784f 100644
 --- a/core/rpicam_app.cpp
 +++ b/core/rpicam_app.cpp
-@@ -637,6 +637,7 @@ void RPiCamApp::StartCamera()
+@@ -640,6 +640,7 @@ void RPiCamApp::StartCamera()
  	// This makes all the Request objects that we shall need.
  	makeRequests();
  
@@ -39,9 +40,9 @@ index bed69c0..1db784f 100644
  	// Build a list of initial controls that we must set in the camera before starting it.
  	// We don't overwrite anything the application may have set before calling us.
  	if (!controls_.get(controls::ScalerCrop) && !controls_.get(controls::rpi::ScalerCrops))
-@@ -672,6 +673,7 @@ void RPiCamApp::StartCamera()
+@@ -675,6 +676,7 @@ void RPiCamApp::StartCamera()
  		else
- 			controls_.set(controls::rpi::ScalerCrops, libcamera::Span<const Rectangle>(crops.data(), crops.size()));
+ 			controls_.set(controls::rpi::ScalerCrops, std::span<const Rectangle>(crops.data(), crops.size()));
  	}
 +#endif
  
diff --git a/package/libcamera-apps/0002-core-Switch-libcamera-string-controls.patch b/package/libcamera-apps/0002-core-Switch-libcamera-string-controls.patch
deleted file mode 100644
index fcebffe3da..0000000000
--- a/package/libcamera-apps/0002-core-Switch-libcamera-string-controls.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From f3011b5fae183a463630b4168626dfefe9b4c74e Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 16 Oct 2025 14:45:33 +0100
-Subject: [PATCH] core: Switch libcamera string controls to use
- std::string_view
-
-This is a change to the libcamera API, switch to std::string_view from
-std::string.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-Upstream: https://github.com/raspberrypi/rpicam-apps/commit/f3011b5fae183a463630b4168626dfefe9b4c74e
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- core/options.cpp    | 2 +-
- core/rpicam_app.cpp | 3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/core/options.cpp b/core/options.cpp
-index cf704c2a..d3296548 100644
---- a/core/options.cpp
-+++ b/core/options.cpp
-@@ -418,7 +418,7 @@ bool OptsInternal::Parse(boost::program_options::variables_map &vm, RPiCamApp *a
- 	std::vector<std::shared_ptr<libcamera::Camera>> cameras = app->GetCameras();
- 	if (camera < cameras.size())
- 	{
--		const std::string cam_id = *cameras[camera]->properties().get(libcamera::properties::Model);
-+		const std::string_view cam_id = *cameras[camera]->properties().get(libcamera::properties::Model);
- 
- 		if (cam_id.find("imx708") != std::string::npos)
- 		{
-diff --git a/core/rpicam_app.cpp b/core/rpicam_app.cpp
-index 9e5a2d0c..0f0b5ffa 100644
---- a/core/rpicam_app.cpp
-+++ b/core/rpicam_app.cpp
-@@ -128,8 +128,7 @@ std::string const &RPiCamApp::CameraId() const
- 
- std::string RPiCamApp::CameraModel() const
- {
--	auto model = camera_->properties().get(properties::Model);
--	return model ? *model : camera_->id();
-+	return std::string(camera_->properties().get(properties::Model).value_or(camera_->id()));
- }
- 
- void RPiCamApp::OpenCamera()
diff --git a/package/libcamera-apps/0003-encoder-libav-Updates-for-ffmpeg-v7.1.patch b/package/libcamera-apps/0003-encoder-libav-Updates-for-ffmpeg-v7.1.patch
deleted file mode 100644
index 3b92ac3592..0000000000
--- a/package/libcamera-apps/0003-encoder-libav-Updates-for-ffmpeg-v7.1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d67bc17a420b6c3519d4cfa24b4b4e5c7293165b Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 8 Oct 2025 10:51:46 +0100
-Subject: [PATCH] encoder: libav: Updates for ffmpeg v7.1
-
-Fix some API breakages change for ffmpeg v7.1 packaged with Trixie.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-Upstream: https://github.com/raspberrypi/rpicam-apps/commit/d67bc17a420b6c3519d4cfa24b4b4e5c7293165b
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- encoder/libav_encoder.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/encoder/libav_encoder.cpp b/encoder/libav_encoder.cpp
-index 10c00e0..ba8b9fe 100644
---- a/encoder/libav_encoder.cpp
-+++ b/encoder/libav_encoder.cpp
-@@ -337,13 +337,13 @@ void LibAvEncoder::initAudioOutCodec(VideoOptions const *options, StreamInfo con
- #if LIBAVCODEC_VERSION_MAJOR < 61
- 	codec_ctx_[AudioOut]->sample_fmt = codec->sample_fmts[0];
- #else
--	enum AVSampleFormat **sample_fmts = nullptr;
-+	const enum AVSampleFormat *sample_fmts = nullptr;
- 	avcodec_get_supported_config(codec_ctx_[AudioOut], codec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0,
- 								 (const void **)&sample_fmts, nullptr);
- 	if (!sample_fmts)
- 		throw std::runtime_error("libav: no supported sample formats for audio codec");
- 	else
--		codec_ctx_[AudioOut]->sample_fmt = (*sample_fmts)[0];
-+		codec_ctx_[AudioOut]->sample_fmt = sample_fmts[0];
- #endif
- 
- 	codec_ctx_[AudioOut]->bit_rate = options->Get().audio_bitrate.bps();
-@@ -652,7 +652,7 @@ void LibAvEncoder::audioThread()
- 	uint32_t out_channels = codec_ctx_[AudioOut]->ch_layout.nb_channels;
- #endif
- 
--	SwrContext *conv;
-+	SwrContext *conv = nullptr;
- 	AVAudioFifo *fifo;
- 
- #if LIBAVUTIL_VERSION_MAJOR < 57
--- 
-2.47.3
-
diff --git a/package/libcamera-apps/0004-encoder-libav-fix-build-with-ffmpeg-7.0.patch b/package/libcamera-apps/0004-encoder-libav-fix-build-with-ffmpeg-7.0.patch
deleted file mode 100644
index ae525b77d2..0000000000
--- a/package/libcamera-apps/0004-encoder-libav-fix-build-with-ffmpeg-7.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1a4860f36cffe167965351b7a59be46d7a7ae5ec Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd@kuhls.net>
-Date: Sat, 10 Oct 2026 23:58:02 +0200
-Subject: [PATCH] encoder: libav: fix build with ffmpeg 7.0
-
-Adjust the version check according to ffmpeg docs:
-
-https://code.ffmpeg.org/FFmpeg/FFmpeg/src/tag/n9.0.2/doc/APIchanges#L446
-"2024-09-08 - 3305767560a - lavc 61.13.100 - avcodec.h
-  Add avcodec_get_supported_config() and enum AVCodecConfig; deprecate
-  AVCodec.pix_fmts, AVCodec.sample_fmts, AVCodec.supported_framerates,
-  AVCodec.supported_samplerates and AVCodec.ch_layouts."
-
-Upstream: not applicable, support for older ffmpeg versions was removed:
-https://github.com/raspberrypi/rpicam-apps/commit/cbe9921eeddd8e1c2e5798102f485baea5de3f65
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- encoder/libav_encoder.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoder/libav_encoder.cpp b/encoder/libav_encoder.cpp
-index 31f5e55..8e24e7d 100644
---- a/encoder/libav_encoder.cpp
-+++ b/encoder/libav_encoder.cpp
-@@ -321,7 +321,7 @@ void LibAvEncoder::initAudioOutCodec(VideoOptions const *options, StreamInfo con
- 
- 	codec_ctx_[AudioOut]->sample_rate = options->Get().audio_samplerate ? options->Get().audio_samplerate
- 																  : stream_[AudioIn]->codecpar->sample_rate;
--#if LIBAVCODEC_VERSION_MAJOR < 61
-+#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 13, 100))
- 	codec_ctx_[AudioOut]->sample_fmt = codec->sample_fmts[0];
- #else
- 	const enum AVSampleFormat *sample_fmts = nullptr;
--- 
-2.47.3
-
diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash
index b11ea7fe67..615d033b1d 100644
--- a/package/libcamera-apps/libcamera-apps.hash
+++ b/package/libcamera-apps/libcamera-apps.hash
@@ -1,3 +1,4 @@
+# From https://github.com/raspberrypi/rpicam-apps/releases/tag/v1.14.0
+sha256  f0c2315515faa47be2eec4492f5ffe9409f1993b66f3b9bc79c2fc653155611d  rpicam-apps_1.14.0.orig.tar.xz
 # Locally computed
-sha256  b5535933ebc398616fd1b261fa9e3755dfb419e10ee7866078a8a8d99f54a59a  libcamera-apps-v1.7.0-10-ge9645231008146fa0e75c2b3e0ff8c48ad70511a.tar.gz
 sha256  36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a  license.txt
diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk
index df7be41496..af30ea2158 100644
--- a/package/libcamera-apps/libcamera-apps.mk
+++ b/package/libcamera-apps/libcamera-apps.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-LIBCAMERA_APPS_VERSION = v1.7.0-10-ge9645231008146fa0e75c2b3e0ff8c48ad70511a
-LIBCAMERA_APPS_SITE = $(call github,raspberrypi,rpicam-apps,$(LIBCAMERA_APPS_VERSION))
+LIBCAMERA_APPS_VERSION = 1.14.0
+LIBCAMERA_APPS_SITE = https://github.com/raspberrypi/rpicam-apps/releases/download/v$(LIBCAMERA_APPS_VERSION)
+LIBCAMERA_APPS_SOURCE =  rpicam-apps_$(LIBCAMERA_APPS_VERSION).orig.tar.xz
 LIBCAMERA_APPS_LICENSE = BSD-2-Clause
 LIBCAMERA_APPS_LICENSE_FILES = license.txt
 LIBCAMERA_APPS_DEPENDENCIES = \
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/6] package/libcamera-apps: bump version to 1.14.0

[Thomas Petazzoni via buildroot]

On Sun, Nov 01, 2026 at 11:45:32AM +0100, Bernd Kuhls wrote:
> This bump adds compatibility with ffmpeg 8.x while support for older
> versions of ffmpeg was removed upstream:
> https://github.com/raspberrypi/rpicam-apps/commit/cbe9921eeddd8e1c2e5798102f485baea5de3f65
> 
> Switched to tarball provided by upstream.
> 
> Rebased patch 0001.
> Removed patches which are included in this release.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> Cc: Marcus Folkesson <marcus.folkesson@gmail.com>

Applied, but question below.

> diff --git a/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch b/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch
> index 1aba972d13..6c0469b249 100644
> --- a/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch
> +++ b/package/libcamera-apps/0001-core-Update-checks-for-disable_rpi_features-option.patch
> @@ -20,8 +20,9 @@ Fixes:
>    673 |                         controls_.set(controls::rpi::ScalerCrops, libcamera::Span<const Rectangle>(crops.data(), crops.size()));
>        |                                                 ^~~
>  
> -Upstream: https://github.com/raspberrypi/rpicam-apps/pull/827
> +Upstream: https://github.com/raspberrypi/rpicam-apps/pull/827 (rejected)

If it was rejected, what's the plan?

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/6] package/libcamera-apps: bump version to 1.14.0

[Bernd Kuhls]

Am Sun, 1 Nov 2026 17:58:12 +0100 schrieb Thomas Petazzoni via buildroot:

>> +Upstream: https://github.com/raspberrypi/rpicam-apps/pull/827 (rejected)
> 
> If it was rejected, what's the plan?

Hi Thomas,

the package should be restricted to rbpi:
https://github.com/raspberrypi/rpicam-apps/pull/827#issuecomment-3018166853
"To be honest, I doubt rpicam-apps would work on any other platform."

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 5/6] package/opencv4: fix build with ffmpeg 9.x

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Woodrow Douglass <wdouglass@carnegierobotics.com>
---
 ...FFmpeg-after-AVCodec-pix_fmts-remova.patch | 58 ++++++++++++++
 ...se-avcodec_get_supported_config-for-.patch | 76 +++++++++++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 package/opencv4/0001-videoio-support-FFmpeg-after-AVCodec-pix_fmts-remova.patch
 create mode 100644 package/opencv4/0002-videoio-ffmpeg-use-avcodec_get_supported_config-for-.patch

diff --git a/package/opencv4/0001-videoio-support-FFmpeg-after-AVCodec-pix_fmts-remova.patch b/package/opencv4/0001-videoio-support-FFmpeg-after-AVCodec-pix_fmts-remova.patch
new file mode 100644
index 0000000000..fabb364441
--- /dev/null
+++ b/package/opencv4/0001-videoio-support-FFmpeg-after-AVCodec-pix_fmts-remova.patch
@@ -0,0 +1,58 @@
+From 700cd32ffd59ed3c6f6aec1919867653d8b125ea Mon Sep 17 00:00:00 2001
+From: Aadhu23 <aadhavansalthivel5@gmail.com>
+Date: Thu, 16 Jul 2026 09:21:37 +0000
+Subject: [PATCH] videoio: support FFmpeg after AVCodec::pix_fmts removal
+
+Upstream: https://github.com/opencv/opencv/commit/700cd32ffd59ed3c6f6aec1919867653d8b125ea
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ modules/videoio/src/cap_ffmpeg_hw.hpp | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/modules/videoio/src/cap_ffmpeg_hw.hpp b/modules/videoio/src/cap_ffmpeg_hw.hpp
+index 65045a2bc7..bb5e4c1088 100644
+--- a/modules/videoio/src/cap_ffmpeg_hw.hpp
++++ b/modules/videoio/src/cap_ffmpeg_hw.hpp
+@@ -757,6 +757,30 @@ AVCodec *hw_find_codec(AVCodecID id, AVHWDeviceType hw_type, int (*check_categor
+ #endif
+             if (hw_type == AV_HWDEVICE_TYPE_CUDA) // CUDA encoders don't support avcodec_get_hw_config()
+                 hw_native_fmt = AV_PIX_FMT_CUDA;
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 13, 100)
++            if (av_codec_is_encoder(c) && hw_native_fmt != AV_PIX_FMT_NONE) {
++                const AVPixelFormat *pix_fmts = NULL;
++                int num_pix_fmts = 0;
++
++                int ret = avcodec_get_supported_config(
++                    NULL,
++                    c,
++                    AV_CODEC_CONFIG_PIX_FORMAT,
++                    0,
++                    (const void **)&pix_fmts,
++                    &num_pix_fmts);
++
++            if (ret >= 0 && pix_fmts && num_pix_fmts > 0) {
++                    for (int i = 0; i < num_pix_fmts; i++) {
++                        if (pix_fmts[i] == hw_native_fmt) {
++                            *hw_pix_fmt = hw_native_fmt;
++                            if (hw_check_codec(c, hw_type, disabled_codecs))
++                                return c;
++                        }
++                    }
++                }
++            }
++#else
+             if (av_codec_is_encoder(c) && hw_native_fmt != AV_PIX_FMT_NONE && c->pix_fmts) {
+                 for (int i = 0; c->pix_fmts[i] != AV_PIX_FMT_NONE; i++) {
+                     if (c->pix_fmts[i] == hw_native_fmt) {
+@@ -766,6 +790,7 @@ AVCodec *hw_find_codec(AVCodecID id, AVHWDeviceType hw_type, int (*check_categor
+                     }
+                 }
+             }
++#endif
+             for (int i = 0;; i++) {
+                 const AVCodecHWConfig *hw_config = avcodec_get_hw_config(c, i);
+                 if (!hw_config)
+-- 
+2.47.3
+
diff --git a/package/opencv4/0002-videoio-ffmpeg-use-avcodec_get_supported_config-for-.patch b/package/opencv4/0002-videoio-ffmpeg-use-avcodec_get_supported_config-for-.patch
new file mode 100644
index 0000000000..e87876ae40
--- /dev/null
+++ b/package/opencv4/0002-videoio-ffmpeg-use-avcodec_get_supported_config-for-.patch
@@ -0,0 +1,76 @@
+From 83ed22ca2800267050a4a9a94afab605c990c0e0 Mon Sep 17 00:00:00 2001
+From: Arnesh Banerjee <linkrinku13@gmail.com>
+Date: Tue, 4 Aug 2026 19:49:11 +0530
+Subject: [PATCH] videoio(ffmpeg): use avcodec_get_supported_config for
+ framerates on FFmpeg 9
+
+AVCodec::supported_framerates was deprecated in FFmpeg 7.1 and removed in
+FFmpeg 9, so direct field access no longer builds against FFmpeg 9.
+
+Read the supported frame rate list through avcodec_get_supported_config()
+when building against libavcodec 61.13.100 or newer. That call returns the
+same list plus its entry count, so the loop iterates by count instead of the
+old sentinel terminator. Older FFmpeg keeps the previous field access.
+
+Upstream: https://github.com/opencv/opencv/commit/83ed22ca2800267050a4a9a94afab605c990c0e0
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ modules/videoio/src/cap_ffmpeg_impl.hpp | 34 +++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+
+diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp
+index a7fb1eda9a..d5b950392c 100644
+--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
++++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
+@@ -2627,6 +2627,39 @@ static AVCodecContext * icv_configure_video_stream_FFMPEG(AVFormatContext *oc,
+     c->time_base.den = frame_rate;
+     c->time_base.num = frame_rate_base;
+     /* adjust time base for supported framerates */
++    // AVCodec::supported_framerates was deprecated in FFmpeg 7.1 and removed in
++    // FFmpeg 9. avcodec_get_supported_config() returns the same list together
++    // with its entry count, so use it when available.
++#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(61, 13, 100)
++    const AVRational *supported_framerates = NULL;
++    int num_supported_framerates = 0;
++    if (codec)
++        avcodec_get_supported_config(NULL, codec, AV_CODEC_CONFIG_FRAME_RATE, 0,
++                                     (const void **)&supported_framerates, &num_supported_framerates);
++    if (supported_framerates && num_supported_framerates > 0){
++        AVRational req = {frame_rate, frame_rate_base};
++        const AVRational *best=NULL;
++        AVRational best_error= {INT_MAX, 1};
++        for(int i = 0; i < num_supported_framerates; i++){
++            const AVRational *p = &supported_framerates[i];
++            AVRational error= av_sub_q(req, *p);
++            if(error.num <0) error.num *= -1;
++            if(av_cmp_q(error, best_error) < 0){
++                best_error= error;
++                best= p;
++            }
++        }
++        if (best == NULL)
++        {
++#ifdef CV_FFMPEG_CODECPAR
++            avcodec_free_context(&c);
++#endif
++            return NULL;
++        }
++        c->time_base.den= best->num;
++        c->time_base.num= best->den;
++    }
++#else
+     if(codec && codec->supported_framerates){
+         const AVRational *p= codec->supported_framerates;
+         AVRational req = {frame_rate, frame_rate_base};
+@@ -2650,6 +2683,7 @@ static AVCodecContext * icv_configure_video_stream_FFMPEG(AVFormatContext *oc,
+         c->time_base.den= best->num;
+         c->time_base.num= best->den;
+     }
++#endif
+ 
+     c->gop_size = 12; /* emit one intra frame every twelve frames at most */
+     c->pix_fmt = pixel_format;
+-- 
+2.47.3
+
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 5/6] package/opencv4: fix build with ffmpeg 9.x

[Thomas Petazzoni via buildroot]

On Sun, Nov 01, 2026 at 11:45:33AM +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> Cc: Woodrow Douglass <wdouglass@carnegierobotics.com>

Applied to master, thanks!

Best regards,

Thomas Petazzoni
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 6/6] package/ffmpeg: bump version to 9.0.2

[Bernd Kuhls]

Updated license hashes due to upstream commits:
https://git.videolan.org/?p=ffmpeg.git;a=commit;h=8d439b24839d486d1fcc858a2a5eb7ecd700e3a9
https://git.videolan.org/?p=ffmpeg.git;a=commit;h=8c920c4c396163e3b9a0b428dd550d3c986236aa

Rebased patches and added Upstream: tags.

Added patch 0005 to fix a build error on armv5 which would be introduced
by this bump.

Removed omx-related configure options due to upstream commit
https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/f31675400b9956f178e8743e4f9038a6fc1211d8

Contrary to the commit description libpostproc was removed from ffmpeg
tree:
https://git.videolan.org/?p=ffmpeg.git;a=commit;h=8c920c4c396163e3b9a0b428dd550d3c986236aa
https://lists.ffmpeg.org/archives/list/ffmpeg-devel@ffmpeg.org/thread/YPPWZBQF42TJX2AQXWXDMHRRREAKQ7US/#6VMF7HDCEU45NJB5TYJEUKGRXVNQ7V6D

The libpostproc code was removed from upstream ffmpeg but is still
needed for hardware-based deinterlacing using vaapi in Kodi.
We re-add the optional libpostproc code by using the diff file created
by ffmpeg upstream maintainer and provided for download by Kodi.
Due to changes by the libpostproc patch we need to update the hash of
LICENSE.md. For details see
https://github.com/michaelni/libpostproc/blob/master/README.md

Added patch for tvheadend to fix build errors introduced by this bump.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Cc: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
---
Series passed Gitlab pipelines:
https://gitlab.com/bkuhls/buildroot/-/commits/e45ce7a0740abb18744fafe047d712a1c95c617c

Building a defconfig which packages using ffmpeg
https://gitlab.com/bkuhls/buildroot/-/commits/71d280cd54ed8291810af4f77126b29c32cadb23
failed due to "no space left on device":
https://gitlab.com/bkuhls/buildroot/-/pipelines/3013954649

 .checkpackageignore                           |  4 -
 ...-x86-yuv2rgb-Fix-build-without-SSSE3.patch | 24 ++---
 ...264-skip-decode-if-pic-has-no-slices.patch | 13 ++-
 .../0003-libavutil-Fix-mips-build.patch       | 17 ++--
 ...igure-add-extralibs-to-extralibs_xxx.patch |  6 +-
 .../0005-avutil-arm-fix-armv5-build.patch     | 47 +++++++++
 package/ffmpeg/ffmpeg.hash                    |  5 +-
 package/ffmpeg/ffmpeg.mk                      | 15 ++-
 ...se-the-new-lavc-supported-config-API.patch | 99 +++++++++++++++++++
 9 files changed, 191 insertions(+), 39 deletions(-)
 create mode 100644 package/ffmpeg/0005-avutil-arm-fix-armv5-build.patch
 create mode 100644 package/tvheadend/0002-transcoding-use-the-new-lavc-supported-config-API.patch

diff --git a/.checkpackageignore b/.checkpackageignore
index a8c1baacbd..25c668db54 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -319,10 +319,6 @@ package/fbterm/0003-C++11-compliance.patch lib_patch.Upstream
 package/fbterm/0004-iconv.patch lib_patch.Upstream
 package/fcgiwrap/0001-use-LIBS-from-configure.patch lib_patch.Upstream
 package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch lib_patch.Upstream
-package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch lib_patch.Upstream
-package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch lib_patch.Upstream
-package/ffmpeg/0003-libavutil-Fix-mips-build.patch lib_patch.Upstream
-package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch lib_patch.Upstream
 package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch lib_patch.Upstream
 package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch lib_patch.Upstream
 package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch lib_patch.Upstream
diff --git a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
index aa56e5a9b4..3c171c4ce7 100644
--- a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
+++ b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
@@ -7,11 +7,11 @@ commit fc6a5883d6af8cae0e96af84dda0ad74b360a084 breaks build on
 x86_64 CPUs which do not have SSSE3, e.g. AMD Phenom-II
 
 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-[bernd.kuhls@t-online.de:
-  - retrieved from upstream patchwork:
-    https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200223122256.23402-1-michael@niedermayer.cc/
-]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+Upstream: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200223122256.23402-1-michael@niedermayer.cc/
+
+[Bernd: rebased for 9.0]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 [yann.morin.1998@free.fr: fix reference top patchwork and SoB order]
 Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
 ---
@@ -19,25 +19,25 @@ Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
  1 file changed, 2 insertions(+)
 
 diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c
-index c12e88cbb5..4791e5b93a 100644
+index 2291c84e53..d4e23dce45 100644
 --- a/libswscale/x86/yuv2rgb.c
 +++ b/libswscale/x86/yuv2rgb.c
-@@ -70,6 +70,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
+@@ -243,6 +243,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsInternal *c)
  #if HAVE_X86ASM
      int cpu_flags = av_get_cpu_flags();
  
 +#if HAVE_SSSE3
      if (EXTERNAL_SSSE3(cpu_flags)) {
-         switch (c->dstFormat) {
+         switch (c->opts.dst_format) {
          case AV_PIX_FMT_RGB32:
-@@ -98,6 +99,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
-             return yuv420_rgb15_ssse3;
+@@ -275,6 +276,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsInternal *c)
+ #endif
          }
      }
 +#endif
  
-     if (EXTERNAL_MMXEXT(cpu_flags)) {
-         switch (c->dstFormat) {
+ #endif /* HAVE_X86ASM */
+     return NULL;
 -- 
 2.26.2
 
diff --git a/package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch b/package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch
index 2892df9d81..dfeb37b1e1 100644
--- a/package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch
+++ b/package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch
@@ -10,19 +10,19 @@ Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
 Downloaded from Kodi ffmpeg repo:
 https://github.com/xbmc/FFmpeg/commit/2c6b3f357331e203ad87214984661c40704aceb7
 
-Patch was sent upstream:
-http://ffmpeg.org/pipermail/ffmpeg-devel/2019-March/240863.html
+Upstream: http://ffmpeg.org/pipermail/ffmpeg-devel/2019-March/240863.html
 
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Bernd: rebased for 9.0]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 ---
  libavcodec/vaapi_h264.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
-index dd2a6571604..e521a05c4ff 100644
+index 7f00da09fc..01bbb42dbd 100644
 --- a/libavcodec/vaapi_h264.c
 +++ b/libavcodec/vaapi_h264.c
-@@ -314,6 +314,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
+@@ -323,6 +323,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
      H264SliceContext *sl = &h->slice_ctx[0];
      int ret;
  
@@ -34,3 +34,6 @@ index dd2a6571604..e521a05c4ff 100644
      ret = ff_vaapi_decode_issue(avctx, pic);
      if (ret < 0)
          goto finish;
+-- 
+2.47.3
+
diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
index aeb272c459..ce72514d67 100644
--- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
+++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
@@ -7,10 +7,9 @@ Check for sys/auxv.h because not all toolchains contain this header.
 
 Fixes https://trac.ffmpeg.org/ticket/9138
 
-Patch sent upstream:
-http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html
+Upstream: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html
 
-[Bernd: rebased for version 6.1.2]
+[Bernd: rebased for 9.0]
 Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 [Dario: make the patch to be applied with fuzz factor 0]
 Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
@@ -20,18 +19,18 @@ Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/configure b/configure
-index a89cfa6d959d..6ec00df75312 100755
+index 374bd5c151..fbb108506d 100755
 --- a/configure
 +++ b/configure
-@@ -2227,6 +2227,7 @@ HEADERS_LIST="
-     OpenGL_gl3_h
+@@ -2480,6 +2480,7 @@ HEADERS_LIST="
+     malloc_h
      poll_h
      pthread_np_h
 +    sys_auxv_h
+     sys_hwprobe_h
      sys_param_h
      sys_resource_h
-     sys_select_h
-@@ -6472,6 +6473,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa
+@@ -7088,6 +7089,7 @@ check_func_headers VideoToolbox/VideoToolbox.h VTPixelTransferSessionCreate -fra
  check_func_headers VideoToolbox/VideoToolbox.h VTPixelRotationSessionCreate -framework VideoToolbox
  check_headers windows.h
  check_headers asm/types.h
@@ -40,7 +39,7 @@ index a89cfa6d959d..6ec00df75312 100755
  # it seems there are versions of clang in some distros that try to use the
  # gcc headers, which explodes for stdatomic
 diff --git a/libavutil/mips/cpu.c b/libavutil/mips/cpu.c
-index 59619d54dee3..19196de50b59 100644
+index 2009c70f71..3e1d44c2ff 100644
 --- a/libavutil/mips/cpu.c
 +++ b/libavutil/mips/cpu.c
 @@ -19,7 +19,7 @@
diff --git a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch
index 050b34fd89..b6b49b2ca6 100644
--- a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch
+++ b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch
@@ -8,9 +8,9 @@ applications such as motion to retrieve ffmpeg dependencies such as
 -latomic through pkg-config
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: not upstreamable]
+Upstream: not upstreamable
+[Bernd: rebased for 9.0]
 Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
-[rebased for 6.0]
 ---
  configure | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
@@ -19,7 +19,7 @@ diff --git a/configure b/configure
 index 0bb3a7cf2b..3bda99e415 100755
 --- a/configure
 +++ b/configure
-@@ -7986,14 +7986,14 @@
+@@ -8993,14 +8993,14 @@
  source_path=${source_path}
  LIBPREF=${LIBPREF}
  LIBSUF=${LIBSUF}
diff --git a/package/ffmpeg/0005-avutil-arm-fix-armv5-build.patch b/package/ffmpeg/0005-avutil-arm-fix-armv5-build.patch
new file mode 100644
index 0000000000..5f0a6bc325
--- /dev/null
+++ b/package/ffmpeg/0005-avutil-arm-fix-armv5-build.patch
@@ -0,0 +1,47 @@
+From d79bcb8ff738af8d15021cbe746c23cc245e03d6 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Fri, 30 Oct 2026 08:52:16 +0100
+Subject: [PATCH] avutil/arm: fix armv5 build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/471db1d323aaed50ff922f0da76ecc8e45c4e817
+
+added armv6 optimizations and guarded the include with
+
+  #elif ARCH_ARM && HAVE_ARMV6
+
+but guarded the code only with
+
+  #elif ARCH_ARM
+
+causing a build error with armv5 toolchains:
+
+libavutil/pixelutils.c: In function ‘av_pixelutils_get_sad_fn’:
+libavutil/pixelutils.c:102:5: error: implicit declaration of function
+ ‘ff_pixelutils_sad_init_arm’ [-Wimplicit-function-declaration]
+
+Upstream: https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/6d1bfd760916ab52814b950692d1c1635d29f3c7
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ libavutil/pixelutils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavutil/pixelutils.c b/libavutil/pixelutils.c
+index 869af809eb..7631469163 100644
+--- a/libavutil/pixelutils.c
++++ b/libavutil/pixelutils.c
+@@ -30,7 +30,7 @@
+ 
+ #if ARCH_AARCH64 && HAVE_NEON
+ #include "aarch64/pixelutils.h"
+-#elif ARCH_ARM && HAVE_ARMV6
++#elif ARCH_ARM
+ #include "arm/pixelutils.h"
+ #elif ARCH_MIPS && HAVE_MSA
+ #include "mips/pixelutils.h"
+-- 
+2.47.3
+
diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash
index 481fddcf61..41bb586831 100644
--- a/package/ffmpeg/ffmpeg.hash
+++ b/package/ffmpeg/ffmpeg.hash
@@ -1,5 +1,6 @@
 # Locally calculated
-sha256  bbb18f3cc5c1c34b21cf176c0168c4d9aa97697542a97f60d491a58a814dea65  ffmpeg-7.0.3.tar.xz
+sha256  8c3850283eb25fa026482078a04051e0be17347b09ef81a0849bec15a96e002e  ffmpeg-9.0.2.tar.xz
+sha256  019ab331eac814e4995c65dcc8076cc433a64bb4a5d2aa6aef5516922dd691e6  001-ffmpeg-all-libpostproc-plugin.patch
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING.GPLv2
-sha256  b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe  COPYING.LGPLv2.1
+sha256  246041b6ecf9bc32d718a62c57877c78b5eb397b6467e74ed7ae2626ab189c30  COPYING.LGPLv2.1
 sha256  cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2  LICENSE.md
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 47cf560b16..82d404be8c 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FFMPEG_VERSION = 7.0.3
+FFMPEG_VERSION = 9.0.2
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
 FFMPEG_SITE = https://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES
@@ -16,6 +16,15 @@ FFMPEG_LICENSE += and GPL-2.0+
 FFMPEG_LICENSE_FILES += COPYING.GPLv2
 endif
 
+FFMPEG_EXTRA_DOWNLOADS = \
+	https://github.com/xbmc/xbmc/raw/refs/tags/22.0rc1-Piers/tools/depends/target/ffmpeg/001-ffmpeg-all-libpostproc-plugin.patch
+
+define FFMPEG_APPLY_POSTPROC_PATCH
+	cd $(@D) && \
+	patch -p1 -E -i $(FFMPEG_DL_DIR)/001-ffmpeg-all-libpostproc-plugin.patch
+endef
+FFMPEG_PRE_PATCH_HOOKS += FFMPEG_APPLY_POSTPROC_PATCH
+
 FFMPEG_CPE_ID_VENDOR = ffmpeg
 
 FFMPEG_CONF_OPTS = \
@@ -52,9 +61,7 @@ FFMPEG_CONF_OPTS = \
 	--disable-libvo-amrwbenc \
 	--disable-symver \
 	--disable-doc \
-	--disable-mmal \
-	--disable-omx \
-	--disable-omx-rpi
+	--disable-mmal
 
 FFMPEG_DEPENDENCIES += host-pkgconf
 
diff --git a/package/tvheadend/0002-transcoding-use-the-new-lavc-supported-config-API.patch b/package/tvheadend/0002-transcoding-use-the-new-lavc-supported-config-API.patch
new file mode 100644
index 0000000000..41e8c29e07
--- /dev/null
+++ b/package/tvheadend/0002-transcoding-use-the-new-lavc-supported-config-API.patch
@@ -0,0 +1,99 @@
+From 2f97e414ebb8469183066350e4d39cd52c38a01c Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Tue, 18 Aug 2026 13:55:27 +1000
+Subject: [PATCH] transcoding: use the new lavc supported-config API
+
+libavcodec 63 (FFmpeg 9.0) removed the AVCodec configuration arrays
+pix_fmts, sample_fmts, supported_samplerates and ch_layouts, so the
+codec profile defaults no longer compile:
+
+  src/transcoding/codec/codec.c:122:31: error: AVCodec has no member named pix_fmts
+  src/transcoding/codec/codec.c:134:34: error: AVCodec has no member named sample_fmts
+  src/transcoding/codec/codec.c:137:35: error: AVCodec has no member named supported_samplerates
+  src/transcoding/codec/codec.c:143:38: error: AVCodec has no member named ch_layouts
+
+avcodec_get_supported_config(), added in libavcodec 61.13.100 (FFmpeg
+7.1) when those fields were deprecated, is the replacement. It hands
+back the same arrays with the same config-specific terminators, or NULL
+when the codec accepts every value, so the callers that walk them are
+unchanged - including the supported_samplerates NULL case that falls
+back to default_sample_rates.
+
+Use it wherever it is available and keep the direct field access for
+older libavcodec.
+
+Upstream: https://github.com/tvheadend/tvheadend/pull/2224
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ src/transcoding/codec/codec.c | 34 +++++++++++++++++++++++++++++++++-
+ 1 file changed, 33 insertions(+), 1 deletion(-)
+
+diff --git a/src/transcoding/codec/codec.c b/src/transcoding/codec/codec.c
+index 6e5d1e3e7..2706df733 100644
+--- a/src/transcoding/codec/codec.c
++++ b/src/transcoding/codec/codec.c
+@@ -115,11 +115,30 @@ codec_get_title(const AVCodec *self)
+ 
+ /* TVHCodec ================================================================= */
+ 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 13, 100)
++static const void *
++tvh_codec_supported_config(const AVCodec *codec, enum AVCodecConfig config)
++{
++    const void *configs = NULL;
++
++    if (avcodec_get_supported_config(NULL, codec, config, 0, &configs, NULL)) {
++        return NULL;
++    }
++    return configs;
++}
++#endif
++
++
+ static void
+ tvh_codec_video_init(TVHVideoCodec *self, const AVCodec *codec)
+ {
+     if (!self->pix_fmts) {
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 13, 100)
++        self->pix_fmts =
++            tvh_codec_supported_config(codec, AV_CODEC_CONFIG_PIX_FORMAT);
++#else
+         self->pix_fmts = codec->pix_fmts;
++#endif
+     }
+ }
+ 
+@@ -131,15 +150,28 @@ tvh_codec_audio_init(TVHAudioCodec *self, const AVCodec *codec)
+     };
+ 
+     if (!self->sample_fmts) {
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 13, 100)
++        self->sample_fmts =
++            tvh_codec_supported_config(codec, AV_CODEC_CONFIG_SAMPLE_FORMAT);
++#else
+         self->sample_fmts = codec->sample_fmts;
++#endif
+     }
+     if (!self->sample_rates) {
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 13, 100)
++        self->sample_rates =
++            tvh_codec_supported_config(codec, AV_CODEC_CONFIG_SAMPLE_RATE);
++#else
+         self->sample_rates = codec->supported_samplerates;
++#endif
+         if (!self->sample_rates)
+             self->sample_rates = default_sample_rates;
+     }
+     if (!self->channel_layouts) {
+-#if LIBAVCODEC_VERSION_MAJOR > 59
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 13, 100)
++        self->channel_layouts =
++            tvh_codec_supported_config(codec, AV_CODEC_CONFIG_CHANNEL_LAYOUT);
++#elif LIBAVCODEC_VERSION_MAJOR > 59
+         self->channel_layouts = codec->ch_layouts;
+ #else
+         self->channel_layouts = codec->channel_layouts;
+-- 
+2.47.3
+
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 6/6] package/ffmpeg: bump version to 9.0.2

[Thomas Petazzoni via buildroot]

Hello Bernd,

Thanks for working on this. A number of questions below.

On Sun, Nov 01, 2026 at 11:45:34AM +0100, Bernd Kuhls wrote:
> diff --git a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
> index aa56e5a9b4..3c171c4ce7 100644
> --- a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
> +++ b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
> @@ -7,11 +7,11 @@ commit fc6a5883d6af8cae0e96af84dda0ad74b360a084 breaks build on
>  x86_64 CPUs which do not have SSSE3, e.g. AMD Phenom-II
>  
>  Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> -[bernd.kuhls@t-online.de:
> -  - retrieved from upstream patchwork:
> -    https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200223122256.23402-1-michael@niedermayer.cc/
> -]
> -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +
> +Upstream: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200223122256.23402-1-michael@niedermayer.cc/

This was submitted in 2020.. but apparently not merged, what's the plan?

> diff --git a/package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch b/package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch
> index 2892df9d81..dfeb37b1e1 100644
> --- a/package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch
> +++ b/package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-slices.patch
> @@ -10,19 +10,19 @@ Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704
>  Downloaded from Kodi ffmpeg repo:
>  https://github.com/xbmc/FFmpeg/commit/2c6b3f357331e203ad87214984661c40704aceb7
>  
> -Patch was sent upstream:
> -http://ffmpeg.org/pipermail/ffmpeg-devel/2019-March/240863.html
> +Upstream: http://ffmpeg.org/pipermail/ffmpeg-devel/2019-March/240863.html

Same question: submitted in 2019, not merged.

> diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
> index aeb272c459..ce72514d67 100644
> --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
> +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
> @@ -7,10 +7,9 @@ Check for sys/auxv.h because not all toolchains contain this header.
>  
>  Fixes https://trac.ffmpeg.org/ticket/9138
>  
> -Patch sent upstream:
> -http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html
> +Upstream: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html

Same question :)

> diff --git a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch
> index 050b34fd89..b6b49b2ca6 100644
> --- a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch
> +++ b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch
> @@ -8,9 +8,9 @@ applications such as motion to retrieve ffmpeg dependencies such as
>  -latomic through pkg-config
>  
>  Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status: not upstreamable]
> +Upstream: not upstreamable

So why do we have it?

> diff --git a/package/ffmpeg/0005-avutil-arm-fix-armv5-build.patch b/package/ffmpeg/0005-avutil-arm-fix-armv5-build.patch
> new file mode 100644
> index 0000000000..5f0a6bc325
> --- /dev/null
> +++ b/package/ffmpeg/0005-avutil-arm-fix-armv5-build.patch
> @@ -0,0 +1,47 @@
> +From d79bcb8ff738af8d15021cbe746c23cc245e03d6 Mon Sep 17 00:00:00 2001
> +From: Bernd Kuhls <bernd@kuhls.net>
> +Date: Fri, 30 Oct 2026 08:52:16 +0100
> +Subject: [PATCH] avutil/arm: fix armv5 build
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/471db1d323aaed50ff922f0da76ecc8e45c4e817
> +
> +added armv6 optimizations and guarded the include with

If these are ARMv6 optimizations... why are you enabling them on ARMv5?

> +FFMPEG_EXTRA_DOWNLOADS = \
> +	https://github.com/xbmc/xbmc/raw/refs/tags/22.0rc1-Piers/tools/depends/target/ffmpeg/001-ffmpeg-all-libpostproc-plugin.patch
> +

This is a huge patch to re-add libpostproc. What's the plan
mid/long-term ?

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 6/6] package/ffmpeg: bump version to 9.0.2

[Bernd Kuhls]

Hi Thomas,

Am Sun, 1 Nov 2026 18:00:30 +0100 schrieb Thomas Petazzoni via buildroot:

>> --- a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-
SSSE3.patch
> This was submitted in 2020.. but apparently not merged, what's the plan?

Wait for upstream to commit the patch.

It still is in state "New" along with ~30000 other patches
https://patchwork.ffmpeg.org/project/ffmpeg/list/?state=1
and I would feel bad being the guy asking for an ETA ;)

>> +++ b/package/ffmpeg/0002-avcodec-vaapi_h264-skip-decode-if-pic-has-no-
slices.patch
> Same question: submitted in 2019, not merged.

Same answer ;)

>> +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
> Same question :)

Same answer ;)

>> +++ b/package/ffmpeg/0004-configure-add-extralibs-to-
extralibs_xxx.patch
> So why do we have it?

Added by buildroot commit f30bd1eb69c44793485e9f013249d020e3e19fc3 to "add 
-latomic to pkg-config files". A patch addressing the same problem was 
committed to ffmpeg 5.1 several months later: https://code.ffmpeg.org/
FFmpeg/FFmpeg/commit/2f0a214a6202516b4dda2bb22b6b3ac20e465d6d

I will check whether we still need patch 0004.

>> +++ b/package/ffmpeg/0005-avutil-arm-fix-armv5-build.patch
> If these are ARMv6 optimizations... why are you enabling them on ARMv5?

Upstream asked me to do that:
https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25624#issuecomment-78683

>> +FFMPEG_EXTRA_DOWNLOADS = \
>> +	https://github.com/xbmc/xbmc/raw/refs/tags/22.0rc1-Piers/tools/
depends/target/ffmpeg/001-ffmpeg-all-libpostproc-plugin.patch
> This is a huge patch to re-add libpostproc. What's the plan
> mid/long-term ?

Use it forever... FFmpeg decided to remove libpostproc and created a 
plugin mechanism so it can still be used:
https://github.com/xbmc/xbmc/commit/
587f3a6e936d487552d002bd63a0e4ff74bee433

LibreELEC carries the patch as well:
https://github.com/LibreELEC/LibreELEC.tv/tree/master/packages/multimedia/
ffmpeg/patches/postproc

Kodi needs it for vaapi-based hardware deinterlacing
https://github.com/xbmc/xbmc/pull/5253#issuecomment-53122885
applied to content like many 1080i DVB-S channels.

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/6] package/freeswitch: fix build with ffmpeg 8.x

[Thomas Petazzoni via buildroot]

On Sun, Nov 01, 2026 at 11:45:29AM +0100, Bernd Kuhls wrote:
> Replaced patch 0002 with new upstream commit.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to master, thanks!

Best regards,

Thomas Petazzoni
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/6] package/libcamera-apps: bump version to 1.14.0

[Thomas Petazzoni via buildroot]

On Sun, Nov 01, 2026 at 06:38:11PM +0100, Bernd Kuhls wrote:

> the package should be restricted to rbpi:
> https://github.com/raspberrypi/rpicam-apps/pull/827#issuecomment-3018166853
> "To be honest, I doubt rpicam-apps would work on any other platform."

Well, then our libcamera-apps package should select in libcamera the
RPi support to make sure it is enabled?

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot