commit f7c2c85ec34e58187b6e4f930493064ee586f40e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Dec 17 21:13:51 2017 +0100
Add _cuda_version macro
ffmpeg.spec | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 42a3bf6..823fe1a 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -48,14 +48,18 @@
%if 0%{!?_without_nvenc:1}
%global nvenc_cflags -I%{_includedir}/nvenc
%endif
-%if 0%{?_with_cuda}
-%global cuda_cflags $(pkg-config --cflags cuda-8.0)
+%if 0%{!?_cuda_version:1}
+%global _cuda_version 9.1
+%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_ldflags -L%{_libdir}/nvidia
%endif
%if 0%{?_with_libnpp}
-%global libnpp_cflags $(pkg-config --cflags nppi-8.0 nppc-8.0)
-%global libnpp_ldlags $(pkg-config --libs-only-L nppi-8.0 nppc-8.0)
+%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
%if 0%{?_without_gpl}
@@ -82,8 +86,8 @@ Source0:
http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
#Backport patch for arm neon
Patch0: 0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%{?_with_cuda:BuildRequires: cuda-driver-dev-8-0 cuda-misc-headers-8-0
cuda-drivers-devel%{_isa}}
-%{?_with_libnpp:BuildRequires: cuda-cudart-dev-8-0 cuda-misc-headers-8-0
cuda-npp-dev-8-0}
+%{?_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}}
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}