diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index d1013d1..da06223 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 25 08:30:56 UTC 2018 - tchvatal@suse.com + +- Do not condition nvidia based on BUILD_ORIG all the support is in + TW only and not on different instances as such safeguard it with + version check only + ------------------------------------------------------------------- Wed Jul 18 12:13:38 UTC 2018 - tchvatal@suse.com diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 6280392..fc3646e 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -38,11 +38,6 @@ %{preamble_string} ffmpeg-private-devel %{comparator} %{conflicts_version} \ %{nil} -%if 0%{?BUILD_ORIG} -%bcond_without nvidia -%else -%bcond_with nvidia -%endif %bcond_with fdk_aac %bcond_with librtmp %bcond_with opencore @@ -61,10 +56,12 @@ %bcond_without mysofa %bcond_without vidstab %bcond_without srt +%bcond_without nvidia %else %bcond_with mysofa %bcond_with vidstab %bcond_with srt +%bcond_with nvidia %endif %if 0%{?suse_version} >= 1500