dirkmueller/ffmpeg-4
SHA256
1
0
Fork 0
forked from pool/ffmpeg-4
Code Pull Requests Activity

Accepting request 625731 from home:scarabeus_iv:branches:multimedia:libs

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/625731
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=13
This commit is contained in:
Jan Engelhardt 2018-07-27 09:30:17 +00:00 committed by Git OBS Bridge
parent 94d245c68f
commit 2a180730e4
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg-4.changes
View File

@ -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 Fri Jul 27 07:03:06 UTC 2018 - jengelh@inai.de

29
ffmpeg-4.spec
View File

@ -66,10 +66,22 @@
%bcond_without mysofa %bcond_without mysofa
%bcond_without vidstab %bcond_without vidstab
%bcond_without srt %bcond_without srt
%bcond_without codec2
%bcond_without bs2b
%bcond_without lv2
%bcond_without rubberband
%bcond_without soxr
%bcond_without zmq
%else %else
%bcond_with mysofa %bcond_with mysofa
%bcond_with vidstab %bcond_with vidstab
%bcond_with srt %bcond_with srt
%bcond_with codec2
%bcond_with bs2b
%bcond_with lv2
%bcond_with rubberband
%bcond_with soxr
%bcond_with zmq
%endif %endif
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
@ -80,23 +92,6 @@
%bcond_with openmpt %bcond_with openmpt
%endif %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 _name ffmpeg
%define _major_version 4 %define _major_version 4
%define _major_expected 5 %define _major_expected 5