From 4cf3cb81cc1565ec4c8b694265f0b12b8dd81a0ec105d21d2a48fdb22083b402 Mon Sep 17 00:00:00 2001
From: Filip Kastl <fkastl@suse.cz>
Date: Fri, 26 Jul 2024 15:20:13 +0200
Subject: [PATCH] Add ffmpeg-c99.patch

- Add ffmpeg-c99.patch so that the package conforms to the C99
  standard and builds on i586 with GCC 14.
---
 ffmpeg-4.changes |  6 ++++++
 ffmpeg-4.spec    |  1 +
 ffmpeg-c99.patch | 26 ++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 ffmpeg-c99.patch

diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes
index 814e821..89fb6f3 100644
--- a/ffmpeg-4.changes
+++ b/ffmpeg-4.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 26 13:19:42 UTC 2024 - Filip Kastl <filip.kastl@suse.com>
+
+- Add ffmpeg-c99.patch so that the package conforms to the C99
+  standard and builds on i586 with GCC 14.
+
 -------------------------------------------------------------------
 Tue Apr 27 11:38:35 UTC 2024 - Cliff Zhao <qzhao@suse.com>
 
diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec
index 4d4cb05..a9af490 100644
--- a/ffmpeg-4.spec
+++ b/ffmpeg-4.spec
@@ -131,6 +131,7 @@ Patch17:        ffmpeg-CVE-2023-49502.patch
 Patch18:        ffmpeg-CVE-2023-51793.patch
 Patch19:        0001-avfilter-af_stereowiden-Check-length.patch
 Patch20:        ffmpeg-CVE-2023-50010.patch
+Patch21:        ffmpeg-c99.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel
diff --git a/ffmpeg-c99.patch b/ffmpeg-c99.patch
new file mode 100644
index 0000000..cfecbd2
--- /dev/null
+++ b/ffmpeg-c99.patch
@@ -0,0 +1,26 @@
+Index: ffmpeg-4.4.4/libavutil/hwcontext_vaapi.c
+===================================================================
+--- ffmpeg-4.4.4.orig/libavutil/hwcontext_vaapi.c
++++ ffmpeg-4.4.4/libavutil/hwcontext_vaapi.c
+@@ -1032,7 +1032,7 @@ static int vaapi_map_from_drm(AVHWFrames
+     uint32_t va_fourcc;
+     int err, i, j, k;
+ 
+-    unsigned long buffer_handle;
++    uintptr_t buffer_handle;
+     VASurfaceAttribExternalBuffers buffer_desc;
+     VASurfaceAttrib attrs[2] = {
+         {
+Index: ffmpeg-4.4.4/libavutil/hwcontext_vulkan.c
+===================================================================
+--- ffmpeg-4.4.4.orig/libavutil/hwcontext_vulkan.c
++++ ffmpeg-4.4.4/libavutil/hwcontext_vulkan.c
+@@ -862,7 +862,7 @@ static void free_exec_ctx(AVHWFramesCont
+ 
+     av_freep(&cmd->queues);
+     av_freep(&cmd->bufs);
+-    cmd->pool = NULL;
++    cmd->pool = VK_NULL_HANDLE;
+ }
+ 
+ static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)