From cf638fda5c79ea5480b52775da9645a7050a002d91e5704c4abfae5dae097b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Wed, 9 Oct 2024 09:13:24 +0200 Subject: [PATCH] disable xvid suport on sle16/slfo --- _scmsync.obsinfo | 7 +++---- ffmpeg-4.changes | 21 +++++++++++++-------- ffmpeg-4.spec | 5 ++++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index a1a658e..8b318d1 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,3 @@ -mtime: 1724842934 -commit: 9e43e5445b98d8995b81b0fc26eca3b5334fb0e654fa27f34d5f3cd90ff11654 -url: https://src.opensuse.org/jengelh/ffmpeg-4 -revision: master +mtime: 1724938970 +commit: c4931895316fa0a3175739d008d5dafa33dcdd5e31e9fc99b1a8d06997c0fe49 +url: https://src.opensuse.org/dirkmueller/ffmpeg-4.git diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 4bb592a..5c0ade8 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 9 07:12:38 UTC 2024 - Dirk Müller + +- disable xvid support on SLFO/SLE16 + ------------------------------------------------------------------- Wed Aug 28 10:42:38 UTC 2024 - Jan Engelhardt @@ -98,7 +103,7 @@ Wed Apr 19 21:00:41 UTC 2023 - Bjørn Lie * avcodec/012v: Order operations for odd size handling * avcodec/alsdec: The minimal block is at least 7 bits * avcodec/bink: - - Avoid undefined out of array end pointers in + - Avoid undefined out of array end pointers in binkb_decode_plane() - Fix off by 1 error in ref end * avcodec/eac3dec: avoid float noise in fixed mode addition to @@ -282,7 +287,7 @@ Tue Aug 10 09:38:39 UTC 2021 - Alynx Zhou ------------------------------------------------------------------- Sat Jul 10 10:11:32 UTC 2021 - Hans-Peter Jansen -- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains +- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains a goto to a none existing label. In order to distinguish this patch from the original, I renamed it to ffmpeg-4.4-CVE-2020-22046.patch @@ -308,7 +313,7 @@ Fri Jun 4 12:29:16 UTC 2021 - Jan Engelhardt ------------------------------------------------------------------- Thu May 20 23:16:09 UTC 2021 - Daniel Molkentin -- Enable vulkan on on Leap 15 +- Enable vulkan on on Leap 15 ------------------------------------------------------------------- Fri Apr 16 10:20:15 UTC 2021 - Jan Engelhardt @@ -327,8 +332,8 @@ Fri Apr 9 18:52:46 UTC 2021 - Jan Engelhardt Sun Mar 14 21:08:02 UTC 2021 - Dirk Müller - update to 4.3.2: - * lots of oss-fuzz reported overflow fixes, see included ChangeLog -- drop + * lots of oss-fuzz reported overflow fixes, see included ChangeLog +- drop ffmpeg.git-ba3e771a42c29ee02c34e7769cfc1b2dbc5c760a.patch 0001-lavf-srt-fix-build-fail-when-used-the-libsrt-1.4.1.patch 0001-avformat-vividas-improve-extradata-packing-checks-in.patch: upstream @@ -344,7 +349,7 @@ Sun Jan 24 11:22:02 UTC 2021 - Dirk Müller - remove dependency on OpenJPEG, this is obsolete since ffmpeg 4.0, we already build against OpenJPEG 2.1. - see changes: + see changes: - Dropped support for OpenJPEG versions 2.0 and below. Using OpenJPEG now requires 2.1 (or later) and pkg-config. @@ -376,7 +381,7 @@ Mon Jul 27 13:39:27 UTC 2020 - Hans-Peter Jansen ------------------------------------------------------------------- Thu Jul 16 10:49:02 UTC 2020 - Alexander Reimelt -- Add librav1e support +- Add librav1e support ------------------------------------------------------------------- Sun Jul 12 16:08:10 UTC 2020 - Bjørn Lie @@ -443,7 +448,7 @@ Fri Mar 31 00:41:22 UTC 2020 - Ismail Dönmez - Add Samba support for Factory (as this needs a fix in Samba itself) Add --enable-libsmbclient to configure, add BR on pkgconfig(smbclient) - License is now GPLv3+ by default (--enable-version3) - + ------------------------------------------------------------------- Mon Mar 30 07:14:39 UTC 2020 - Tomáš Chvátal diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index f7bbaca..ae791e3 100644 --- a/ffmpeg-4.spec +++ b/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 -- 2.45.2