diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 91900c1..25f745b 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jul 27 08:56:56 UTC 2018 - tchvatal@suse.com + +- Reduce the optional conditional for the SLE12 backports to + cover everything, most of the packages in old codestreams were + not really ready as they need additional baselibs/etc. + * Since these are new features user will simply wait or use TW + ------------------------------------------------------------------- Fri Jul 27 07:03:06 UTC 2018 - jengelh@inai.de diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 7587ddf..30d9ff0 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -66,10 +66,22 @@ %bcond_without mysofa %bcond_without vidstab %bcond_without srt +%bcond_without codec2 +%bcond_without bs2b +%bcond_without lv2 +%bcond_without rubberband +%bcond_without soxr +%bcond_without zmq %else %bcond_with mysofa %bcond_with vidstab %bcond_with srt +%bcond_with codec2 +%bcond_with bs2b +%bcond_with lv2 +%bcond_with rubberband +%bcond_with soxr +%bcond_with zmq %endif %if 0%{?suse_version} >= 1500 @@ -80,23 +92,6 @@ %bcond_with openmpt %endif -%if 0%{?suse_version} > 1500 || 0%{?is_opensuse} -%bcond_without codec2 -%bcond_without bs2b -%bcond_without lv2 -%bcond_without rubberband -%bcond_without soxr -%bcond_without zmq -%else -# backports SLE12 -%bcond_with codec2 -%bcond_with bs2b -%bcond_with lv2 -%bcond_with rubberband -%bcond_with soxr -%bcond_with zmq -%endif - %define _name ffmpeg %define _major_version 4 %define _major_expected 5