[ffmpeg/f27] Fix up cuda and libnpp

commit 09feb1b8f514d3916568d8bb0af83b450b8d8556 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Mar 16 10:22:39 2018 +0000 Fix up cuda and libnpp ffmpeg.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/ffmpeg.spec b/ffmpeg.spec index f5a3ae5..71bf53d 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -53,11 +53,11 @@ %endif %global _cuda_rpm_version %(echo %{_cuda_version} | sed -e 's/\\./-/') %if 0%{?_with_cuda:1} -%global cuda_cflags $(pkg-config --cflags cuda-%{cuda_version}) +%global cuda_cflags $(pkg-config --cflags cuda-%{_cuda_version}) %global cuda_ldflags -L%{_libdir}/nvidia %endif -%if 0%{?_with_libnpp} +if 0%{?_with_libnpp:1} %global libnpp_cflags $(pkg-config --cflags nppi-%{_cuda_version} nppc-%{_cuda_version}) %global libnpp_ldlags $(pkg-config --libs-only-L nppi-%{_cuda_version} nppc-%{_cuda_version}) %endif @@ -91,7 +91,7 @@ Patch1: LibOpenJPEG-2.3.patch Patch2: 0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}} -%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}} +%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-nvcc-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}} BuildRequires: alsa-lib-devel BuildRequires: bzip2-devel %{?_with_faac:BuildRequires: faac-devel}