diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index b211ee3..903de42 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1736168221 -commit: 52f36ca5b3383586c1ae8abf1b64353de97005272d185339a0eca858376b3ac2 +mtime: 1740184381 +commit: b6a9351332f68f9e2bb88064077f83991397ad6f174d995f76f27f9fb779232e url: https://src.opensuse.org/jengelh/ffmpeg-4 revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index de02866..6b75b8f 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e530d510b2e2b7a016342b47e8ea5636690241123d58c95a3864cfd1a2a60a19 +oid sha256:2bd8d5f2b7aefaf729b0d8eaba1ad1dad24e2996bea43bf2569ae8d69d6ca64e size 256 diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 6e589c5..71ca9dc 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 15 08:18:54 UTC 2024 - Antonio Larrosa + +- Adjust bconds to build the package in SLFO without xvidcore. + ------------------------------------------------------------------- Mon Jan 6 11:53:32 UTC 2025 - Jan Engelhardt diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index dc7783d..0542d93 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -57,7 +57,7 @@ %bcond_with x265 %bcond_with xvid -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1600 %bcond_without libaom %bcond_without mysofa %bcond_without vidstab @@ -73,6 +73,15 @@ %bcond_without opencore %bcond_without xvid %else +%if 0%{?suse_version} > 1500 +%bcond_without mysofa +%bcond_without vidstab +%bcond_without codec2 +%bcond_without rubberband +%bcond_without vulkan +%bcond_without amrwb +%bcond_without opencore +%else %bcond_with libaom %bcond_with mysofa %bcond_with vidstab @@ -85,6 +94,7 @@ %bcond_with zmq %bcond_with vulkan %endif +%endif %if 0%{?suse_version} >= 1500 %bcond_without zimg