diff options
author | bartus | 2019-04-17 13:27:47 +0200 |
---|---|---|
committer | bartus | 2019-04-17 13:27:47 +0200 |
commit | b99fc2146918ffdce8161a25a38144d9e290fe10 (patch) | |
tree | b0b4ee554ca5074645388a4ee53f837fb59c1428 | |
parent | d4281d4980b74062c59fa4c54fce45eb35b27cc0 (diff) | |
download | aur-b99fc2146918ffdce8161a25a38144d9e290fe10.tar.gz |
update SelectCudaComputeArch.patch
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | SelectCudaComputeArch.patch | 22 |
3 files changed, 17 insertions, 18 deletions
@@ -1,6 +1,6 @@ pkgbase = blender-2.8-git pkgdesc = Development version of Blender 2.8 branch - pkgver = 2.8.r83821.0d736d68967 + pkgver = 2.8.r86737.c3a11a56711 pkgrel = 1 url = http://blender.org/ install = blender.install @@ -48,7 +48,7 @@ pkgbase = blender-2.8-git md5sums = SKIP md5sums = SKIP md5sums = cd108dca1c77607c6a7cc45aa284ea97 - md5sums = 9454ff7e994f72ead5027356e227cbd2 + md5sums = 2f1b08655352e70c7c74d4957d481dc8 pkgname = blender-2.8-git @@ -3,11 +3,11 @@ pkgname=blender-2.8-git _fragment="#branch=master" -pkgver=2.8.r83821.0d736d68967 +pkgver=2.8.r86737.c3a11a56711 pkgrel=1 pkgdesc="Development version of Blender 2.8 branch" arch=('i686' 'x86_64') -url="http://blender.org/" +url="https://blender.org/" depends=('alembic' 'libgl' 'python' 'python-numpy' 'openjpeg' 'desktop-file-utils' 'hicolor-icon-theme' 'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio' 'opencolorio' 'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage' 'libtiff' 'libpng') @@ -36,8 +36,7 @@ md5sums=('SKIP' 'SKIP' 'SKIP' 'cd108dca1c77607c6a7cc45aa284ea97' - '9454ff7e994f72ead5027356e227cbd2' - ) + '2f1b08655352e70c7c74d4957d481dc8') # determine whether we can precompile CUDA kernels _CUDA_PKG=`pacman -Qq cuda 2>/dev/null` || true @@ -55,7 +54,7 @@ prepare() { cd "$srcdir/blender" # update the submodules git submodule update --init --recursive --remote - git apply ${srcdir}/SelectCudaComputeArch.patch + git apply -v ${srcdir}/SelectCudaComputeArch.patch } build() { diff --git a/SelectCudaComputeArch.patch b/SelectCudaComputeArch.patch index 540d50f0bcc3..3fa6c0a12d41 100644 --- a/SelectCudaComputeArch.patch +++ b/SelectCudaComputeArch.patch @@ -1,15 +1,15 @@ diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake -index 8d04025e6fd..a6949c99f60 100644 +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) - 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})") - else() - message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES") - set(WITH_CYCLES_CUDA_BINARIES OFF) + 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})") + else() + message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES") + set(WITH_CYCLES_CUDA_BINARIES OFF) |