Add back CUDA patch & sync with blender-develop-git

Keep PKGBUILD in sync with blender-develop-git because bartus
knows what he's doing while I don't :P

3 files changed, 30 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c2accff3031..c3980332f9b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = upbge-git
 	pkgdesc = Uchronia Project Blender Game Engine fork of Blender Game Engine
-	pkgver = 115993.5c005d01c07
+	pkgver = 116473.8aa389aed4f
 	pkgrel = 1
 	url = https://upbge.org/
 	install = upbge.install
@@ -9,10 +9,13 @@ pkgbase = upbge-git
 	license = GPL
 	makedepends = git
 	makedepends = cmake
+	makedepends = clang
 	makedepends = boost
 	makedepends = mesa
 	makedepends = llvm
-	makedepends = ninja
+	makedepends = wayland
+	makedepends = wayland-protocols
+	makedepends = libxkbcommon
 	depends = alembic
 	depends = embree
 	depends = libgl
@@ -45,6 +48,7 @@ pkgbase = upbge-git
 	source = blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git
 	source = upbge.desktop
 	source = usd_python.patch
+	source = SelectCudaComputeArch.patch
 	source = embree.patch
 	source = openexr3.patch
 	sha256sums = SKIP
@@ -54,6 +58,7 @@ pkgbase = upbge-git
 	sha256sums = SKIP
 	sha256sums = b5c9bf4fa265389db4b3f23e96d74cc86c51d908b8943eb80967614d8af1ea1a
 	sha256sums = 333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703
+	sha256sums = 87c5ee85032bab83510db426ab28f7acfba893aefea2b523f2fd78f3b62c5348
 	sha256sums = ab353b7a9fdb5e9a87fefdade6915f44660299b67446735a9720833aa45f6be8
 	sha256sums = 5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b
 
diff --git a/PKGBUILD b/PKGBUILD
index c66dbc35d241..eb1345249766 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@
 ((DISABLE_CUDA)) && optdepends+=("cuda: CUDA support in Cycles") || { makedepends+=("cuda") ; ((DISABLE_OPTIX)) || makedepends+=("optix>=7.0"); }
 
 pkgname=upbge-git
-pkgver=115993.5c005d01c07
+pkgver=116473.8aa389aed4f
 pkgrel=1
 pkgdesc="Uchronia Project Blender Game Engine fork of Blender Game Engine"
 arch=("i686" "x86_64")
@@ -28,7 +28,7 @@ url="https://upbge.org/"
 depends=("alembic" "embree" "libgl" "python" "python-numpy" "openjpeg2" "libharu" "potrace" "openxr"
          "ffmpeg" "fftw" "openal" "freetype2" "libxi" "openimageio" "opencolorio"
          "openvdb" "opencollada" "opensubdiv" "openshadinglanguage" "libtiff" "libpng" "openimagedenoise")
-makedepends=("git" "cmake" "boost" "mesa" "llvm" "ninja")
+makedepends=("git" "cmake" "clang" "boost" "mesa" "llvm" wayland{,-protocols} "libxkbcommon")
 provides=("blender")
 conflicts=("blender")
 license=("GPL")
@@ -47,6 +47,7 @@ source=(
   "blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git"
   upbge.desktop
   usd_python.patch
+  SelectCudaComputeArch.patch
   embree.patch
   openexr3.patch)
 sha256sums=(
@@ -57,6 +58,7 @@ sha256sums=(
   "SKIP"
   "b5c9bf4fa265389db4b3f23e96d74cc86c51d908b8943eb80967614d8af1ea1a"
   "333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703"
+  "87c5ee85032bab83510db426ab28f7acfba893aefea2b523f2fd78f3b62c5348"
   "ab353b7a9fdb5e9a87fefdade6915f44660299b67446735a9720833aa45f6be8"
   "5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b")
 
@@ -68,6 +70,9 @@ pkgver() {
 prepare() {
   # update the submodules
   git -C "$srcdir/upbge" submodule update --init --recursive --remote
+  if [ ! -v _cuda_capability ] && grep -q nvidia <(lsmod); then
+    git -C "$srcdir/upbge" apply -v "${srcdir}"/SelectCudaComputeArch.patch
+  fi
   ((DISABLE_USD)) || git -C "$srcdir/upbge" apply -v "${srcdir}"/usd_python.patch
   git -C "$srcdir/upbge" apply -v "${srcdir}"/{embree,openexr3}.patch
 }
diff --git a/SelectCudaComputeArch.patch b/SelectCudaComputeArch.patch
new file mode 100644
index 000000000000..8c517b8dd6fe
--- /dev/null
+++ b/SelectCudaComputeArch.patch
@@ -0,0 +1,16 @@
+diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
+index c1244ab740b..93ddfd2c7a0 100644
+--- a/intern/cycles/cmake/external_libs.cmake
++++ b/intern/cycles/cmake/external_libs.cmake
+@@ -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 "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}")
++        message(STATUS "Enabling CUDA support (version: ${CUDA_VERSION_STRING},"
++          " archs: ${CYCLES_CUDA_BINARIES_ARCH})")
+   else()
+     message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES")
+     set(WITH_CYCLES_CUDA_BINARIES OFF)