archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-28 22:57:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

community/blender to 2.91.0-8

Browse source
This commit is contained in:
Kevin Mihelich 2020-12-21 15:28:16 +00:00
parent 8f615a5667
commit 17da732aae
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
community/blender/PKGBUILD
View file

@ -15,7 +15,7 @@ buildarch=8
pkgname=blender pkgname=blender
pkgver=2.91.0 pkgver=2.91.0
pkgrel=7 pkgrel=8
epoch=17 epoch=17
pkgdesc="A fully integrated 3D graphics creation suite" pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64') arch=('x86_64')
@ -33,12 +33,14 @@ source=("git://git.blender.org/blender.git#tag=v$pkgver"
"git://git.blender.org/blender-addons-contrib.git" "git://git.blender.org/blender-addons-contrib.git"
"git://git.blender.org/blender-translations.git" "git://git.blender.org/blender-translations.git"
"git://git.blender.org/blender-dev-tools.git" "git://git.blender.org/blender-dev-tools.git"
gltf-import-fix.patch
https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip) https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip)
sha512sums=('SKIP' sha512sums=('SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'f9b8faef22ee808d123e54049c803f2f7891019e4a96e7f7ef4206c723761ee91b4d803ae3e1905f132d2c0229eefdb77c93f6d9a256268199d80db407e3786f'
'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491') 'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491')
prepare() { prepare() {
@ -51,11 +53,16 @@ prepare() {
git config submodule."source/tools".url "${srcdir}/blender-dev-tools" git config submodule."source/tools".url "${srcdir}/blender-dev-tools"
git submodule update git submodule update
git submodule foreach git checkout v${pkgver} git submodule foreach git checkout v${pkgver}
# FS#68994
patch -Np2 -d release/scripts/addons -i "${srcdir}"/gltf-import-fix.patch
} }
build() { build() {
cd "$pkgname" cd "$pkgname"
local PYTHON_VER=3.9
cmake . \ cmake . \
-Bbuild \ -Bbuild \
-GNinja \ -GNinja \
@ -66,11 +73,11 @@ build() {
-DWITH_INSTALL_PORTABLE=OFF \ -DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \ -DWITH_PYTHON_INSTALL=OFF \
-DWITH_CYCLES_EMBREE=OFF \ -DWITH_CYCLES_EMBREE=OFF \
-DPYTHON_VERSION=3.9 \ -DPYTHON_VERSION=$PYTHON_VER \
-DPYTHON_LIBPATH=/usr/lib \ -DPYTHON_LIBPATH=/usr/lib \
-DPYTHON_LIBRARY=python3.9 \ -DPYTHON_LIBRARY=python$PYTHON_VER \
-DPYTHON_INCLUDE_DIRS=/usr/include/python3.9 \ -DPYTHON_INCLUDE_DIRS=/usr/include/python$PYTHON_VER \
-DCMAKE_CXX_FLAGS="-I /usr/include/python3.9" -DCMAKE_CXX_FLAGS="-I /usr/include/python$PYTHON_VER"
ninja -C build ninja -C build
} }

11
community/blender/gltf-import-fix.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/blender-addons/io_scene_gltf2/io/imp/gltf2_io_gltf.py 2020-12-20 16:36:07.512946749 -0800
+++ b/blender-addons/io_scene_gltf2/io/imp/gltf2_io_gltf.py 2020-12-20 16:40:12.173781840 -0800
@@ -61,7 +61,7 @@
def bad_constant(val):
raise ImportError('Bad glTF: json contained %s' % val)
try:
- return json.loads(bytes(content), encoding='utf-8', parse_constant=bad_constant)
+ return json.loads(bytes(content), parse_constant=bad_constant)
except ValueError as e:
raise ImportError('Bad glTF: json error: %s' % e.args[0])