[Buildroot] [PATCH] package/ffmpeg: fix gcc 14.x compile issue

[Buildroot] [PATCH] package/ffmpeg: fix gcc 14.x compile issue

[Waldemar Brodkorb]

Fixes:
 - http://autobuild.buildroot.net/results/a04/a040cbc991da14c68302062ce96121b1e55c690e

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 ...ay-dvd-Use-correct-pointer-types-on-.patch | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch

diff --git a/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch b/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch
new file mode 100644
index 0000000000..a77a0cf5ec
--- /dev/null
+++ b/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch
@@ -0,0 +1,52 @@
+From 347a70f101be28f8d78e8fd62ffc3a78324f49e9 Mon Sep 17 00:00:00 2001
+From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
+Date: Thu, 28 Mar 2024 05:35:36 +0100
+Subject: [PATCH] avcodec/pcm-bluray/dvd: Use correct pointer types on BE
+
+Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+Upstream: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/347a70f101be28f8d78e8fd62ffc3a78324f49e9
+---
+ libavcodec/pcm-bluray.c | 5 +++--
+ libavcodec/pcm-dvd.c    | 2 +-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c
+index f65609514a..235020d78f 100644
+--- a/libavcodec/pcm-bluray.c
++++ b/libavcodec/pcm-bluray.c
+@@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame,
+             samples *= num_source_channels;
+             if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ #if HAVE_BIGENDIAN
+-                bytestream2_get_buffer(&gb, dst16, buf_size);
++                bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size);
+ #else
+                 do {
+                     *dst16++ = bytestream2_get_be16u(&gb);
+@@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame,
+             if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+                 do {
+ #if HAVE_BIGENDIAN
+-                    bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2);
++                    bytestream2_get_buffer(&gb, (uint8_t*)dst16,
++                                           avctx->ch_layout.nb_channels * 2);
+                     dst16 += avctx->ch_layout.nb_channels;
+ #else
+                     channel = avctx->ch_layout.nb_channels;
+diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c
+index 419b2a138f..319746c62e 100644
+--- a/libavcodec/pcm-dvd.c
++++ b/libavcodec/pcm-dvd.c
+@@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src,
+     switch (avctx->bits_per_coded_sample) {
+     case 16: {
+ #if HAVE_BIGENDIAN
+-        bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
++        bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size);
+         dst16 += blocks * s->block_size / 2;
+ #else
+         int samples = blocks * avctx->ch_layout.nb_channels;
+-- 
+2.39.2
+
-- 
2.39.2

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

Re: [Buildroot] [PATCH] package/ffmpeg: fix gcc 14.x compile issue

[Thomas Petazzoni via buildroot]

On Fri, 9 Aug 2024 14:12:08 +0200
Waldemar Brodkorb <wbx@openadk.org> wrote:

> Fixes:
>  - http://autobuild.buildroot.net/results/a04/a040cbc991da14c68302062ce96121b1e55c690e
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  ...ay-dvd-Use-correct-pointer-types-on-.patch | 52 +++++++++++++++++++
>  1 file changed, 52 insertions(+)
>  create mode 100644 package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch

Applied to master, thanks.

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

Re: [Buildroot] [PATCH] package/ffmpeg: fix gcc 14.x compile issue

[Lance Fredrickson]

It looks like in ffmpeg 6.1.2 they introduced a change in commit 
9e674b31606c805dd31b4bb754364a72a5877238 that tries to detect musl with 
macro "__musl__", which for those not familiar with musl,  does not and 
will never exist.  This is still present in master, so presumably  in 
the latest 7.0 release as well. I submitted the following bug report to 
them.
https://ffmpeg.org/pipermail/ffmpeg-devel/2024-August/332225.html

The error looks like
libavdevice/v4l2.c:137:17: error: assignment to ‘int (*)(int,  long 
unsigned int, ...)’ from incompatible pointer type ‘int (*)(int, int, 
...)’ [-Wincompatible-pointer-types]
   137 |     s->ioctl_f  = prefix ## ioctl;      \

So I believe anyone using musl will encounter this build error.

thanks,
Lance Fredrickson

On 8/9/2024 6:12 AM, Waldemar Brodkorb wrote:
> Fixes:
>   - http://autobuild.buildroot.net/results/a04/a040cbc991da14c68302062ce96121b1e55c690e
>
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
>   ...ay-dvd-Use-correct-pointer-types-on-.patch | 52 +++++++++++++++++++
>   1 file changed, 52 insertions(+)
>   create mode 100644 package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch
>
> diff --git a/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch b/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch
> new file mode 100644
> index 0000000000..a77a0cf5ec
> --- /dev/null
> +++ b/package/ffmpeg/0006-avcodec-pcm-bluray-dvd-Use-correct-pointer-types-on-.patch
> @@ -0,0 +1,52 @@
> +From 347a70f101be28f8d78e8fd62ffc3a78324f49e9 Mon Sep 17 00:00:00 2001
> +From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> +Date: Thu, 28 Mar 2024 05:35:36 +0100
> +Subject: [PATCH] avcodec/pcm-bluray/dvd: Use correct pointer types on BE
> +
> +Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> +Upstream: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/347a70f101be28f8d78e8fd62ffc3a78324f49e9
> +---
> + libavcodec/pcm-bluray.c | 5 +++--
> + libavcodec/pcm-dvd.c    | 2 +-
> + 2 files changed, 4 insertions(+), 3 deletions(-)
> +
> +diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c
> +index f65609514a..235020d78f 100644
> +--- a/libavcodec/pcm-bluray.c
> ++++ b/libavcodec/pcm-bluray.c
> +@@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame,
> +             samples *= num_source_channels;
> +             if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
> + #if HAVE_BIGENDIAN
> +-                bytestream2_get_buffer(&gb, dst16, buf_size);
> ++                bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size);
> + #else
> +                 do {
> +                     *dst16++ = bytestream2_get_be16u(&gb);
> +@@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame,
> +             if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
> +                 do {
> + #if HAVE_BIGENDIAN
> +-                    bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2);
> ++                    bytestream2_get_buffer(&gb, (uint8_t*)dst16,
> ++                                           avctx->ch_layout.nb_channels * 2);
> +                     dst16 += avctx->ch_layout.nb_channels;
> + #else
> +                     channel = avctx->ch_layout.nb_channels;
> +diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c
> +index 419b2a138f..319746c62e 100644
> +--- a/libavcodec/pcm-dvd.c
> ++++ b/libavcodec/pcm-dvd.c
> +@@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src,
> +     switch (avctx->bits_per_coded_sample) {
> +     case 16: {
> + #if HAVE_BIGENDIAN
> +-        bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
> ++        bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size);
> +         dst16 += blocks * s->block_size / 2;
> + #else
> +         int samples = blocks * avctx->ch_layout.nb_channels;
> +--
> +2.39.2
> +

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

Re: [Buildroot] [PATCH] package/ffmpeg: fix gcc 14.x compile issue

[Peter Korsgaard]

>>>>> "Waldemar" == Waldemar Brodkorb <wbx@openadk.org> writes:

 > Fixes:
 >  - http://autobuild.buildroot.net/results/a04/a040cbc991da14c68302062ce96121b1e55c690e

 > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

Committed to 2024.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot