disable xvid suport on sle16/slfo

- Add 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch [boo#1229338]

OBS-URL: https://build.opensuse.org/request/show/1196704
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-4?expand=0&rev=70

0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch

@@ -0,0 +1,58 @@
+From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Fri, 9 Aug 2024 11:32:00 +0100
+Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
+ binutils 2.43
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+binutils 2.43 has stricter validation for labels[1] and results in errors
+when building ffmpeg for armv5:
+
+src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0'
+
+Remove the leading zero in the "01" label to resolve this error.
+
+[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
+
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+Signed-off-by: Martin Storsjö <martin@martin.st>
+---
+ libavcodec/arm/mlpdsp_armv5te.S | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
+index 4f9aa485fd..d31568611c 100644
+--- a/libavcodec/arm/mlpdsp_armv5te.S
++++ b/libavcodec/arm/mlpdsp_armv5te.S
+@@ -229,7 +229,7 @@ A .endif
+   .endif
+ 
+         // Begin loop
+-01:
++1:
+   .if TOTAL_TAPS == 0
+         // Things simplify a lot in this case
+         // In fact this could be pipelined further if it's worth it...
+@@ -241,7 +241,7 @@ A .endif
+         str     ST0, [PST, #-4]!
+         str     ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
+         str     ST0, [PSAMP], #4 * MAX_CHANNELS
+-        bne     01b
++        bne     1b
+   .else
+     .if \fir_taps & 1
+       .set LOAD_REG, 1
+@@ -333,7 +333,7 @@ T       orr     AC0, AC0, AC1
+         str     ST3, [PST, #-4]!
+         str     ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
+         str     ST3, [PSAMP], #4 * MAX_CHANNELS
+-        bne     01b
++        bne     1b
+   .endif
+         b       99f
+ 
+-- 
+2.46.0
+

_scmsync.obsinfo

@@ -0,0 +1,3 @@
+mtime: 1724938970
+commit: c4931895316fa0a3175739d008d5dafa33dcdd5e31e9fc99b1a8d06997c0fe49
+url: https://src.opensuse.org/dirkmueller/ffmpeg-4.git

ffmpeg-4-CVE-2024-32230.patch

@@ -0,0 +1,23 @@
+commit 96449cfeaeb95fcfd7a2b8d9ccf7719e97471ed1
+Author: Michael Niedermayer <michael@niedermayer.cc>
+Date:   Mon Apr 8 18:38:42 2024 +0200
+
+    avcodec/mpegvideo_enc: Fix 1 line and one column images
+    
+    Fixes: Ticket10952
+    Fixes: poc21ffmpeg
+    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
+
+--- ffmpeg-4.4.4/libavcodec/mpegvideo_enc.c
++++ ffmpeg-4.4.4_new/libavcodec/mpegvideo_enc.c
+@@ -1263,8 +1263,8 @@
+                     int dst_stride = i ? s->uvlinesize : s->linesize;
+                     int h_shift = i ? h_chroma_shift : 0;
+                     int v_shift = i ? v_chroma_shift : 0;
+-                    int w = s->width  >> h_shift;
+-                    int h = s->height >> v_shift;
++                    int w = AV_CEIL_RSHIFT(s->width , h_shift);
++                    int h = AV_CEIL_RSHIFT(s->height, v_shift);
+                     uint8_t *src = pic_arg->data[i];
+                     uint8_t *dst = pic->f->data[i];
+                     int vpad = 16;

ffmpeg-4.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Wed Oct  9 07:12:38 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- disable xvid support on SLFO/SLE16
+
+-------------------------------------------------------------------
+Wed Aug 28 10:42:38 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Add 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
+  [boo#1229338]
+
+-------------------------------------------------------------------
+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 Jul  2 12:26:28 UTC 2024 - Cliff Zhao <qzhao@suse.com>
+
+- Add ffmpeg-4-CVE-2024-32230.patch:
+  Backporting 96449cfe from upstream, Fix 1 line and one column images.
+  (CVE-2024-32230, bsc#1227296)
+
 -------------------------------------------------------------------
 Tue Apr 27 11:38:35 UTC 2024 - Cliff Zhao <qzhao@suse.com>
 

ffmpeg-4.spec

@@ -55,7 +55,11 @@
 %bcond_with    smbclient
 %bcond_with    x264
 %bcond_with    x265
+%if 0%{?suse_version} > 1600
+%bcond_without xvid
+%else
 %bcond_with    xvid
+%endif
 
 %if 0%{?suse_version} > 1500
 %bcond_without libaom
@@ -71,7 +75,6 @@
 %bcond_without vulkan
 %bcond_without amrwb
 %bcond_without opencore
-%bcond_without xvid
 %else
 %bcond_with libaom
 %bcond_with mysofa
@@ -131,6 +134,9 @@ 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-4-CVE-2024-32230.patch
+Patch22:        ffmpeg-c99.patch
+Patch23:        0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel

ffmpeg-c99.patch

@@ -0,0 +1,37 @@
+From: Filip Kastl <fkastl@opensuse.org>
+Date: Fri, 26 Jul 2024 14:39:42 +0000
+
+I based the package patch on this bug report (there's a patch in
+the comments)
+https://bugs.gentoo.org/936433
+
+and on these patches
+https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/318685.html
+http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=5860a966d2fffbbda1af0014f0a4d37a21c4f2ca
+
+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)