diff options
| -rw-r--r-- | libre/blender/PKGBUILD | 40 | ||||
| -rw-r--r-- | libre/blender/arm-no-sse2.patch | 15 | ||||
| -rw-r--r-- | libre/blender/python3.7.patch | 13 | ||||
| -rw-r--r-- | libre/blender/stl_export_iter.patch | 13 |
4 files changed, 11 insertions, 70 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 5e5f920a4..1df586ee9 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -7,7 +7,7 @@ # parabola changes and rationale: # - removed support for CUDA -# Sometimes blender.org takes some time to release patch releases and because users +# Sometimes blender.org takes some time to release patch releases and because Arch users # are impatient, we sometimes need to build from git directly. # Update because I get so many queries on this: # Due to our other rolling deps, it's sometimes not possible to build Blender stable releases. @@ -15,13 +15,13 @@ # or simply roll with a new version. I usually choose the latter when the former seems # unreasonable. -# _gittag=v2.79b -_gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716 +_gittag=v2.80 +# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716 pkgname=blender -pkgver=2.79.b -[[ -n $_gitcommit ]] && pkgver=${pkgver}.git7.${_gitcommit:0:8} -pkgrel=2 +pkgver=2.80 +[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8} +pkgrel=7 pkgrel+=.parabola1 epoch=17 pkgdesc="A fully integrated 3D graphics creation suite" @@ -35,15 +35,12 @@ depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requ 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'alembic' 'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage' 'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2') -makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm') +makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'ninja') options=(!strip) source=("git://git.blender.org/blender-addons.git" "git://git.blender.org/blender-addons-contrib.git" "git://git.blender.org/blender-translations.git" "git://git.blender.org/blender-dev-tools.git" - "git://git.blender.org/scons.git" - stl_export_iter.patch - python3.7.patch arm-no-sse2.patch) if [[ -n $_gittag ]]; then @@ -55,9 +52,6 @@ sha512sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' - '51f30acc407179f003d1dbec25fb47b0bf1fe8d2eb16e069a6ca83ab8b21f6032d636a42e0b140537ad1ad25ad38c52a87a2a33e51822729ab196fcef4682818' - 'f5564e8db242f6fa9cd951590f4c6de8f5b1a8bbd73aeb6e837a840dd2696e71f7b6bb1c94f9c2377b199159f87a95bead8ee113c01e8763f3843918395cc177' '927680b39b3666f6599e4ebcb52b57476b42e9ed89b7e40060c38cd0c36130be86eabdf7c5b8be54f11f26dc222e423fa3e494ede8d6d83c38863241563f181a' 'SKIP') @@ -69,14 +63,11 @@ prepare() { git config submodule."release/scripts/addons_contrib".url ${srcdir}/blender-addons-contrib git config submodule."release/datafiles/locale".url ${srcdir}/blender-translations git config submodule."source/tools".url ${srcdir}/blender-dev-tools - git config submodule."scons".url ${srcdir}/scons git submodule update # fix OS Name (pedantic, I know) sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' 'source/creator/buildinfo.c' - patch -Np1 -i "$srcdir"/stl_export_iter.patch - patch -Np1 -i "$srcdir"/python3.7.patch -d release/scripts/addons_contrib if [[ "$CARCH" == arm* ]]; then patch -Np1 -i "$srcdir"/arm-no-sse2.patch fi @@ -87,33 +78,24 @@ fi build() { cd "$srcdir/$pkgname-$pkgver"/build - cmake -C../build_files/cmake/config/blender_release.cmake .. \ + cmake -GNinja -C../build_files/cmake/config/blender_release.cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_INSTALL_PORTABLE=OFF \ -DWITH_PYTHON_INSTALL=OFF \ - -DOPENIMAGEIO_ROOT_DIR=/usr \ - -DWITH_SYSTEM_OPENJPEG=ON \ - -DWITH_GL_PROFILE_CORE=OFF \ - -DWITH_GL_PROFILE_ES20=OFF \ - -DWITH_LLVM=ON \ -DWITH_CYCLES_CUDA_BINARIES='OFF' \ -DWITH_CYCLES_DEVICE_CUDA='OFF' \ - -DWITH_CYCLES_PTEX=OFF \ -DPYTHON_VERSION=3.7 \ -DPYTHON_LIBPATH=/usr/lib \ -DPYTHON_LIBRARY=python3.7m \ - -DPYTHON_INCLUDE_DIRS=/usr/include/python3.7m \ - -DOPENVDB_USE_DEPRECATED_ABI=ON - make - - # PTEX is currently broken and experimental in blender anyway + -DPYTHON_INCLUDE_DIRS=/usr/include/python3.7m + ninja } package() { cd "$srcdir/$pkgname-$pkgver/build" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install install -Dm755 ../release/bin/blender-softwaregl "${pkgdir}/usr/bin/blender-softwaregl" python -m compileall "${pkgdir}/usr/share/blender" python -O -m compileall "${pkgdir}/usr/share/blender" diff --git a/libre/blender/arm-no-sse2.patch b/libre/blender/arm-no-sse2.patch deleted file mode 100644 index 80a1267c4..000000000 --- a/libre/blender/arm-no-sse2.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp -index 16908b0244a..96aeeaa8081 100644 ---- a/intern/cycles/device/device_cpu.cpp -+++ b/intern/cycles/device/device_cpu.cpp -@@ -719,8 +719,8 @@ public: - int start_sample = tile.start_sample; - int end_sample = tile.start_sample + tile.num_samples; - -- _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON); -- _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON); -+// n/a to arm _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON); -+// n/a to arm _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON); - - for(int sample = start_sample; sample < end_sample; sample++) { - if(task.get_cancel() || task_pool.canceled()) { diff --git a/libre/blender/python3.7.patch b/libre/blender/python3.7.patch deleted file mode 100644 index 85fa6c6f5..000000000 --- a/libre/blender/python3.7.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/object_facemap_auto/auto_fmap_widgets.py b/object_facemap_auto/auto_fmap_widgets.py -index 5b26f75..646e844 100644 ---- a/object_facemap_auto/auto_fmap_widgets.py -+++ b/object_facemap_auto/auto_fmap_widgets.py -@@ -324,7 +324,7 @@ class AutoFaceMapWidgetGroup(ManipulatorGroup): - - # foo;bar=baz;bonzo=bingo --> {"bar": baz", "bonzo": bingo} - mpr.fmap_target_rules = dict( -- item.partition("=")[::2] for item in fmap_rules, -+ item.partition("=")[::2] for item in fmap_rules - ) - - # XXX, we might want to have some way to extract a 'center' from a face-map diff --git a/libre/blender/stl_export_iter.patch b/libre/blender/stl_export_iter.patch deleted file mode 100644 index edf985e88..000000000 --- a/libre/blender/stl_export_iter.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/release/scripts/addons/io_mesh_stl/blender_utils.py b/release/scripts/addons/io_mesh_stl/blender_utils.py -index 864335ab..c74853db 100644 ---- a/release/scripts/addons/io_mesh_stl/blender_utils.py -+++ b/release/scripts/addons/io_mesh_stl/blender_utils.py -@@ -86,7 +86,7 @@ def faces_from_mesh(ob, global_matrix, use_mesh_modifiers=False, triangulate=Tru - try: - mesh = ob.to_mesh(bpy.context.scene, use_mesh_modifiers, "PREVIEW") - except RuntimeError: -- raise StopIteration -+ return - - mat = global_matrix * ob.matrix_world - mesh.transform(mat) |