ffmpeg: Update to 7.0.2

6 files changed, 52 insertions, 58 deletions

diff --git a/pkg/ffmpeg/patch/0002-libavcodec-Prevent-stray-semicolon-at-top-level.patch b/pkg/ffmpeg/patch/0002-libavcodec-Prevent-stray-semicolon-at-top-level.patch
index cba90626..a88b1a1a 100644
--- a/pkg/ffmpeg/patch/0002-libavcodec-Prevent-stray-semicolon-at-top-level.patch
+++ b/pkg/ffmpeg/patch/0002-libavcodec-Prevent-stray-semicolon-at-top-level.patch
@@ -1,4 +1,4 @@
-From e556055b4cfae9c170092f426b450630fa126b37 Mon Sep 17 00:00:00 2001
+From cda1b59c7ed7bb7dc5951552f33b214fe4e64f05 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 7 Sep 2021 01:41:48 -0700
 Subject: [PATCH] libavcodec: Prevent stray semicolon at top-level
@@ -13,10 +13,10 @@ is no problem if it expands to an empty token sequence.
  1 file changed, 36 insertions(+), 36 deletions(-)
 
 diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
-index 23955ba2dd..295ee4e986 100644
+index 4abca7cc07..3b6ca83d55 100644
 --- a/libavcodec/pcm.c
 +++ b/libavcodec/pcm.c
-@@ -559,7 +559,7 @@ const FFCodec ff_ ## name_ ## _encoder = {                                  \
+@@ -558,7 +558,7 @@ const FFCodec ff_ ## name_ ## _encoder = {                                  \
      FF_CODEC_ENCODE_CB(pcm_encode_frame),                                   \
      .p.sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_,             \
                                                     AV_SAMPLE_FMT_NONE },    \
@@ -25,8 +25,8 @@ index 23955ba2dd..295ee4e986 100644
  
  #define PCM_ENCODER_2(cf, id, sample_fmt, name, long_name)                  \
      PCM_ENCODER_ ## cf(id, sample_fmt, name, long_name)
-@@ -581,7 +581,7 @@ const FFCodec ff_ ## name_ ## _decoder = {                                  \
-     .p.capabilities = AV_CODEC_CAP_DR1,                                     \
+@@ -580,7 +580,7 @@ const FFCodec ff_ ## name_ ## _decoder = {                                  \
+     .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE,         \
      .p.sample_fmts  = (const enum AVSampleFormat[]){ sample_fmt_,           \
                                                       AV_SAMPLE_FMT_NONE },  \
 -}
@@ -34,7 +34,7 @@ index 23955ba2dd..295ee4e986 100644
  
  #define PCM_DECODER_2(cf, id, sample_fmt, name, long_name)                  \
      PCM_DECODER_ ## cf(id, sample_fmt, name, long_name)
-@@ -591,40 +591,40 @@ const FFCodec ff_ ## name_ ## _decoder = {                                  \
+@@ -590,40 +590,40 @@ const FFCodec ff_ ## name_ ## _decoder = {                                  \
      PCM_DECODER_3(CONFIG_ ## id ## _DECODER, id, sample_fmt, name, long_name)
  
  #define PCM_CODEC(id, sample_fmt_, name, long_name_)                    \
@@ -110,5 +110,5 @@ index 23955ba2dd..295ee4e986 100644
 +PCM_CODEC  (PCM_VIDC,         AV_SAMPLE_FMT_S16, pcm_vidc,         "PCM Archimedes VIDC")
 +PCM_DECODER(PCM_SGA,          AV_SAMPLE_FMT_U8,  pcm_sga,          "PCM SGA")
 -- 
-2.37.3
+2.44.0
 
diff --git a/pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch b/pkg/ffmpeg/patch/0003-libavcodec-Use-if-to-prevent-some-unintended-depende.patch
index 62bdc96f..62bdc96f 100644
--- a/pkg/ffmpeg/patch/0004-libavcodec-Use-if-to-prevent-some-unintended-depende.patch
+++ b/pkg/ffmpeg/patch/0003-libavcodec-Use-if-to-prevent-some-unintended-depende.patch
diff --git a/pkg/ffmpeg/patch/0003-libavformat-Use-C99-__func__-instead-of-non-standard.patch b/pkg/ffmpeg/patch/0003-libavformat-Use-C99-__func__-instead-of-non-standard.patch
deleted file mode 100644
index ceb489ac..00000000
--- a/pkg/ffmpeg/patch/0003-libavformat-Use-C99-__func__-instead-of-non-standard.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8979dddfb4ecd1e8570d181f34781146e543cfe2 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 7 Sep 2021 01:43:25 -0700
-Subject: [PATCH] libavformat: Use C99 __func__ instead of non-standard
- __FUNCTION__
-
----
- libavformat/mux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavformat/mux.c b/libavformat/mux.c
-index 04de05ec17..3510b56b0b 100644
---- a/libavformat/mux.c
-+++ b/libavformat/mux.c
-@@ -1114,7 +1114,7 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt,
-     int ret;
- 
-     if (s->debug & FF_FDEBUG_TS)
--        av_log(s, AV_LOG_DEBUG, "%s size:%d dts:%s pts:%s\n", __FUNCTION__,
-+        av_log(s, AV_LOG_DEBUG, "%s size:%d dts:%s pts:%s\n", __func__,
-                pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts));
- 
-     guess_pkt_duration(s, st, pkt);
--- 
-2.37.3
-
diff --git a/pkg/ffmpeg/patch/0005-libavutil-Use-config-instead-of-compiler-to-determin.patch b/pkg/ffmpeg/patch/0004-libavutil-Use-config-instead-of-compiler-to-determin.patch
index bf67e4d9..5bf088ee 100644
--- a/pkg/ffmpeg/patch/0005-libavutil-Use-config-instead-of-compiler-to-determin.patch
+++ b/pkg/ffmpeg/patch/0004-libavutil-Use-config-instead-of-compiler-to-determin.patch
@@ -1,15 +1,15 @@
-From a071cbecc751b78c4d0ff89356e4c0fca16d266d Mon Sep 17 00:00:00 2001
+From c2589a507009d717c3889cd7c7c3803c79a67a67 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 7 Sep 2021 01:46:57 -0700
 Subject: [PATCH] libavutil: Use config instead of compiler to determine
  support for inline asm
 
 ---
- libavutil/x86/intreadwrite.h | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ libavutil/x86/intreadwrite.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/libavutil/x86/intreadwrite.h b/libavutil/x86/intreadwrite.h
-index 40f375b013..c45e8439e0 100644
+index 5e57d6a8cd..38ced9a7ce 100644
 --- a/libavutil/x86/intreadwrite.h
 +++ b/libavutil/x86/intreadwrite.h
 @@ -25,9 +25,9 @@
@@ -19,24 +19,12 @@ index 40f375b013..c45e8439e0 100644
 -#if HAVE_MMX
 +#if HAVE_MMX_INLINE
  
--#if !HAVE_FAST_64BIT && defined(__MMX__)
-+#if !HAVE_FAST_64BIT
- 
- #define FF_COPY_SWAP_ZERO_USES_MMX
- 
-@@ -61,9 +61,9 @@ static av_always_inline void AV_ZERO64(void *d)
-             :: "mm0");
- }
- 
--#endif /* !HAVE_FAST_64BIT && defined(__MMX__) */
-+#endif /* !HAVE_FAST_64BIT */
- 
 -#ifdef __SSE__
 +#if HAVE_SSE_INLINE
  
  #define AV_COPY128 AV_COPY128
  static av_always_inline void AV_COPY128(void *d, const void *s)
-@@ -79,7 +79,7 @@ static av_always_inline void AV_COPY128(void *d, const void *s)
+@@ -43,7 +43,7 @@ static av_always_inline void AV_COPY128(void *d, const void *s)
  
  #endif /* __SSE__ */
  
@@ -45,7 +33,7 @@ index 40f375b013..c45e8439e0 100644
  
  #define AV_ZERO128 AV_ZERO128
  static av_always_inline void AV_ZERO128(void *d)
-@@ -92,8 +92,8 @@ static av_always_inline void AV_ZERO128(void *d)
+@@ -56,8 +56,8 @@ static av_always_inline void AV_ZERO128(void *d)
              :: "xmm0");
  }
  
@@ -57,5 +45,5 @@ index 40f375b013..c45e8439e0 100644
  
  #endif /* AVUTIL_X86_INTREADWRITE_H */
 -- 
-2.37.3
+2.44.0
 
diff --git a/pkg/ffmpeg/patch/0006-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch b/pkg/ffmpeg/patch/0005-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch
index 2002613a..9149bcc0 100644
--- a/pkg/ffmpeg/patch/0006-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch
+++ b/pkg/ffmpeg/patch/0005-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch
@@ -1,4 +1,4 @@
-From 788b21499ade6f5f03a4c79f7a8a82e9af873af4 Mon Sep 17 00:00:00 2001
+From 4e0c099e66f1e3216b2498eb9c87c12c9034d6a2 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 25 Oct 2021 17:08:29 -0700
 Subject: [PATCH] libavutil: Use C11 _Alignas as fallback for DECLARE_ALIGNED
@@ -8,11 +8,11 @@ Subject: [PATCH] libavutil: Use C11 _Alignas as fallback for DECLARE_ALIGNED
  1 file changed, 4 insertions(+)
 
 diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h
-index 2448c606f1..dd037fd3b5 100644
+index 20f9b3e3f2..a73dfd581b 100644
 --- a/libavutil/mem_internal.h
 +++ b/libavutil/mem_internal.h
-@@ -91,6 +91,10 @@
-     #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
+@@ -89,6 +89,10 @@
+     #define DECLARE_ALIGNED_T(n,t,v)    __declspec(align(n)) t v
      #define DECLARE_ASM_ALIGNED(n,t,v)  __declspec(align(n)) t v
      #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
 +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
@@ -20,8 +20,8 @@ index 2448c606f1..dd037fd3b5 100644
 +    #define DECLARE_ASM_ALIGNED(n,t,v)  _Alignas(n) t v
 +    #define DECLARE_ASM_CONST(n,t,v)    static const _Alignas(n) t v
  #else
-     #define DECLARE_ALIGNED(n,t,v)      t v
+     #define DECLARE_ALIGNED_T(n,t,v)    t v
      #define DECLARE_ASM_ALIGNED(n,t,v)  t v
 -- 
-2.37.3
+2.44.0
 
diff --git a/pkg/ffmpeg/patch/0006-Revert-lavd-v4l2-Use-proper-field-type-for-second-pa.patch b/pkg/ffmpeg/patch/0006-Revert-lavd-v4l2-Use-proper-field-type-for-second-pa.patch
new file mode 100644
index 00000000..71f286b9
--- /dev/null
+++ b/pkg/ffmpeg/patch/0006-Revert-lavd-v4l2-Use-proper-field-type-for-second-pa.patch
@@ -0,0 +1,32 @@
+From 79f1d1f2e080eb37540083381194751b15d50976 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Wed, 14 Aug 2024 17:15:05 -0700
+Subject: [PATCH] Revert "lavd/v4l2: Use proper field type for second parameter
+ of ioctl() with BSD's"
+
+This reverts commit 6ab65792ab8e522f5a8a9f432ca11900f35a9d94.
+---
+ libavdevice/v4l2.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
+index 50ac47ec5a..51291246b3 100644
+--- a/libavdevice/v4l2.c
++++ b/libavdevice/v4l2.c
+@@ -107,10 +107,10 @@ struct video_data {
+     int (*open_f)(const char *file, int oflag, ...);
+     int (*close_f)(int fd);
+     int (*dup_f)(int fd);
+-#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
+-    int (*ioctl_f)(int fd, int request, ...);
+-#else
++#ifdef __GLIBC__
+     int (*ioctl_f)(int fd, unsigned long int request, ...);
++#else
++    int (*ioctl_f)(int fd, int request, ...);
+ #endif
+     ssize_t (*read_f)(int fd, void *buffer, size_t n);
+     void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);
+-- 
+2.44.0
+