diff --git a/ffmpeg-6.spec b/ffmpeg-6.spec index 9897da8..9d6fcbd 100644 --- a/ffmpeg-6.spec +++ b/ffmpeg-6.spec @@ -17,9 +17,6 @@ %define flavor @BUILD_FLAVOR@%nil -# -# preamble is present twice, watch out -# %if "%flavor" != "ffmpeg-6-mini" # Create proper conflicts to make sure we require all from one version @@ -128,6 +125,9 @@ Patch96: ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch Patch97: ffmpeg-6-CVE-2024-32228.patch Patch98: ffmpeg-6-CVE-2024-32230.patch Patch99: ffmpeg-c99.patch +# +# preamble is present twice, watch out +# BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel >= 3.98.3 @@ -848,8 +848,14 @@ Patch12: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch Patch90: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch -Patch92: ffmpeg-CVE-2023-50007.patch -Patch93: ffmpeg-CVE-2023-50008.patch +Patch92: ffmpeg-6-CVE-2023-50007.patch +Patch93: ffmpeg-6-CVE-2023-50008.patch +Patch94: ffmpeg-6-CVE-2024-32228-shim-1535d338.patch +Patch95: ffmpeg-6-CVE-2024-32228-shim-f50382cb.patch +Patch96: ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch +Patch97: ffmpeg-6-CVE-2024-32228.patch +Patch98: ffmpeg-6-CVE-2024-32230.patch +Patch99: ffmpeg-c99.patch BuildRequires: c_compiler Requires: this-is-only-for-build-envs