summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD9
-rw-r--r--SelectCudaComputeArch.patch16
3 files changed, 4 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c66f717323a..6a5b0c4155c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = upbge-git
pkgdesc = Uchronia Project Blender Game Engine fork of Blender Game Engine
- pkgver = 111035.86cef44f8a1
+ pkgver = 113940.bc0b5dd720c
pkgrel = 1
url = https://upbge.org/
install = upbge.install
@@ -12,6 +12,7 @@ pkgbase = upbge-git
makedepends = boost
makedepends = mesa
makedepends = llvm
+ makedepends = ninja
depends = alembic
depends = embree
depends = libgl
@@ -43,7 +44,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 = upbge.desktop
- source = SelectCudaComputeArch.patch
source = usd_python.patch
source = embree.patch
source = openexr3.patch
@@ -53,7 +53,6 @@ pkgbase = upbge-git
sha256sums = SKIP
sha256sums = SKIP
sha256sums = b5c9bf4fa265389db4b3f23e96d74cc86c51d908b8943eb80967614d8af1ea1a
- sha256sums = 66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c
sha256sums = 333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703
sha256sums = 6249892f99ffd960e36f43fb893c14e2f8e4dd1d901b9581d25882e865f2603f
sha256sums = 5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b
diff --git a/PKGBUILD b/PKGBUILD
index ec0e27d1fd1..2ed45d5eb3a 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=111035.86cef44f8a1
+pkgver=113940.bc0b5dd720c
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")
+makedepends=("git" "cmake" "boost" "mesa" "llvm" "ninja")
provides=("blender")
conflicts=("blender")
license=("GPL")
@@ -46,7 +46,6 @@ source=(
"blender-translations.git::git://git.blender.org/blender-translations.git"
"blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git"
upbge.desktop
- SelectCudaComputeArch.patch
usd_python.patch
embree.patch
openexr3.patch)
@@ -57,7 +56,6 @@ sha256sums=(
"SKIP"
"SKIP"
"b5c9bf4fa265389db4b3f23e96d74cc86c51d908b8943eb80967614d8af1ea1a"
- "66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c"
"333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703"
"6249892f99ffd960e36f43fb893c14e2f8e4dd1d901b9581d25882e865f2603f"
"5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b")
@@ -70,9 +68,6 @@ 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
deleted file mode 100644
index c6b3ffc73d4..00000000000
--- a/SelectCudaComputeArch.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
-index 5bf681792ca..b975fb5db14 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)
- 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)
-+ 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)