[arch-commits] Commit in blender/repos (4 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Tue Dec 25 19:48:40 UTC 2018
Date: Tuesday, December 25, 2018 @ 19:48:40
Author: svenstaro
Revision: 418092
archrelease: copy trunk to community-staging-x86_64
Added:
blender/repos/community-staging-x86_64/
blender/repos/community-staging-x86_64/PKGBUILD
(from rev 418091, blender/trunk/PKGBUILD)
blender/repos/community-staging-x86_64/python3.7.patch
(from rev 418091, blender/trunk/python3.7.patch)
blender/repos/community-staging-x86_64/stl_export_iter.patch
(from rev 418091, blender/trunk/stl_export_iter.patch)
-----------------------+
PKGBUILD | 102 ++++++++++++++++++++++++++++++++++++++++++++++++
python3.7.patch | 13 ++++++
stl_export_iter.patch | 13 ++++++
3 files changed, 128 insertions(+)
Copied: blender/repos/community-staging-x86_64/PKGBUILD (from rev 418091, blender/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2018-12-25 19:48:40 UTC (rev 418092)
@@ -0,0 +1,102 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: John Sowiak <john at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+
+# 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.
+# More often than not, a new openshadinglanguage breaks it and I could either backport fixes
+# or simply roll with a new version. I usually choose the latter when the former seems
+# unreasonable.
+
+# _gittag=v2.79b
+_gitcommit=2c0c1f494dcfadb3c01d23e2348e28bc8864e9f3
+
+pkgname=blender
+pkgver=2.79.b
+[[ -n $_gitcommit ]] && pkgver=${pkgver}.git4.${_gitcommit:0:8}
+pkgrel=2
+epoch=17
+pkgdesc="A fully integrated 3D graphics creation suite"
+arch=('x86_64')
+license=('GPL')
+url="http://www.blender.org"
+depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requests'
+ 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' 'openjpeg' 'python-numpy'
+ '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' 'cuda')
+optdepends=('cuda: cycles renderer cuda support')
+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)
+if [[ -n $_gittag ]]; then
+ source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
+elif [[ -n $_gitcommit ]]; then
+ source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}")
+fi
+sha512sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '51f30acc407179f003d1dbec25fb47b0bf1fe8d2eb16e069a6ca83ab8b21f6032d636a42e0b140537ad1ad25ad38c52a87a2a33e51822729ab196fcef4682818'
+ 'f5564e8db242f6fa9cd951590f4c6de8f5b1a8bbd73aeb6e837a840dd2696e71f7b6bb1c94f9c2377b199159f87a95bead8ee113c01e8763f3843918395cc177'
+ 'SKIP')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ git submodule init
+ git config submodule."release/scripts/addons".url ${srcdir}/blender-addons
+ 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
+
+ patch -Np1 -i "$srcdir"/stl_export_iter.patch
+ patch -Np1 -i "$srcdir"/python3.7.patch -d release/scripts/addons_contrib
+
+ mkdir build
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"/build
+
+ cmake -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_PTEX=OFF \
+ -DWITH_OPENVDB_3_ABI_COMPATIBLE=ON \
+ -DPYTHON_VERSION=3.7 \
+ -DPYTHON_LIBPATH=/usr/lib \
+ -DPYTHON_LIBRARY=python3.7m \
+ -DPYTHON_INCLUDE_DIRS=/usr/include/python3.7m
+ make
+
+ # PTEX is currently broken and experimental in blender anyway
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver/build"
+
+ make DESTDIR="${pkgdir}" 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"
+}
Copied: blender/repos/community-staging-x86_64/python3.7.patch (from rev 418091, blender/trunk/python3.7.patch)
===================================================================
--- community-staging-x86_64/python3.7.patch (rev 0)
+++ community-staging-x86_64/python3.7.patch 2018-12-25 19:48:40 UTC (rev 418092)
@@ -0,0 +1,13 @@
+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
Copied: blender/repos/community-staging-x86_64/stl_export_iter.patch (from rev 418091, blender/trunk/stl_export_iter.patch)
===================================================================
--- community-staging-x86_64/stl_export_iter.patch (rev 0)
+++ community-staging-x86_64/stl_export_iter.patch 2018-12-25 19:48:40 UTC (rev 418092)
@@ -0,0 +1,13 @@
+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)
More information about the arch-commits
mailing list