aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--SelectCudaComputeArch.patch7
3 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ced0be7c9ff..fe930ef4f69f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -50,7 +50,7 @@ pkgbase = blender-2.8-git
md5sums = SKIP
md5sums = SKIP
md5sums = cd108dca1c77607c6a7cc45aa284ea97
- md5sums = 2f1b08655352e70c7c74d4957d481dc8
+ md5sums = 4441d9a6db38b85b7dc5c3c9e6872951
pkgname = blender-2.8-git
diff --git a/PKGBUILD b/PKGBUILD
index bde19e860128..b54a0646131d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -43,7 +43,7 @@ md5sums=('SKIP'
'SKIP'
'SKIP'
'cd108dca1c77607c6a7cc45aa284ea97'
- '2f1b08655352e70c7c74d4957d481dc8')
+ '4441d9a6db38b85b7dc5c3c9e6872951')
pkgver() {
cd "$srcdir/blender"
diff --git a/SelectCudaComputeArch.patch b/SelectCudaComputeArch.patch
index 3fa6c0a12d41..c6b3ffc73d4f 100644
--- a/SelectCudaComputeArch.patch
+++ b/SelectCudaComputeArch.patch
@@ -2,14 +2,15 @@ diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/exter
index 5bf681792ca..b975fb5db14 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
-@@ -41,6 +41,10 @@ if(WITH_CYCLES_CUDA_BINARIES OR NOT WITH_CUDA_DYNLOAD)
+@@ -41,6 +41,11 @@ if(WITH_CYCLES_CUDA_BINARIES OR NOT WITH_CUDA_DYNLOAD)
find_package(CUDA) # Try to auto locate CUDA toolkit
if(CUDA_FOUND)
message(STATUS "CUDA nvcc = ${CUDA_NVCC_EXECUTABLE}")
+ CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS Auto)
-+ set(CYCLES_CUDA_BINARIES_ARCH "${CUDA_ARCH_FLAGS_readable}")
++ string(REGEX REPLACE " compute_[0-9]+" "" CYCLES_CUDA_BINARIES_ARCH "${CUDA_ARCH_FLAGS_readable}")
++ string(REGEX REPLACE " " ";" CYCLES_CUDA_BINARIES_ARCH "${CYCLES_CUDA_BINARIES_ARCH}")
+ message(STATUS "Enabling CUDA support (version: ${CUDA_VERSION_STRING},"
-+ " archs: ${CUDA_ARCH_FLAGS_readable})")
++ " archs: ${CYCLES_CUDA_BINARIES_ARCH})")
else()
message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES")
set(WITH_CYCLES_CUDA_BINARIES OFF)