aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2021-11-02 00:19:28 +0100
committerbartus2021-11-02 00:19:28 +0100
commit3fe4f71654ab7af514e12a3f9ff79668c8861642 (patch)
tree71fb08ed45eae2fea64fe11a66f47cbe3c9f66bb
parentd9df430d481a70786df9b1fa4270dcfbd16cea45 (diff)
downloadaur-3fe4f71654ab7af514e12a3f9ff79668c8861642.tar.gz
Update SelectCudaComputeArch.patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--SelectCudaComputeArch.patch6
3 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8098887afdf6..01e256238ee2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = blender-3.0-git
pkgdesc = Maintenance version of Blender v3.0 branch
- pkgver = 3.0.r109929.gf85c58ab65e
+ pkgver = 3.0.r109941.g348d7c35a9f
pkgrel = 1
url = https://blender.org/
changelog = blender.changelog
@@ -57,7 +57,7 @@ pkgbase = blender-3.0-git
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c
+ sha256sums = 87c5ee85032bab83510db426ab28f7acfba893aefea2b523f2fd78f3b62c5348
sha256sums = 333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703
sha256sums = 6249892f99ffd960e36f43fb893c14e2f8e4dd1d901b9581d25882e865f2603f
sha256sums = 5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b
diff --git a/PKGBUILD b/PKGBUILD
index eac96916ad0e..c4e619c4f7a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ _fragment=${FRAGMENT:-#branch=blender-v${_ver}-release}
((DISABLE_CUDA)) && optdepends+=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix>=7.0'); }
pkgname=blender-${_ver}-git
-pkgver=3.0.r109929.gf85c58ab65e
+pkgver=3.0.r109941.g348d7c35a9f
pkgrel=1
pkgdesc="Maintenance version of Blender v${_ver} branch"
changelog=blender.changelog
@@ -55,11 +55,10 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- '66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c'
+ '87c5ee85032bab83510db426ab28f7acfba893aefea2b523f2fd78f3b62c5348'
'333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703'
'6249892f99ffd960e36f43fb893c14e2f8e4dd1d901b9581d25882e865f2603f'
- '5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b'
- )
+ '5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b')
pkgver() {
blender_version=$(grep -Po "BLENDER_VERSION \K[0-9]{3}" "$srcdir"/blender/source/blender/blenkernel/BKE_blender_version.h)
diff --git a/SelectCudaComputeArch.patch b/SelectCudaComputeArch.patch
index c6b3ffc73d4f..8c517b8dd6fe 100644
--- a/SelectCudaComputeArch.patch
+++ b/SelectCudaComputeArch.patch
@@ -1,11 +1,11 @@
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
-index 5bf681792ca..b975fb5db14 100644
+index c1244ab740b..93ddfd2c7a0 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
-@@ -41,6 +41,11 @@ if(WITH_CYCLES_CUDA_BINARIES OR NOT WITH_CUDA_DYNLOAD)
+@@ -522,6 +522,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}")
+ message(STATUS "Found CUDA ${CUDA_NVCC_EXECUTABLE} (${CUDA_VERSION})")
+ CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS Auto)
+ 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}")