From ebe01995ff23d195bfe3157312f512bd805cf045 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Thu, 7 Mar 2019 21:21:18 +0900 Subject: [PATCH] nvdec/nvenc: Add CUDA Toolkit 10.1 support Update to support the latest CUDA Toolkit version 10.1 --- configure.ac | 19 ++++++++++--------- sys/meson.build | 1 + 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 68a144d8aa..e67e1eeca7 100644 --- a/configure.ac +++ b/configure.ac @@ -938,15 +938,16 @@ AG_GST_CHECK_FEATURE(CUDA, [NVIDIA CUDA API],, [ CUDA_LIBS="-L$CUDA_PREFIX/lib -L$CUDA_PREFIX/lib64 -L$CUDA_PREFIX/lib/stubs -L$CUDA_PREFIX/lib64/stubs -lcuda -lcudart" fi else - PKG_CHECK_MODULES([CUDA], [cuda-10.0 cudart-10.0],, [ - PKG_CHECK_MODULES([CUDA], [cuda-9.2 cudart-9.2],, [ - PKG_CHECK_MODULES([CUDA], [cuda-9.1 cudart-9.1],, [ - PKG_CHECK_MODULES([CUDA], [cuda-9.0 cudart-9.0],, [ - PKG_CHECK_MODULES([CUDA], [cuda-8.0 cudart-8.0],, [ - PKG_CHECK_MODULES([CUDA], [cuda-7.5 cudart-7.5],, [ - PKG_CHECK_MODULES([CUDA], [cuda-7.0 cudart-7.0],, [ - PKG_CHECK_MODULES([CUDA], [cuda-6.5 cudart-6.5],, [ - AC_MSG_WARN([Could not find cuda headers/libraries])])])])])])])])]) + PKG_CHECK_MODULES([CUDA], [cuda-10.1 cudart-10.1],, [ + PKG_CHECK_MODULES([CUDA], [cuda-10.0 cudart-10.0],, [ + PKG_CHECK_MODULES([CUDA], [cuda-9.2 cudart-9.2],, [ + PKG_CHECK_MODULES([CUDA], [cuda-9.1 cudart-9.1],, [ + PKG_CHECK_MODULES([CUDA], [cuda-9.0 cudart-9.0],, [ + PKG_CHECK_MODULES([CUDA], [cuda-8.0 cudart-8.0],, [ + PKG_CHECK_MODULES([CUDA], [cuda-7.5 cudart-7.5],, [ + PKG_CHECK_MODULES([CUDA], [cuda-7.0 cudart-7.0],, [ + PKG_CHECK_MODULES([CUDA], [cuda-6.5 cudart-6.5],, [ + AC_MSG_WARN([Could not find cuda headers/libraries])])])])])])])])])]) fi HAVE_CUDA_H=no diff --git a/sys/meson.build b/sys/meson.build index f0dc9d8099..5b4a8e24d2 100644 --- a/sys/meson.build +++ b/sys/meson.build @@ -60,6 +60,7 @@ if host_machine.system() == 'windows' endif else cuda_versions = [ + '10.1', '10.0', '9.2', '9.1',