diff --git a/0001-avutil-hwcontext_vaapi-use-the-correct-type-for-VASu.patch b/0001-avutil-hwcontext_vaapi-use-the-correct-type-for-VASu.patch new file mode 100644 index 0000000..69dc915 --- /dev/null +++ b/0001-avutil-hwcontext_vaapi-use-the-correct-type-for-VASu.patch @@ -0,0 +1,29 @@ +From 6f8e365a2af2b6b21701d41eed3b2e3f8a436eeb Mon Sep 17 00:00:00 2001 +From: James Almer +Date: Wed, 31 Jul 2024 10:00:54 -0300 +Subject: [PATCH] avutil/hwcontext_vaapi: use the correct type for + VASurfaceAttribExternalBuffers.buffers + +Should fix ticket #11115. + +Signed-off-by: James Almer +--- + libavutil/hwcontext_vaapi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c +index 4cb25dd032..15fd84aa40 100644 +--- a/libavutil/hwcontext_vaapi.c ++++ b/libavutil/hwcontext_vaapi.c +@@ -1225,7 +1225,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, + + if (!use_prime2 || vas != VA_STATUS_SUCCESS) { + int k; +- unsigned long buffer_handle; ++ uintptr_t buffer_handle; + VASurfaceAttribExternalBuffers buffer_desc; + VASurfaceAttrib buffer_attrs[2] = { + { +-- +2.46.0 + diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index 77a0604..3a3c14f 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -3,6 +3,8 @@ Sun Sep 1 18:04:27 UTC 2024 - Jan Engelhardt - Add 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch [boo#1229338] +- Add 0001-avutil-hwcontext_vaapi-use-the-correct-type-for-VASu.patch + (resolve FTBFS on i586) ------------------------------------------------------------------- Sun Aug 18 01:42:12 UTC 2024 - Cliff Zhao diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec index 1ff614e..5a8d0ca 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -114,6 +114,7 @@ Patch15: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch Patch16: 0001-avfilter-f_reverse-Apply-PTS-compensation-only-when-.patch Patch17: 0001-avfilter-af_stereowiden-Check-length.patch Patch18: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch +Patch19: 0001-avutil-hwcontext_vaapi-use-the-correct-type-for-VASu.patch Patch90: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch Patch93: soname.diff @@ -854,6 +855,7 @@ Patch15: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch Patch16: 0001-avfilter-f_reverse-Apply-PTS-compensation-only-when-.patch Patch17: 0001-avfilter-af_stereowiden-Check-length.patch Patch18: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch +Patch19: 0001-avutil-hwcontext_vaapi-use-the-correct-type-for-VASu.patch Patch90: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch Patch93: soname.diff