diff options
author | bartus | 2020-03-06 22:56:59 +0100 |
---|---|---|
committer | bartus | 2020-03-06 23:01:21 +0100 |
commit | ffc2f83a0046a4251a436f653ea1246ba938baae (patch) | |
tree | 0371171940e23271ce353ecab9537a2b9d52f215 | |
parent | b2501a89fa038c5232073136b2b28097a49d571e (diff) | |
download | aur-ffc2f83a0046a4251a436f653ea1246ba938baae.tar.gz |
Update upd.patch after usd move to blender/io
Fix Optix adaptive sampling implementation missing type casting.
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 5 | ||||
-rw-r--r-- | usd_python.patch | 4 |
3 files changed, 7 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = blender-2.8-git pkgdesc = Development version of Blender 2.8 branch - pkgver = 2.83.r93810.g2841b2be394 + pkgver = 2.83.r93950.gafe6df1487f pkgrel = 1 url = https://blender.org/ arch = i686 @@ -49,7 +49,7 @@ pkgbase = blender-2.8-git sha256sums = SKIP sha256sums = SKIP sha256sums = 66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c - sha256sums = 893b127c9e0ea1a67905434f729b45a993c58a7ea954f9f89480ad1cc0578849 + sha256sums = 12bd6db5c1fe14244fd7321e3d740941a36aa545ec21b02325e7553c9214778a sha256sums = 42afe119529a5350034a489225958112bf4b84bdee38757a932e5caaa9bd5ed4 pkgname = blender-2.8-git @@ -26,7 +26,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.r93810.g2841b2be394 +pkgver=2.83.r93950.gafe6df1487f pkgrel=1 pkgdesc="Development version of Blender 2.8 branch" arch=('i686' 'x86_64') @@ -59,7 +59,7 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' '66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c' - '893b127c9e0ea1a67905434f729b45a993c58a7ea954f9f89480ad1cc0578849' + '12bd6db5c1fe14244fd7321e3d740941a36aa545ec21b02325e7553c9214778a' '42afe119529a5350034a489225958112bf4b84bdee38757a932e5caaa9bd5ed4') pkgver() { @@ -102,6 +102,7 @@ build() { fi ((DISABLE_NINJA)) && generator="Unix Makefiles" || generator="Ninja" + CXXFLAGS+=" -fpermissive" cmake -G "$generator" -S "$srcdir/blender" -B "$srcdir/build" \ -C "${srcdir}/blender/build_files/cmake/config/blender_release.cmake" \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/usd_python.patch b/usd_python.patch index 1834b1a1571a..a72d75cd6f0e 100644 --- a/usd_python.patch +++ b/usd_python.patch @@ -14,8 +14,8 @@ index ac570f17e47..505aa97934c 100644 if(NOT Boost_FOUND) diff --git a/source/blender/usd/CMakeLists.txt b/source/blender/usd/CMakeLists.txt index 6ea02f44d76..0ec18e17689 100644 ---- a/source/blender/usd/CMakeLists.txt -+++ b/source/blender/usd/CMakeLists.txt +--- a/source/blender/io/usd/CMakeLists.txt ++++ b/source/blender/io/usd/CMakeLists.txt @@ -48,6 +48,7 @@ set(INC set(INC_SYS ${USD_INCLUDE_DIRS} |