summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Cho2020-10-27 17:31:44 +0900
committerXavier Cho2020-10-27 17:31:44 +0900
commitcc6d193511765dabf746c8c662c45f30490de4c1 (patch)
tree7797f4abbeeae81ed6eb20109eda3ff664a687da
parentee17058ec2b8e07c5a8f78020f79256bf479e875 (diff)
downloadaur-cc6d193511765dabf746c8c662c45f30490de4c1.tar.gz
Remove CUDA patch since it's become redundant
See: 3bb3b26c8fdf44b in UPBGE/upbge.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--cuda11.patch23
3 files changed, 2 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c7859f161d5..9d89ddd8c9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = upbge-git
pkgdesc = Uchronia Project Blender Game Engine fork of Blender Game Engine
- pkgver = 102995.5b3c332b398
+ pkgver = 104860.a6b9e1d1393
pkgrel = 1
url = https://upbge.org/
install = upbge.install
@@ -43,7 +43,6 @@ 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
@@ -51,7 +50,6 @@ pkgbase = upbge-git
md5sums = SKIP
md5sums = SKIP
md5sums = 1cd3132ec4e15df823d336529f5d1d6f
- md5sums = 17fb962ec1fd7e539bfa5c5a4af8a675
md5sums = 37ce92c740691f858156511e22b40143
pkgname = upbge-git
diff --git a/PKGBUILD b/PKGBUILD
index c3364d413d1..9c99fd3efe1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Xavier Cho <mysticfallband@gmail.com>
pkgname=upbge-git
-pkgver=102995.5b3c332b398
+pkgver=104860.a6b9e1d1393
pkgrel=1
pkgdesc="Uchronia Project Blender Game Engine fork of Blender Game Engine"
arch=('i686' 'x86_64')
@@ -28,7 +28,6 @@ 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'
@@ -37,7 +36,6 @@ md5sums=(
'SKIP'
'SKIP'
'1cd3132ec4e15df823d336529f5d1d6f'
- '17fb962ec1fd7e539bfa5c5a4af8a675'
'37ce92c740691f858156511e22b40143')
# determine whether we can precompile CUDA kernels
@@ -86,8 +84,6 @@ 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
deleted file mode 100644
index bba1ac33b7f..00000000000
--- a/cuda11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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