aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-04-16 09:42:30 +0200
committerbartus2020-04-16 09:42:30 +0200
commit9ac03415dd700c2b683df23a5ee095dfca585880 (patch)
treebf33a51054e593ac285f3e10d9d4f44875200f51
parente6a9ad79f83a1ac24e2a23f9b0f91392aeaa611e (diff)
downloadaur-9ac03415dd700c2b683df23a5ee095dfca585880.tar.gz
Refactor.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
2 files changed, 7 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57bf57d4ffcb..000ff3397f72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = blender-2.8-git
pkgdesc = Development version of Blender 2.8 branch
- pkgver = 2.83.r94548.g671d811323e
+ pkgver = 2.90.r95021.gec263547b53
pkgrel = 1
url = https://blender.org/
changelog = blender.changelog
@@ -34,8 +34,8 @@ pkgbase = blender-2.8-git
depends = libpng
depends = openimagedenoise
optdepends = cuda: CUDA support in Cycles
- provides = blender=2.83
- conflicts = blender=2.83
+ provides = blender=2.90
+ conflicts = blender=2.90
source = git://git.blender.org/blender.git#branch=master
source = blender-addons.git::git://git.blender.org/blender-addons.git
source = blender-addons-contrib.git::git://git.blender.org/blender-addons-contrib.git
diff --git a/PKGBUILD b/PKGBUILD
index 85734f4af893..802ffacba4e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,12 @@
# shellcheck disable=SC2034,SC2154 # allow unused/unset variables
# shellcheck disable=SC2191 # preserve current _CMAKE_FLAGS initialization.
-# To force cuda compute arch uncomment this line and update value of sm_xx model accordingly
-#_cuda_capability+=(sm_30 sm_35 sm_37)
-#_cuda_capability+=(sm_50 sm_52 sm_60 sm_61 sm_70 sm_75)
-((TRAVIS)) && _cuda_capability+=(sm_50 sm_52 sm_60 sm_61 sm_70 sm_75) # Travis memory limit is not enough to build for arch 3.x.
-
# Configuration.
_fragment=${FRAGMENT:-#branch=master}
+[[ -v CUDA_ARCH ]] && _cuda_capability=${CUDA_ARCH}
+
#some extra, unofficially supported stuff goes here:
+((TRAVIS)) && _cuda_capability+=(sm_50 sm_52 sm_60 sm_61 sm_70 sm_75) # Travis memory limit is not enough to build for arch 3.x.
_CMAKE_FLAGS+=( -DWITH_ALEMBIC_HDF5=ON )
((DISABLE_EMBREE)) || {
_CMAKE_FLAGS+=( -DWITH_CYCLES_EMBREE=ON )
@@ -26,7 +24,7 @@ _CMAKE_FLAGS+=( -DWITH_ALEMBIC_HDF5=ON )
((DISABLE_CUDA)) && optdepends+=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix>=7.0'); }
pkgname=blender-2.8-git
-pkgver=2.83.r94548.g671d811323e
+pkgver=2.90.r95021.gec263547b53
pkgrel=1
pkgdesc="Development version of Blender 2.8 branch"
changelog=blender.changelog