[arch-commits] Commit in blender/repos/community-testing-x86_64 (4 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sat Jul 13 05:16:26 UTC 2019
Date: Saturday, July 13, 2019 @ 05:16:25
Author: svenstaro
Revision: 489347
archrelease: copy trunk to community-testing-x86_64
Added:
blender/repos/community-testing-x86_64/PKGBUILD
(from rev 489346, blender/trunk/PKGBUILD)
Deleted:
blender/repos/community-testing-x86_64/PKGBUILD
blender/repos/community-testing-x86_64/python3.7.patch
blender/repos/community-testing-x86_64/stl_export_iter.patch
-----------------------+
PKGBUILD | 175 ++++++++++++++++++++++--------------------------
python3.7.patch | 13 ---
stl_export_iter.patch | 13 ---
3 files changed, 83 insertions(+), 118 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-07-13 05:16:20 UTC (rev 489346)
+++ PKGBUILD 2019-07-13 05:16:25 UTC (rev 489347)
@@ -1,92 +0,0 @@
-# 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.80-rc1
-# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
-
-pkgname=blender
-pkgver=2.80rc1
-[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
-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")
-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')
-
-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 submodule update
-
- 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-testing-x86_64/PKGBUILD (from rev 489346, blender/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-07-13 05:16:25 UTC (rev 489347)
@@ -0,0 +1,83 @@
+# 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.80-rc1
+# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
+
+pkgname=blender
+pkgver=2.80rc1
+[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_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' 'ninja')
+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")
+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')
+
+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 submodule update
+
+ mkdir build
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"/build
+
+ 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 \
+ -DPYTHON_VERSION=3.7 \
+ -DPYTHON_LIBPATH=/usr/lib \
+ -DPYTHON_LIBRARY=python3.7m \
+ -DPYTHON_INCLUDE_DIRS=/usr/include/python3.7m
+ ninja
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver/build"
+
+ 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"
+}
Deleted: python3.7.patch
===================================================================
--- python3.7.patch 2019-07-13 05:16:20 UTC (rev 489346)
+++ python3.7.patch 2019-07-13 05:16:25 UTC (rev 489347)
@@ -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
Deleted: stl_export_iter.patch
===================================================================
--- stl_export_iter.patch 2019-07-13 05:16:20 UTC (rev 489346)
+++ stl_export_iter.patch 2019-07-13 05:16:25 UTC (rev 489347)
@@ -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)
More information about the arch-commits
mailing list