diff options
| author | Fredrick Brennan | 2023-05-01 08:45:33 -0400 |
|---|---|---|
| committer | Fredrick Brennan | 2023-05-01 08:45:33 -0400 |
| commit | d1c32a29a233f747ca48f1c2744099145a4ff5a8 (patch) | |
| tree | e8644ce98df2f083d3e06dcbccd1d4f3c562f5cf | |
| parent | 6985108b0777367a85bc5baf0e4fd9711148127b (diff) | |
| download | aur-d1c32a29a233f747ca48f1c2744099145a4ff5a8.tar.gz | |
Version 3.6.r123622.g314866eb3af
More upstream changes.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
2 files changed, 8 insertions, 10 deletions
@@ -1,7 +1,7 @@ pkgbase = blender-git pkgdesc = A fully integrated 3D graphics creation suite (development) - pkgver = 3.6.r123613.g46316b29dc2 - pkgrel = 2 + pkgver = 3.6.r123622.g314866eb3af + pkgrel = 1 url = https://blender.org/ arch = i686 arch = x86_64 @@ -17,8 +17,8 @@ _fragment="${FRAGMENT:-#branch=main}" [[ -v CUDA_ARCH ]] && _CMAKE_FLAGS+=(-DCYCLES_CUDA_BINARIES_ARCH="${CUDA_ARCH}") pkgname=blender-git -pkgver=3.6.r123613.g46316b29dc2 -pkgrel=2 +pkgver=3.6.r123622.g314866eb3af +pkgrel=1 pkgdesc="A fully integrated 3D graphics creation suite (development)" arch=('i686' 'x86_64') url="https://blender.org/" @@ -93,8 +93,8 @@ build() { # determine whether we can install python modules if [ "$_pyver" != "" ]; then - _CMAKE_FLAGS+=( -DWITH_PYTHON_MODULE=ON - -DWITH_PYTHON_INSTALL=OFF + _CMAKE_FLAGS+=( -DWITH_PYTHON=ON + -DWITH_PYTHON_INSTALL=ON -DWITH_PYTHON_SAFETY=OFF ) fi @@ -119,8 +119,7 @@ build() { _CMAKE_FLAGS+=( -DWITH_CYCLES_CUDA_BINARIES=ON # https://wiki.blender.org/wiki/Building_Blender/GPU_Binaries -DWITH_COMPILER_ASAN=OFF - -DCMAKE_CUDA_HOST_COMPILER=`which gcc-11` - -DCUDA_TOOLKIT_ROOT_DIR=/opt/cuda ) + -DCMAKE_CUDA_HOST_COMPILER=`which gcc-11` ) fi # check for materialx @@ -158,7 +157,6 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DWITH_INSTALL_PORTABLE=OFF \ -DWITH_LIBS_PRECOMPILED=OFF \ - -DOCLOC_INSTALL_DIR=/usr/bin \ -DXR_OPENXR_SDK_ROOT_DIR=/usr \ -DPYTHON_VERSION="${_pyver}" \ "${_CMAKE_FLAGS[@]}" @@ -180,7 +178,7 @@ EOF package() { _suffix=${pkgver%%.r*} - DESTDIR="$pkgdir" ninja -C "$srcdir/build" install + cmake "$srcdir/build" -DDESTDIR="$pkgdir" install if [[ -e "$pkgdir/usr/share/blender/${_suffix}/scripts/addons/cycles/lib/" ]] ; then # make sure the cuda kernels are not stripped |