summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Cho2020-08-01 08:17:57 +0900
committerXavier Cho2020-08-01 08:17:57 +0900
commit5662ca8cad517f2ae6a10198772066eedb2a5de4 (patch)
tree863bacde2527998ab57d788cf729fd9c75f430a7
parent57918089580402aa65c2abc217d473a22cc85f92 (diff)
downloadaur-5662ca8cad517f2ae6a10198772066eedb2a5de4.tar.gz
Fix build failure due to CUDA 11 update
CUDA 11 doesn't support sm_30 architecture anymore, so we should drop it with a patch, until Blender/UPBGE moves forward.
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD6
-rw-r--r--cuda11.patch23
4 files changed, 32 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 273416796b8..0bdfb8c4e08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = upbge-git
pkgdesc = Uchronia Project Blender Game Engine fork of Blender Game Engine
- pkgver = 101552.3f20e80b755
+ pkgver = 101932.d7b695c5250
pkgrel = 1
url = https://upbge.org/
install = upbge.install
@@ -43,6 +43,7 @@ pkgbase = upbge-git
source = blender-translations.git::git://git.blender.org/blender-translations.git
source = blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git
source = embree.patch
+ source = cuda11.patch
source = upbge.desktop
md5sums = SKIP
md5sums = SKIP
@@ -50,6 +51,7 @@ pkgbase = upbge-git
md5sums = SKIP
md5sums = SKIP
md5sums = 1f0b37cb559e2b03d725677b19b80ba8
+ md5sums = 17fb962ec1fd7e539bfa5c5a4af8a675
md5sums = 37ce92c740691f858156511e22b40143
pkgname = upbge-git
diff --git a/.gitignore b/.gitignore
index 068942fac5c..44a9464c748 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@
!upbge.install
!upbge.desktop
!embree.patch
+!cuda11.patch
!.SRCINFO
!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index f71860f85b8..b2992750be1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Xavier Cho <mysticfallband@gmail.com>
pkgname=upbge-git
-pkgver=101471.6e94f8ab7d4
+pkgver=101932.d7b695c5250
pkgrel=1
pkgdesc="Uchronia Project Blender Game Engine fork of Blender Game Engine"
arch=('i686' 'x86_64')
@@ -28,6 +28,7 @@ source=('git://github.com/UPBGE/upbge.git' \
'blender-translations.git::git://git.blender.org/blender-translations.git' \
'blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git' \
embree.patch \
+ cuda11.patch \
upbge.desktop)
md5sums=(
'SKIP'
@@ -36,6 +37,7 @@ md5sums=(
'SKIP'
'SKIP'
'1f0b37cb559e2b03d725677b19b80ba8'
+ '17fb962ec1fd7e539bfa5c5a4af8a675'
'37ce92c740691f858156511e22b40143')
# determine whether we can precompile CUDA kernels
@@ -84,6 +86,8 @@ prepare() {
if [ "$_EMBREE_PKG" != "" ]; then
git apply -v "${srcdir}"/embree.patch
fi
+
+ git apply -v "${srcdir}"/cuda11.patch
}
build() {
diff --git a/cuda11.patch b/cuda11.patch
new file mode 100644
index 00000000000..bba1ac33b7f
--- /dev/null
+++ b/cuda11.patch
@@ -0,0 +1,23 @@
+--- upbge/CMakeLists.txt 2020-07-31 19:24:33.095657933 +0900
++++ upbge/CMakeLists.txt.new 2020-08-01 07:04:05.215252739 +0900
+@@ -384,7 +384,7 @@
+ option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler instead of nvcc" OFF)
+ option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
+ mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
+-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 compute_75 CACHE STRING "CUDA architectures to build binaries for")
++set(CYCLES_CUDA_BINARIES_ARCH sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 compute_75 CACHE STRING "CUDA architectures to build binaries for")
+ mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+ unset(PLATFORM_DEFAULT)
+ option(WITH_CYCLES_LOGGING "Build Cycles with logging support" ON)
+
+--- upbge/build_files/cmake/config/blender_release.cmake 2020-07-31 19:24:33.259014621 +0900
++++ upbge/build_files/cmake/config/blender_release.cmake.new 2020-08-01 07:17:51.424703845 +0900
+@@ -55,7 +55,7 @@
+ set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
+-set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;compute_75 CACHE STRING "" FORCE)
++set(CYCLES_CUDA_BINARIES_ARCH sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;compute_75 CACHE STRING "" FORCE)
+ set(WITH_CYCLES_DEVICE_OPTIX ON CACHE BOOL "" FORCE)
+
+ # platform dependent options