diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2023-01-11 23:36:32 -0500 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2023-01-14 20:00:07 -0500 |
| commit | dc268f3d78a985d2268d8bcc60b3f1c80a480d70 (patch) | |
| tree | 54a0d22b672f10bca19110de99a5060a31c87c30 /libre/blender | |
| parent | 492beebfd81f416cfa9037e239db43cf467c20ee (diff) | |
[blender]: upgrade to v3.4.1
Diffstat (limited to 'libre/blender')
| -rw-r--r-- | libre/blender/PKGBUILD | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index c8fdf90f9..a5c6d5ad3 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -28,7 +28,7 @@ pkgname=blender -pkgver=3.3.1 +pkgver=3.4.1 pkgrel=6 pkgrel+=.parabola2 epoch=17 @@ -64,7 +64,7 @@ sha512sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' # dummy-source + 'SKIP' # dummy-source for non-free optix 'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0' '527ab66e5eace777de0043c1ca5787a488f6471450ce67fd6d08137ad0ef56177bc0c17696f30a5fca23fa55d8ca9c3f30cb7b17550dba2dbd8e89ca0b361990') sha512sums_i686=('87da2bedb90af6dee559ef9d1eb83262ba75fb412aba83dcb2b88fe9c0740ff75ad336331033fec7a14ad6ecc3dd70f8f4742f147594e8dc530197dd51922c01') @@ -151,11 +151,14 @@ prepare() { sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' 'source/creator/buildinfo.c' } +get_pyver() { + case "${CARCH}" in armv7h) echo 3.10 ;; i686) echo 3.10 ;; *) echo 3.10 ;; esac +} + build() { cd "$pkgname" - local PYTHON_VER=3.10 - case "${CARCH}" in armv7h) PYTHON_VER=3.10 ;; i686) PYTHON_VER=3.10 ;; esac + local PYTHON_VER="$(get_pyver)" # libre configuration local _parabola_opts=( -DWITH_CYCLES_CUDA_BINARIES=OFF \ @@ -171,15 +174,16 @@ build() { -Bbuild \ -GNinja \ -Cbuild_files/cmake/config/blender_release.cmake \ + -C precache \ ${_parabola_opts[@]} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_INSTALL_PORTABLE=OFF \ -DWITH_PYTHON_INSTALL=OFF \ - -DPYTHON_VERSION=$PYTHON_VER \ + -DPYTHON_VERSION="$PYTHON_VER" \ -DPYTHON_LIBPATH=/usr/lib \ - -DPYTHON_LIBRARY=python$PYTHON_VER \ - -DPYTHON_INCLUDE_DIRS=/usr/include/python$PYTHON_VER \ + -DPYTHON_LIBRARY="python$PYTHON_VER" \ + -DPYTHON_INCLUDE_DIRS="/usr/include/python$PYTHON_VER" \ -DCMAKE_CXX_FLAGS="-I /usr/include/python$PYTHON_VER" cmake --build build } @@ -212,7 +216,7 @@ package() { cp -r release/scripts/addons_contrib/* "${pkgdir}"/usr/share/blender/3*/scripts/addons_contrib/ # Manually install draco bindings (See FS#73415) - mkdir -p "${pkgdir}"/usr/lib/python3.10/ + mkdir -p "${pkgdir}/usr/lib/python$(get_pyver)"/ mv "${pkgdir}"/usr/share/blender/3*/python/lib/* "${pkgdir}"/usr/lib/ rm -r "${pkgdir}"/usr/share/blender/3*/python } |