Fix SelectCudaComputeArch, drop cuda from makedepends.

3 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92ba5958e34a..300f2fbe86ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -51,7 +51,7 @@ pkgbase = blender-2.7
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 5d489f24c7401574e79b755aead07c779449ae50a1c3299ad182588127697de1
-	sha256sums = 73d878d55434d535d4a8cc2b9b633a43e822812531213a97ac64ade3497b03d6
+	sha256sums = 28e407e3aefdd9bd76805b6033ada0b5b41dd6183bcf4f58a642c109f10c1876
 	sha256sums = 649c21a12a1bfc0207078e1e58b4813a3e898c6dbbbb35d21e1de7c9e8f1985a
 	sha256sums = 47811284f080e38bcfbfb1f7346279245815a064df092989336b0bf3fe4530e9
 	sha256sums = 229853b98bb62e1dec835aea6b2eab4c3dabbc8be591206573a3c1b85f10be59
diff --git a/PKGBUILD b/PKGBUILD
index 91055cceaf8d..850c8eeb576c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -46,7 +46,7 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             '5d489f24c7401574e79b755aead07c779449ae50a1c3299ad182588127697de1'
-            '73d878d55434d535d4a8cc2b9b633a43e822812531213a97ac64ade3497b03d6'
+            '28e407e3aefdd9bd76805b6033ada0b5b41dd6183bcf4f58a642c109f10c1876'
             '649c21a12a1bfc0207078e1e58b4813a3e898c6dbbbb35d21e1de7c9e8f1985a'
             '47811284f080e38bcfbfb1f7346279245815a064df092989336b0bf3fe4530e9'
             '229853b98bb62e1dec835aea6b2eab4c3dabbc8be591206573a3c1b85f10be59')
diff --git a/SelectCudaComputeArch.patch b/SelectCudaComputeArch.patch
index 8b129acc07fd..ab63fd128490 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 d0f473a2939..90fcb40107a 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}")
-+			message(STATUS "Enabling CUDA support (version: ${CUDA_VERSION_STRING},"
-+				" archs: ${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: ${CYCLES_CUDA_BINARIES_ARCH})")
  	else()
  		message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES")
  		set(WITH_CYCLES_CUDA_BINARIES OFF)