diff options
author | bartus | 2021-11-02 00:15:30 +0100 |
---|---|---|
committer | bartus | 2021-11-02 00:15:30 +0100 |
commit | b8c6104f459d3b1ec1d8f64cabb9dfb141e014fb (patch) | |
tree | e69d26ca5d864fa82abbeacd45415c3eac9c5f74 | |
parent | e9550dba86335725403000ad174e7b6f31827efa (diff) | |
download | aur-b8c6104f459d3b1ec1d8f64cabb9dfb141e014fb.tar.gz |
Update SelectCudaComputeArch.patch
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | SelectCudaComputeArch.patch | 6 |
3 files changed, 8 insertions, 9 deletions
@@ -1,6 +1,6 @@ pkgbase = blender-develop-git pkgdesc = Development version of Blender (non-conflicting version) - pkgver = 3.1.r109937.g657923cf939 + pkgver = 3.1.r110040.g75f5edcaf33 pkgrel = 1 url = https://blender.org/ changelog = blender.changelog @@ -57,7 +57,7 @@ pkgbase = blender-develop-git sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = 66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c + sha256sums = 87c5ee85032bab83510db426ab28f7acfba893aefea2b523f2fd78f3b62c5348 sha256sums = 333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703 sha256sums = 6249892f99ffd960e36f43fb893c14e2f8e4dd1d901b9581d25882e865f2603f sha256sums = 5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b @@ -20,7 +20,7 @@ _fragment=${FRAGMENT:-#branch=master} ((DISABLE_CUDA)) && optdepends+=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix>=7.0'); } pkgname=blender-develop-git -pkgver=3.1.r109937.g657923cf939 +pkgver=3.1.r110040.g75f5edcaf33 pkgrel=1 pkgdesc="Development version of Blender (non-conflicting version)" changelog=blender.changelog @@ -54,11 +54,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}") |