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

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

Browse Source 
- Redo the nvidia condition based on review feeback

OBS-URL: https://build.opensuse.org/request/show/625376
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=11
This commit is contained in:
Jan Engelhardt 2018-07-26 10:18:09 +00:00 committed by Git OBS Bridge
parent c290df3da3
commit 55afa21bc7
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg-4.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 26 08:09:32 UTC 2018 - tchvatal@suse.com
- Redo the nvidia condition based on review feeback
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 25 08:30:56 UTC 2018 - tchvatal@suse.com Wed Jul 25 08:30:56 UTC 2018 - tchvatal@suse.com

14
ffmpeg-4.spec
View File

@ -38,6 +38,16 @@
%{preamble_string} ffmpeg-private-devel %{comparator} %{conflicts_version} \ %{preamble_string} ffmpeg-private-devel %{comparator} %{conflicts_version} \
%{nil} %{nil}
# nvidia adds library present only after leap15
%bcond_with nvcodec
%if 0%{?BUILD_ORIG}
%bcond_without nvidia
%if 0%{?suse_version} > 1500
%bcond_without nvcodec
%endif
%else
%bcond_with nvidia
%endif
%bcond_with fdk_aac %bcond_with fdk_aac
%bcond_with librtmp %bcond_with librtmp
%bcond_with opencore %bcond_with opencore
@ -56,12 +66,10 @@
%bcond_without mysofa %bcond_without mysofa
%bcond_without vidstab %bcond_without vidstab
%bcond_without srt %bcond_without srt
%bcond_without nvidia
%else %else
%bcond_with mysofa %bcond_with mysofa
%bcond_with vidstab %bcond_with vidstab
%bcond_with srt %bcond_with srt
%bcond_with nvidia
%endif %endif
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
@ -202,7 +210,7 @@ BuildRequires: pkgconfig(fdk-aac)
%if %{with librtmp} %if %{with librtmp}
BuildRequires: pkgconfig(librtmp) BuildRequires: pkgconfig(librtmp)
%endif %endif
%if %{with nvidia} %if %{with nvcodec}
BuildRequires: pkgconfig(ffnvcodec) BuildRequires: pkgconfig(ffnvcodec)
%endif %endif
%if %{with xvid} %if %{with xvid}