[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, December 28, 2020 @ 03:14:43
Author: svenstaro
Revision: 794324
upgpkg: blender 17:2.91.0-9: openvdb 8.0.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-28 02:57:59 UTC (rev 794323)
+++ PKGBUILD2020-12-28 03:14:43 UTC (rev 794324)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.91.0
-pkgrel=8
+pkgrel=9
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD gltf-import-fix.patch)
Date: Monday, December 21, 2020 @ 09:08:02
Author: svenstaro
Revision: 780867
upgpkg: blender 17:2.91.0-8: Fix GLTF import (FS#68994)
Added:
blender/trunk/gltf-import-fix.patch
Modified:
blender/trunk/PKGBUILD
---+
PKGBUILD | 17 -
gltf-import-fix.patch | 11 +++
2 files changed, 23 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-21 08:51:49 UTC (rev 780866)
+++ PKGBUILD2020-12-21 09:08:02 UTC (rev 780867)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.91.0
-pkgrel=7
+pkgrel=8
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -27,6 +27,7 @@
"git://git.blender.org/blender-addons-contrib.git"
"git://git.blender.org/blender-translations.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)
sha512sums=('SKIP'
'SKIP'
@@ -33,6 +34,7 @@
'SKIP'
'SKIP'
'SKIP'
+
'f9b8faef22ee808d123e54049c803f2f7891019e4a96e7f7ef4206c723761ee91b4d803ae3e1905f132d2c0229eefdb77c93f6d9a256268199d80db407e3786f'
'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491')
prepare() {
@@ -45,11 +47,16 @@
git config submodule."source/tools".url "${srcdir}/blender-dev-tools"
git submodule update
git submodule foreach git checkout v${pkgver}
+
+ # FS#68994
+ patch -Np2 -d release/scripts/addons -i "${srcdir}"/gltf-import-fix.patch
}
build() {
cd "$pkgname"
+ local PYTHON_VER=3.9
+
cmake . \
-Bbuild \
-GNinja \
@@ -60,11 +67,11 @@
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \
--DPYTHON_VERSION=3.9 \
+-DPYTHON_VERSION=$PYTHON_VER \
-DPYTHON_LIBPATH=/usr/lib \
--DPYTHON_LIBRARY=python3.9 \
--DPYTHON_INCLUDE_DIRS=/usr/include/python3.9 \
--DCMAKE_CXX_FLAGS="-I /usr/include/python3.9"
+-DPYTHON_LIBRARY=python$PYTHON_VER \
+-DPYTHON_INCLUDE_DIRS=/usr/include/python$PYTHON_VER \
+-DCMAKE_CXX_FLAGS="-I /usr/include/python$PYTHON_VER"
ninja -C build
}
Added: gltf-import-fix.patch
===
--- gltf-import-fix.patch (rev 0)
+++ gltf-import-fix.patch 2020-12-21 09:08:02 UTC (rev 780867)
@@ -0,0 +1,11 @@
+--- a/blender-addons/io_scene_gltf2/io/imp/gltf2_io_gltf.py2020-12-20
16:36:07.512946749 -0800
b/blender-addons/io_scene_gltf2/io/imp/gltf2_io_gltf.py2020-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])
+
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, December 18, 2020 @ 01:04:18
Author: svenstaro
Revision: 778373
upgpkg: blender 17:2.91.0-7: openvdb 7.2.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-18 01:03:30 UTC (rev 778372)
+++ PKGBUILD2020-12-18 01:04:18 UTC (rev 778373)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.91.0
-pkgrel=6
+pkgrel=7
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Saturday, December 12, 2020 @ 15:50:16
Author: felixonmars
Revision: 773346
upgpkg: blender 17:2.91.0-6: boost 1.75.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-12 15:48:08 UTC (rev 773345)
+++ PKGBUILD2020-12-12 15:50:16 UTC (rev 773346)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.91.0
-pkgrel=5
+pkgrel=6
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Sunday, December 6, 2020 @ 21:55:00
Author: felixonmars
Revision: 771220
upgpkg: blender 17:2.91.0-5: boost 1.74.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-06 21:53:11 UTC (rev 771219)
+++ PKGBUILD2020-12-06 21:55:00 UTC (rev 771220)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.91.0
-pkgrel=4
+pkgrel=5
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Saturday, November 28, 2020 @ 01:06:37
Author: svenstaro
Revision: 764920
upgpkg: blender 17:2.91.0-4: Add USD support
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-11-28 01:06:33 UTC (rev 764919)
+++ PKGBUILD2020-11-28 01:06:37 UTC (rev 764920)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.91.0
-pkgrel=3
+pkgrel=4
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -63,7 +63,8 @@
-DPYTHON_VERSION=3.9 \
-DPYTHON_LIBPATH=/usr/lib \
-DPYTHON_LIBRARY=python3.9 \
--DPYTHON_INCLUDE_DIRS=/usr/include/python3.9
+-DPYTHON_INCLUDE_DIRS=/usr/include/python3.9 \
+-DCMAKE_CXX_FLAGS="-I /usr/include/python3.9"
ninja -C build
}
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, November 27, 2020 @ 23:22:17
Author: svenstaro
Revision: 764795
upgpkg: blender 17:2.91.0-3: Add potrace support (FS#68753)
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-11-27 23:22:00 UTC (rev 764794)
+++ PKGBUILD2020-11-27 23:22:17 UTC (rev 764795)
@@ -8,13 +8,13 @@
pkgname=blender
pkgver=2.91.0
-pkgrel=2
+pkgrel=3
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'
+depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils'
'python-requests' 'potrace'
'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew'
'openjpeg2' 'python-numpy'
'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
'alembic' 'openxr'
'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
'openimagedenoise'
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, November 25, 2020 @ 17:49:30
Author: svenstaro
Revision: 761157
upgpkg: blender 17:2.91.0-2
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-11-25 17:49:24 UTC (rev 761156)
+++ PKGBUILD2020-11-25 17:49:30 UTC (rev 761157)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.91.0
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -60,10 +60,10 @@
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \
--DPYTHON_VERSION=3.8 \
+-DPYTHON_VERSION=3.9 \
-DPYTHON_LIBPATH=/usr/lib \
--DPYTHON_LIBRARY=python3.8 \
--DPYTHON_INCLUDE_DIRS=/usr/include/python3.8
+-DPYTHON_LIBRARY=python3.9 \
+-DPYTHON_INCLUDE_DIRS=/usr/include/python3.9
ninja -C build
}
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, November 25, 2020 @ 17:32:25
Author: svenstaro
Revision: 761127
upgpkg: blender 17:2.91.0-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 17 +
1 file changed, 5 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-11-25 17:22:41 UTC (rev 761126)
+++ PKGBUILD2020-11-25 17:32:25 UTC (rev 761127)
@@ -7,8 +7,8 @@
# fine with them.
pkgname=blender
-pkgver=2.90.1
-pkgrel=5
+pkgver=2.91.0
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -27,8 +27,6 @@
"git://git.blender.org/blender-addons-contrib.git"
"git://git.blender.org/blender-translations.git"
"git://git.blender.org/blender-dev-tools.git"
-
https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/91aeb452ab251b307311fe869e8e14df945ec6bc
-cuda11.patch
https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip)
sha512sums=('SKIP'
'SKIP'
@@ -35,8 +33,6 @@
'SKIP'
'SKIP'
'SKIP'
-
'46358fe7dab620eb9a7414baa851e7d28818b7c2845f723f7dd0f4b0f721902583a6b57c9c2d5e153c5057cc958727489d301c5195dfd3befee96cde539d813a'
-
'76d55f49cf0475d3050a3ff534da47345aae862fd5ee0e336143c041ef58c5d4ebd6e922eb8a23c01cc35d19537c46698910b0b52a090cdcea4e5f67e4fb5650'
'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491')
prepare() {
@@ -49,9 +45,6 @@
git config submodule."source/tools".url "${srcdir}/blender-dev-tools"
git submodule update
git submodule foreach git checkout v${pkgver}
-
- patch -Np1 -i "$srcdir"/91aeb452ab251b307311fe869e8e14df945ec6bc
- patch -Np1 -i "$srcdir"/cuda11.patch
}
build() {
@@ -67,10 +60,10 @@
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \
--DPYTHON_VERSION=3.9 \
+-DPYTHON_VERSION=3.8 \
-DPYTHON_LIBPATH=/usr/lib \
--DPYTHON_LIBRARY=python3.9 \
--DPYTHON_INCLUDE_DIRS=/usr/include/python3.9
+-DPYTHON_LIBRARY=python3.8 \
+-DPYTHON_INCLUDE_DIRS=/usr/include/python3.8
ninja -C build
}
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Saturday, November 21, 2020 @ 21:46:19
Author: svenstaro
Revision: 758631
upgpkg: blender 17:2.90.1-5: python 3.9 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-11-21 21:44:00 UTC (rev 758630)
+++ PKGBUILD2020-11-21 21:46:19 UTC (rev 758631)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.90.1
-pkgrel=4
+pkgrel=5
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -67,10 +67,10 @@
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \
--DPYTHON_VERSION=3.8 \
+-DPYTHON_VERSION=3.9 \
-DPYTHON_LIBPATH=/usr/lib \
--DPYTHON_LIBRARY=python3.8 \
--DPYTHON_INCLUDE_DIRS=/usr/include/python3.8
+-DPYTHON_LIBRARY=python3.9 \
+-DPYTHON_INCLUDE_DIRS=/usr/include/python3.9
ninja -C build
}
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Saturday, November 21, 2020 @ 21:25:30
Author: svenstaro
Revision: 758623
upgpkg: blender 17:2.90.1-4: Add OpenXR support (FS#68652)
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-11-21 21:20:46 UTC (rev 758622)
+++ PKGBUILD2020-11-21 21:25:30 UTC (rev 758623)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.90.1
-pkgrel=3
+pkgrel=4
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -16,7 +16,7 @@
url="http://www.blender.org;
depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils'
'python-requests'
'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew'
'openjpeg2' 'python-numpy'
- 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
'alembic'
+ 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
'alembic' 'openxr'
'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
'openimagedenoise'
'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus'
'sdl2' 'embree')
makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda' 'ninja')
@@ -67,10 +67,10 @@
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \
--DPYTHON_VERSION=3.9 \
+-DPYTHON_VERSION=3.8 \
-DPYTHON_LIBPATH=/usr/lib \
--DPYTHON_LIBRARY=python3.9 \
--DPYTHON_INCLUDE_DIRS=/usr/include/python3.9
+-DPYTHON_LIBRARY=python3.8 \
+-DPYTHON_INCLUDE_DIRS=/usr/include/python3.8
ninja -C build
}
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, September 29, 2020 @ 00:32:57
Author: svenstaro
Revision: 713595
upgpkg: blender 17:2.90.1-2: cuda 11.1 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-09-29 00:32:50 UTC (rev 713594)
+++ PKGBUILD2020-09-29 00:32:57 UTC (rev 713595)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.90.1
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, September 23, 2020 @ 12:13:28
Author: svenstaro
Revision: 711493
upgpkg: blender 17:2.90.1-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-09-23 11:42:26 UTC (rev 711492)
+++ PKGBUILD2020-09-23 12:13:28 UTC (rev 711493)
@@ -7,8 +7,8 @@
# fine with them.
pkgname=blender
-pkgver=2.90.0
-pkgrel=3
+pkgver=2.90.1
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, September 4, 2020 @ 21:25:17
Author: svenstaro
Revision: 698652
upgpkg: blender 17:2.90.0-3: openimageio and openshadinglanguage rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-09-04 21:13:37 UTC (rev 698651)
+++ PKGBUILD2020-09-04 21:25:17 UTC (rev 698652)
@@ -8,7 +8,7 @@
pkgname=blender
pkgver=2.90.0
-pkgrel=2
+pkgrel=3
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, September 4, 2020 @ 20:18:24
Author: svenstaro
Revision: 698581
upgpkg: blender 17:2.90.0-2: Explicitly set current tag version for all
submodules
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 33 +
1 file changed, 9 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-09-04 20:18:16 UTC (rev 698580)
+++ PKGBUILD2020-09-04 20:18:24 UTC (rev 698581)
@@ -2,25 +2,13 @@
# Contributor: John Sowiak
# Contributor: tobias
-# 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.
-
# For legal reasons, we can't separately package the Optix headers so we'll
# just build the package against them. I checked with NVIDIA and this way is
# fine with them.
-_gittag=v2.90.0
-# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
-
pkgname=blender
pkgver=2.90.0
-[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -34,7 +22,8 @@
makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda' 'ninja')
optdepends=('cuda: cycles renderer cuda support')
options=(!strip)
-source=("git://git.blender.org/blender-addons.git"
+source=("git://git.blender.org/blender.git#tag=v$pkgver"
+"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"
@@ -41,22 +30,17 @@
https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/91aeb452ab251b307311fe869e8e14df945ec6bc
cuda11.patch
https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip)
-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'
'46358fe7dab620eb9a7414baa851e7d28818b7c2845f723f7dd0f4b0f721902583a6b57c9c2d5e153c5057cc958727489d301c5195dfd3befee96cde539d813a'
'76d55f49cf0475d3050a3ff534da47345aae862fd5ee0e336143c041ef58c5d4ebd6e922eb8a23c01cc35d19537c46698910b0b52a090cdcea4e5f67e4fb5650'
-
'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491'
-'SKIP')
+
'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491')
prepare() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname"
git submodule init
git config submodule."release/scripts/addons".url "${srcdir}/blender-addons"
@@ -64,6 +48,7 @@
git config submodule."release/datafiles/locale".url
"${srcdir}/blender-translations"
git config submodule."source/tools".url "${srcdir}/blender-dev-tools"
git submodule update
+ git submodule foreach git checkout v${pkgver}
patch -Np1 -i "$srcdir"/91aeb452ab251b307311fe869e8e14df945ec6bc
patch -Np1 -i "$srcdir"/cuda11.patch
@@ -70,7 +55,7 @@
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname"
cmake . \
-Bbuild \
@@ -90,7 +75,7 @@
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname"
DESTDIR="${pkgdir}" ninja -C build install
install -Dm755 release/bin/blender-softwaregl
"${pkgdir}/usr/bin/blender-softwaregl"
[arch-commits] Commit in blender/trunk (PKGBUILD cuda11.patch)
Date: Monday, August 31, 2020 @ 20:38:12
Author: svenstaro
Revision: 694409
upgpkg: blender 17:2.90.0-1
Added:
blender/trunk/cuda11.patch
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 20 +---
cuda11.patch | 91 +
2 files changed, 100 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-08-31 20:36:55 UTC (rev 694408)
+++ PKGBUILD2020-08-31 20:38:12 UTC (rev 694409)
@@ -14,13 +14,13 @@
# just build the package against them. I checked with NVIDIA and this way is
# fine with them.
-_gittag=v2.83.5
+_gittag=v2.90.0
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.83.5
+pkgver=2.90.0
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -38,8 +38,8 @@
"git://git.blender.org/blender-addons-contrib.git"
"git://git.blender.org/blender-translations.git"
"git://git.blender.org/blender-dev-tools.git"
-embree.patch
-D8063-cuda11.diff
+
https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/91aeb452ab251b307311fe869e8e14df945ec6bc
+cuda11.patch
https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip)
if [[ -n $_gittag ]]; then
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
@@ -50,8 +50,8 @@
'SKIP'
'SKIP'
'SKIP'
-
'6de779ad8649a034ee65c45a36d7838ac0b8b32c3336b4d476186265c060f56276e3e0a2860ec4bff42bef7d5582ee82238013845f6a697672767a05a455aaca'
-
'7b0dc31c8babaaeed35807d27cc54e6e9fb79a08c4c267244bea2b47149e05089fe495f239fff7d4fff9b1ebcafd588396e8d1db5529dc7ac49d78731575e128'
+
'46358fe7dab620eb9a7414baa851e7d28818b7c2845f723f7dd0f4b0f721902583a6b57c9c2d5e153c5057cc958727489d301c5195dfd3befee96cde539d813a'
+
'76d55f49cf0475d3050a3ff534da47345aae862fd5ee0e336143c041ef58c5d4ebd6e922eb8a23c01cc35d19537c46698910b0b52a090cdcea4e5f67e4fb5650'
'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491'
'SKIP')
@@ -65,10 +65,8 @@
git config submodule."source/tools".url "${srcdir}/blender-dev-tools"
git submodule update
- patch -Np1 -i "$srcdir"/embree.patch
- patch -Np1 -i "$srcdir"/D8063-cuda11.diff
-
- sed -i "s/std=c++11/std=c++14/" CMakeLists.txt
+ patch -Np1 -i "$srcdir"/91aeb452ab251b307311fe869e8e14df945ec6bc
+ patch -Np1 -i "$srcdir"/cuda11.patch
}
build() {
Added: cuda11.patch
===
--- cuda11.patch(rev 0)
+++ cuda11.patch2020-08-31 20:38:12 UTC (rev 694409)
@@ -0,0 +1,91 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 76d2d578dc3..e0c83cb5e18 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -375,7 +375,7 @@ option(WITH_CYCLES_CUDA_BINARIES"Build Cycles CUDA
binaries" OFF)
+ option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler
instead of nvcc" OFF)
+ option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful
on machines with limited RAM)" OFF)
+ mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
+-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70
sm_75 compute_75 CACHE STRING "CUDA architectures to build binaries for")
++set(CYCLES_CUDA_BINARIES_ARCH sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75
compute_75 sm_80 compute_80 CACHE STRING "CUDA architectures to build binaries
for")
+ mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+ unset(PLATFORM_DEFAULT)
+ option(WITH_CYCLES_LOGGING "Build Cycles with logging support" ON)
+diff --git a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+index c6aa359c82c..8d8bf109958 100644
+--- a/build_files/cmake/config/blender_release.cmake
b/build_files/cmake/config/blender_release.cmake
+@@ -55,7 +55,7 @@ set(WITH_USD ON CACHE BOOL "" FORCE)
+ set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
+-set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;compute_75 CACHE STRING
"" FORCE)
++set(CYCLES_CUDA_BINARIES_ARCH
sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;compute_75;sm_80;compute_80
CACHE STRING "" FORCE)
+ set(WITH_CYCLES_DEVICE_OPTIX ON CACHE BOOL "" FORCE)
+
+ # platform dependent options
+diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
+index e5a5e9773d3..1bc11953db2 100644
+--- a/intern/cycles/CMakeLists.txt
b/intern/cycles/CMakeLists.txt
+@@
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, August 21, 2020 @ 23:02:48
Author: svenstaro
Revision: 686542
upgpkg: blender 17:2.83.5-2: openvdb 7.1 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-08-21 22:59:47 UTC (rev 686541)
+++ PKGBUILD2020-08-21 23:02:48 UTC (rev 686542)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.83.5
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -68,7 +68,7 @@
patch -Np1 -i "$srcdir"/embree.patch
patch -Np1 -i "$srcdir"/D8063-cuda11.diff
- mkdir build
+ sed -i "s/std=c++11/std=c++14/" CMakeLists.txt
}
build() {
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, August 19, 2020 @ 13:24:59
Author: svenstaro
Revision: 684957
upgpkg: blender 17:2.83.5-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-08-19 13:11:47 UTC (rev 684956)
+++ PKGBUILD2020-08-19 13:24:59 UTC (rev 684957)
@@ -14,11 +14,11 @@
# just build the package against them. I checked with NVIDIA and this way is
# fine with them.
-_gittag=v2.83.4
+_gittag=v2.83.5
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.83.4
+pkgver=2.83.5
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
pkgrel=1
epoch=17
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, August 5, 2020 @ 09:08:18
Author: svenstaro
Revision: 669158
upgpkg: blender 17:2.83.4-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-08-05 09:07:58 UTC (rev 669157)
+++ PKGBUILD2020-08-05 09:08:18 UTC (rev 669158)
@@ -14,13 +14,13 @@
# just build the package against them. I checked with NVIDIA and this way is
# fine with them.
-_gittag=v2.83.3
+_gittag=v2.83.4
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.83.3
+pkgver=2.83.4
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=3
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -40,7 +40,6 @@
"git://git.blender.org/blender-dev-tools.git"
embree.patch
D8063-cuda11.diff
-D8355-ffmpeg43.patch
https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip)
if [[ -n $_gittag ]]; then
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
@@ -53,7 +52,6 @@
'SKIP'
'6de779ad8649a034ee65c45a36d7838ac0b8b32c3336b4d476186265c060f56276e3e0a2860ec4bff42bef7d5582ee82238013845f6a697672767a05a455aaca'
'7b0dc31c8babaaeed35807d27cc54e6e9fb79a08c4c267244bea2b47149e05089fe495f239fff7d4fff9b1ebcafd588396e8d1db5529dc7ac49d78731575e128'
-
'70e3bd8762c573cac4ec1d6772cdaab3ce6a248c26c78cbfe729d29058b3bf764305ee02525529955f292ad682883433ca20a91096ccb10d0cfe0148a67ee15f'
'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491'
'SKIP')
@@ -70,9 +68,6 @@
patch -Np1 -i "$srcdir"/embree.patch
patch -Np1 -i "$srcdir"/D8063-cuda11.diff
- # Fix crash with ffmpeg 4.3 (https://bugs.archlinux.org/task/67402)
- patch -Np1 -i "$srcdir"/D8355-ffmpeg43.patch
-
mkdir build
}
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, July 22, 2020 @ 10:56:06
Author: svenstaro
Revision: 664819
upgpkg: blender 17:2.83.3-2
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-22 10:53:26 UTC (rev 664818)
+++ PKGBUILD2020-07-22 10:56:06 UTC (rev 664819)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.83.3
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, July 22, 2020 @ 10:53:18
Author: svenstaro
Revision: 664817
upgpkg: blender 17:2.83.3-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-22 08:55:08 UTC (rev 664816)
+++ PKGBUILD2020-07-22 10:53:18 UTC (rev 664817)
@@ -14,13 +14,13 @@
# just build the package against them. I checked with NVIDIA and this way is
# fine with them.
-_gittag=v2.83.2
+_gittag=v2.83.3
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.83.2
+pkgver=2.83.3
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, July 9, 2020 @ 18:12:40
Author: svenstaro
Revision: 662988
upgpkg: blender 17:2.83.2-2
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-09 18:04:34 UTC (rev 662987)
+++ PKGBUILD2020-07-09 18:12:40 UTC (rev 662988)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.83.2
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, July 9, 2020 @ 17:49:48
Author: svenstaro
Revision: 661978
upgpkg: blender 17:2.83.2-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-09 17:49:47 UTC (rev 661977)
+++ PKGBUILD2020-07-09 17:49:48 UTC (rev 661978)
@@ -14,13 +14,13 @@
# just build the package against them. I checked with NVIDIA and this way is
# fine with them.
-_gittag=v2.83.1
+_gittag=v2.83.2
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.83.1
+pkgver=2.83.2
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, June 3, 2020 @ 22:06:26
Author: svenstaro
Revision: 638604
upgpkg: blender 17:2.83-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-03 22:02:26 UTC (rev 638603)
+++ PKGBUILD2020-06-03 22:06:26 UTC (rev 638604)
@@ -14,13 +14,13 @@
# just build the package against them. I checked with NVIDIA and this way is
# fine with them.
-_gittag=v2.82a
+_gittag=v2.83
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.82.a
+pkgver=2.83
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=8
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, June 2, 2020 @ 23:50:08
Author: svenstaro
Revision: 638140
upgpkg: blender 17:2.82.a-8
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-02 23:42:36 UTC (rev 638139)
+++ PKGBUILD2020-06-02 23:50:08 UTC (rev 638140)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.82.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=7
+pkgrel=8
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, June 2, 2020 @ 13:26:48
Author: svenstaro
Revision: 638056
upgpkg: blender 17:2.82.a-7: Include AppStream metadata file (FS#66859)
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-02 13:22:24 UTC (rev 638055)
+++ PKGBUILD2020-06-02 13:26:48 UTC (rev 638056)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.82.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=6
+pkgrel=7
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -94,4 +94,6 @@
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"
+
+ install -Dm644 ../release/freedesktop/org.blender.Blender.appdata.xml
"${pkgdir}/usr/share/metainfo/org.blender.Blender.appdata.xml"
}
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, May 13, 2020 @ 23:19:52
Author: svenstaro
Revision: 627799
upgpkg: blender 17:2.82.a-6
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-13 22:52:50 UTC (rev 627798)
+++ PKGBUILD2020-05-13 23:19:52 UTC (rev 627799)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.82.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=5
+pkgrel=6
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, May 12, 2020 @ 10:11:52
Author: arojas
Revision: 626700
openexr 2.5.1 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-12 10:07:05 UTC (rev 626699)
+++ PKGBUILD2020-05-12 10:11:52 UTC (rev 626700)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.82.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=4
+pkgrel=5
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Saturday, May 9, 2020 @ 17:47:38
Author: arojas
Revision: 626052
openexr 2.5 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-09 17:46:06 UTC (rev 626051)
+++ PKGBUILD2020-05-09 17:47:38 UTC (rev 626052)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.82.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=3
+pkgrel=4
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, April 24, 2020 @ 12:13:06
Author: svenstaro
Revision: 619293
upgpkg: blender 17:2.82.a-3: opensubdiv 3.4.3 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-24 12:12:28 UTC (rev 619292)
+++ PKGBUILD2020-04-24 12:13:06 UTC (rev 619293)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.82.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=3
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, April 23, 2020 @ 06:43:16
Author: svenstaro
Revision: 617769
upgpkg: blender 17:2.82.a-2: Change openjpeg to openjpeg2 (relates to FS#66331)
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-23 06:09:28 UTC (rev 617768)
+++ PKGBUILD2020-04-23 06:43:16 UTC (rev 617769)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.82.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -27,7 +27,7 @@
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'
+ 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew'
'openjpeg2' 'python-numpy'
'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
'alembic'
'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
'openimagedenoise'
'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus'
'sdl2' 'embree')
[arch-commits] Commit in blender/trunk (PKGBUILD embree.patch)
Date: Saturday, March 14, 2020 @ 11:54:40
Author: svenstaro
Revision: 596693
upgpkg: blender 17:2.82.a-1
Added:
blender/trunk/embree.patch
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 13 +
embree.patch | 43 +++
2 files changed, 52 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-03-14 11:54:01 UTC (rev 596692)
+++ PKGBUILD2020-03-14 11:54:40 UTC (rev 596693)
@@ -14,13 +14,13 @@
# just build the package against them. I checked with NVIDIA and this way is
# fine with them.
-_gittag=v2.82
+_gittag=v2.82a
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.82
+pkgver=2.82.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -30,7 +30,7 @@
'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'
'openimagedenoise'
- 'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus'
'sdl2')
+ 'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus'
'sdl2' 'embree')
makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda' 'ninja')
optdepends=('cuda: cycles renderer cuda support')
options=(!strip)
@@ -38,6 +38,7 @@
"git://git.blender.org/blender-addons-contrib.git"
"git://git.blender.org/blender-translations.git"
"git://git.blender.org/blender-dev-tools.git"
+embree.patch
https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip)
if [[ -n $_gittag ]]; then
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
@@ -48,6 +49,7 @@
'SKIP'
'SKIP'
'SKIP'
+
'6de779ad8649a034ee65c45a36d7838ac0b8b32c3336b4d476186265c060f56276e3e0a2860ec4bff42bef7d5582ee82238013845f6a697672767a05a455aaca'
'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491'
'SKIP')
@@ -61,6 +63,8 @@
git config submodule."source/tools".url "${srcdir}/blender-dev-tools"
git submodule update
+ patch -Np1 -i "$srcdir"/embree.patch
+
mkdir build
}
@@ -71,6 +75,7 @@
-GNinja \
-C../build_files/cmake/config/blender_release.cmake .. \
-DOPTIX_ROOT_DIR="$srcdir"/include \
+-DWITH_CYCLES_EMBREE=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
Added: embree.patch
===
--- embree.patch(rev 0)
+++ embree.patch2020-03-14 11:54:40 UTC (rev 596693)
@@ -0,0 +1,43 @@
+diff --git a/intern/cycles/blender/CMakeLists.txt
b/intern/cycles/blender/CMakeLists.txt
+index d9a2ebf8571..f3b7d156024 100644
+--- a/intern/cycles/blender/CMakeLists.txt
b/intern/cycles/blender/CMakeLists.txt
+@@ -66,6 +66,12 @@ if(WITH_CYCLES_LOGGING)
+ )
+ endif()
+
++if(WITH_CYCLES_EMBREE)
++ list(APPEND LIB
++${EMBREE_LIBRARIES}
++ )
++endif()
++
+ set(ADDON_FILES
+ addon/__init__.py
+ addon/engine.py
+diff --git a/build_files/cmake/Modules/FindEmbree.cmake
b/build_files/cmake/Modules/FindEmbree.cmake
+index d9d525d4586..03b509a28f3 100644
+--- a/build_files/cmake/Modules/FindEmbree.cmake
b/build_files/cmake/Modules/FindEmbree.cmake
+@@ -72,7 +72,7 @@ ENDFOREACH()
+
+ FIND_LIBRARY(EMBREE_LIBRARY
+ NAMES
+-libembree3
++embree3
+ HINTS
+ ${_embree_SEARCH_DIRS}
+ PATH_SUFFIXES
+@@ -83,10 +83,10 @@ FIND_LIBRARY(EMBREE_LIBRARY
+ # all listed variables are TRUE
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(EMBREE DEFAULT_MSG
+-_embree_LIBRARIES EMBREE_INCLUDE_DIR)
++EMBREE_LIBRARY EMBREE_INCLUDE_DIR)
+
+ IF(EMBREE_FOUND)
+- SET(EMBREE_LIBRARIES ${_embree_LIBRARIES})
++ SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY})
+ SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR})
+ ENDIF(EMBREE_FOUND)
+
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, February 28, 2020 @ 18:28:39
Author: svenstaro
Revision: 586645
upgpkg: blender 17:2.82-2: openimageio 2.1.11.2 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-02-28 17:47:34 UTC (rev 586644)
+++ PKGBUILD2020-02-28 18:28:39 UTC (rev 586645)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.82
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, February 14, 2020 @ 16:57:21
Author: svenstaro
Revision: 571144
upgpkg: blender 17:2.82-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-02-14 16:34:42 UTC (rev 571143)
+++ PKGBUILD2020-02-14 16:57:21 UTC (rev 571144)
@@ -14,13 +14,13 @@
# just build the package against them. I checked with NVIDIA and this way is
# fine with them.
-_gittag=v2.81a
+_gittag=v2.82
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.81.a
+pkgver=2.82
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=5
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, January 28, 2020 @ 02:50:05
Author: foutrelis
Revision: 557024
boost 1.72.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-01-28 02:49:17 UTC (rev 557023)
+++ PKGBUILD2020-01-28 02:50:05 UTC (rev 557024)
@@ -20,7 +20,7 @@
pkgname=blender
pkgver=2.81.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=4
+pkgrel=5
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, January 16, 2020 @ 10:53:46
Author: svenstaro
Revision: 552745
upgpkg: blender 17:2.81.a-4: Enable Optix support
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-01-16 07:46:44 UTC (rev 552744)
+++ PKGBUILD2020-01-16 10:53:46 UTC (rev 552745)
@@ -10,6 +10,10 @@
# or simply roll with a new version. I usually choose the latter when the
former seems
# unreasonable.
+# For legal reasons, we can't separately package the Optix headers so we'll
+# just build the package against them. I checked with NVIDIA and this way is
+# fine with them.
+
_gittag=v2.81a
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
@@ -16,7 +20,7 @@
pkgname=blender
pkgver=2.81.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=3
+pkgrel=4
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -33,7 +37,8 @@
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/blender-dev-tools.git"
+
https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip)
if [[ -n $_gittag ]]; then
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
elif [[ -n $_gitcommit ]]; then
@@ -43,6 +48,7 @@
'SKIP'
'SKIP'
'SKIP'
+
'b2cff73def3757d4259f4b4d318a8ccfe166bf7c215cbb2124f1c81bd6e742f96207285b24eb4d99b527b7b97dc6d5e8fdf2f16d78d5d1e2684c26d681328491'
'SKIP')
prepare() {
@@ -64,6 +70,7 @@
cmake \
-GNinja \
-C../build_files/cmake/config/blender_release.cmake .. \
+-DOPTIX_ROOT_DIR="$srcdir"/include \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, December 10, 2019 @ 15:27:22
Author: kgizdov
Revision: 536522
upgpkg: blender 17:2.81.a-3
protobuf rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-10 15:26:42 UTC (rev 536521)
+++ PKGBUILD2019-12-10 15:27:22 UTC (rev 536522)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.81.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=3
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, December 9, 2019 @ 02:23:17
Author: svenstaro
Revision: 536374
upgpkg: blender 17:2.81.a-2: openvdb 7.0.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-09 02:23:00 UTC (rev 536373)
+++ PKGBUILD2019-12-09 02:23:17 UTC (rev 536374)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.81.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, December 9, 2019 @ 01:41:55
Author: svenstaro
Revision: 536369
upgpkg: blender 17:2.81.a-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-09 01:25:21 UTC (rev 536368)
+++ PKGBUILD2019-12-09 01:41:55 UTC (rev 536369)
@@ -10,13 +10,13 @@
# or simply roll with a new version. I usually choose the latter when the
former seems
# unreasonable.
-_gittag=v2.81
+_gittag=v2.81a
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.81
+pkgver=2.81.a
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=3
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, November 27, 2019 @ 07:05:42
Author: svenstaro
Revision: 533877
upgpkg: blender 17:2.81-3
Add openimagedenoise
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-27 07:05:37 UTC (rev 533876)
+++ PKGBUILD2019-11-27 07:05:42 UTC (rev 533877)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.81
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=3
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -25,7 +25,7 @@
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'
+ 'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
'openimagedenoise'
'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus'
'sdl2')
makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda' 'ninja')
optdepends=('cuda: cycles renderer cuda support')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, November 26, 2019 @ 17:02:48
Author: ffy00
Revision: 533488
fix unquoted references to $srcdir
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-26 17:01:47 UTC (rev 533487)
+++ PKGBUILD2019-11-26 17:02:48 UTC (rev 533488)
@@ -49,10 +49,10 @@
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."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
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Sunday, November 24, 2019 @ 03:57:09
Author: svenstaro
Revision: 532437
upgpkg: blender 17:2.81-2
cuda 10.2 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-24 03:43:46 UTC (rev 532436)
+++ PKGBUILD2019-11-24 03:57:09 UTC (rev 532437)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.81
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Sunday, November 24, 2019 @ 03:33:08
Author: svenstaro
Revision: 532433
upgpkg: blender 17:2.81-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-24 03:14:47 UTC (rev 532432)
+++ PKGBUILD2019-11-24 03:33:08 UTC (rev 532433)
@@ -1,4 +1,4 @@
-# Maintainer: Sven-Hendrik Haase
+# Maintainer: Sven-Hendrik Haase
# Contributor: John Sowiak
# Contributor: tobias
@@ -10,13 +10,13 @@
# or simply roll with a new version. I usually choose the latter when the
former seems
# unreasonable.
-_gittag=v2.80
+_gittag=v2.81
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.80
+pkgver=2.81
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=8
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -48,9 +48,6 @@
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # Python 3.8 compatibility fixes
- git cherry-pick -n a7cf7b114f 9dd5e3b6e8 e413b39a93
-
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
@@ -64,7 +61,9 @@
build() {
cd "$srcdir/$pkgname-$pkgver"/build
- cmake -GNinja -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 \
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, November 4, 2019 @ 16:38:01
Author: foutrelis
Revision: 524099
Python 3.8 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 15:57:11 UTC (rev 524098)
+++ PKGBUILD2019-11-04 16:38:01 UTC (rev 524099)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.80
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=7
+pkgrel=8
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -48,6 +48,9 @@
prepare() {
cd "$srcdir/$pkgname-$pkgver"
+ # Python 3.8 compatibility fixes
+ git cherry-pick -n a7cf7b114f 9dd5e3b6e8 e413b39a93
+
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
@@ -66,10 +69,10 @@
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \
--DPYTHON_VERSION=3.7 \
+-DPYTHON_VERSION=3.8 \
-DPYTHON_LIBPATH=/usr/lib \
--DPYTHON_LIBRARY=python3.7m \
--DPYTHON_INCLUDE_DIRS=/usr/include/python3.7m
+-DPYTHON_LIBRARY=python3.8 \
+-DPYTHON_INCLUDE_DIRS=/usr/include/python3.8
ninja
}
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, October 28, 2019 @ 16:47:57
Author: svenstaro
Revision: 520858
upgpkg: blender 17:2.80-7
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-28 16:46:24 UTC (rev 520857)
+++ PKGBUILD2019-10-28 16:47:57 UTC (rev 520858)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.80
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=6
+pkgrel=7
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -66,10 +66,10 @@
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \
--DPYTHON_VERSION=3.8 \
+-DPYTHON_VERSION=3.7 \
-DPYTHON_LIBPATH=/usr/lib \
--DPYTHON_LIBRARY=python3.8m \
--DPYTHON_INCLUDE_DIRS=/usr/include/python3.8m
+-DPYTHON_LIBRARY=python3.7m \
+-DPYTHON_INCLUDE_DIRS=/usr/include/python3.7m
ninja
}
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, October 18, 2019 @ 20:00:06
Author: arojas
Revision: 517054
openexr 2.4 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-18 19:59:44 UTC (rev 517053)
+++ PKGBUILD2019-10-18 20:00:06 UTC (rev 517054)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.80
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=5
+pkgrel=6
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, October 7, 2019 @ 22:56:52
Author: svenstaro
Revision: 514153
upgpkg: blender 17:2.80-5
openvdb 6.2.1 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-07 22:54:48 UTC (rev 514152)
+++ PKGBUILD2019-10-07 22:56:52 UTC (rev 514153)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.80
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=4
+pkgrel=5
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, October 7, 2019 @ 22:23:46
Author: svenstaro
Revision: 514150
upgpkg: blender 17:2.80-4
openvdb 6.2.1 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-07 22:22:24 UTC (rev 514149)
+++ PKGBUILD2019-10-07 22:23:46 UTC (rev 514150)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.80
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=3
+pkgrel=4
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, September 13, 2019 @ 10:29:37
Author: felixonmars
Revision: 510175
boost 1.71.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-09-13 10:29:36 UTC (rev 510174)
+++ PKGBUILD2019-09-13 10:29:37 UTC (rev 510175)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.80
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=3
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, September 3, 2019 @ 13:14:48
Author: svenstaro
Revision: 507406
upgpkg: blender 17:2.80-2
Rebuild against newer cuda
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-09-03 13:13:18 UTC (rev 507405)
+++ PKGBUILD2019-09-03 13:14:48 UTC (rev 507406)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.80
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, July 30, 2019 @ 17:04:37
Author: svenstaro
Revision: 495401
upgpkg: blender 17:2.80-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-30 17:00:16 UTC (rev 495400)
+++ PKGBUILD2019-07-30 17:04:37 UTC (rev 495401)
@@ -10,11 +10,11 @@
# or simply roll with a new version. I usually choose the latter when the
former seems
# unreasonable.
-_gittag=v2.80-rc3
+_gittag=v2.80
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.80rc3
+pkgver=2.80
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
pkgrel=1
epoch=17
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, July 29, 2019 @ 12:12:14
Author: svenstaro
Revision: 494646
upgpkg: blender 17:2.80rc3-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-29 11:59:14 UTC (rev 494645)
+++ PKGBUILD2019-07-29 12:12:14 UTC (rev 494646)
@@ -10,11 +10,11 @@
# or simply roll with a new version. I usually choose the latter when the
former seems
# unreasonable.
-_gittag=v2.80-rc2
+_gittag=v2.80-rc3
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.80rc2
+pkgver=2.80rc3
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
pkgrel=1
epoch=17
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, July 25, 2019 @ 08:06:16
Author: svenstaro
Revision: 492769
upgpkg: blender 17:2.80rc2-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-25 08:06:09 UTC (rev 492768)
+++ PKGBUILD2019-07-25 08:06:16 UTC (rev 492769)
@@ -10,13 +10,13 @@
# or simply roll with a new version. I usually choose the latter when the
former seems
# unreasonable.
-_gittag=v2.80-rc1
+_gittag=v2.80-rc2
# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.80rc1
+pkgver=2.80rc2
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Saturday, July 13, 2019 @ 05:16:20
Author: svenstaro
Revision: 489346
upgpkg: blender 17:2.80rc1-2
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 17 -
1 file changed, 4 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-13 04:32:32 UTC (rev 489345)
+++ PKGBUILD2019-07-13 05:16:20 UTC (rev 489346)
@@ -27,7 +27,7 @@
'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')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda' 'ninja')
optdepends=('cuda: cycles renderer cuda support')
options=(!strip)
source=("git://git.blender.org/blender-addons.git"
@@ -61,31 +61,22 @@
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_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
+ 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"
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Saturday, July 13, 2019 @ 04:09:35
Author: svenstaro
Revision: 489323
upgpkg: blender 17:2.80rc1-2
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-13 04:09:08 UTC (rev 489322)
+++ PKGBUILD2019-07-13 04:09:35 UTC (rev 489323)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.80rc1
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Saturday, July 13, 2019 @ 02:58:44
Author: svenstaro
Revision: 489295
upgpkg: blender 17:2.80rc1-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 22 ++
1 file changed, 6 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-13 02:56:54 UTC (rev 489294)
+++ PKGBUILD2019-07-13 02:58:44 UTC (rev 489295)
@@ -10,13 +10,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-rc1
+# _gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
-pkgver=2.79.b
-[[ -n $_gitcommit ]] && pkgver=${pkgver}.git7.${_gitcommit:0:8}
-pkgrel=2
+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')
@@ -33,10 +33,7 @@
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)
+"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
@@ -46,9 +43,6 @@
'SKIP'
'SKIP'
'SKIP'
-'SKIP'
-
'51f30acc407179f003d1dbec25fb47b0bf1fe8d2eb16e069a6ca83ab8b21f6032d636a42e0b140537ad1ad25ad38c52a87a2a33e51822729ab196fcef4682818'
-
'f5564e8db242f6fa9cd951590f4c6de8f5b1a8bbd73aeb6e837a840dd2696e71f7b6bb1c94f9c2377b199159f87a95bead8ee113c01e8763f3843918395cc177'
'SKIP')
prepare() {
@@ -59,12 +53,8 @@
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
}
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, July 2, 2019 @ 10:08:11
Author: svenstaro
Revision: 487244
upgpkg: blender 17:2.79.b.git7.054dbb83-2
Rebuild for opensubdiv
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-02 10:01:30 UTC (rev 487243)
+++ PKGBUILD2019-07-02 10:08:11 UTC (rev 487244)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git7.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, July 1, 2019 @ 21:43:36
Author: svenstaro
Revision: 487223
upgpkg: blender 17:2.79.b.git7.054dbb83-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-01 21:19:40 UTC (rev 487222)
+++ PKGBUILD2019-07-01 21:43:36 UTC (rev 487223)
@@ -15,8 +15,8 @@
pkgname=blender
pkgver=2.79.b
-[[ -n $_gitcommit ]] && pkgver=${pkgver}.git6.${_gitcommit:0:8}
-pkgrel=3
+[[ -n $_gitcommit ]] && pkgver=${pkgver}.git7.${_gitcommit:0:8}
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, June 19, 2019 @ 08:50:11
Author: svenstaro
Revision: 482315
upgpkg: blender 17:2.79.b.git6.054dbb83-3
Bump git rev
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-06-19 08:46:58 UTC (rev 482314)
+++ PKGBUILD2019-06-19 08:50:11 UTC (rev 482315)
@@ -11,12 +11,12 @@
# unreasonable.
# _gittag=v2.79b
-_gitcommit=a29446da526d601a03c9083d19e3c18d7b470f20
+_gitcommit=054dbb833e15275e0e991e2c15e754a3e7583716
pkgname=blender
pkgver=2.79.b
-[[ -n $_gitcommit ]] && pkgver=${pkgver}.git5.${_gitcommit:0:8}
-pkgrel=2
+[[ -n $_gitcommit ]] && pkgver=${pkgver}.git6.${_gitcommit:0:8}
+pkgrel=3
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, March 27, 2019 @ 18:18:22
Author: kgizdov
Revision: 444540
rebuild for CUDA with GCC8
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-27 17:56:23 UTC (rev 444539)
+++ PKGBUILD2019-03-27 18:18:22 UTC (rev 444540)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git5.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, March 26, 2019 @ 22:49:09
Author: svenstaro
Revision: 443823
upgpkg: blender 17:2.79.b.git5.a29446da-1
Bump blender git version
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-26 22:49:05 UTC (rev 443822)
+++ PKGBUILD2019-03-26 22:49:09 UTC (rev 443823)
@@ -11,12 +11,12 @@
# unreasonable.
# _gittag=v2.79b
-_gitcommit=2c0c1f494dcfadb3c01d23e2348e28bc8864e9f3
+_gitcommit=a29446da526d601a03c9083d19e3c18d7b470f20
pkgname=blender
pkgver=2.79.b
-[[ -n $_gitcommit ]] && pkgver=${pkgver}.git4.${_gitcommit:0:8}
-pkgrel=5
+[[ -n $_gitcommit ]] && pkgver=${pkgver}.git5.${_gitcommit:0:8}
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Saturday, March 2, 2019 @ 00:03:01
Author: svenstaro
Revision: 437337
upgpkg: blender 17:2.79.b.git4.2c0c1f49-5
gcc7 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-01 23:58:41 UTC (rev 437336)
+++ PKGBUILD2019-03-02 00:03:01 UTC (rev 437337)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git4.${_gitcommit:0:8}
-pkgrel=4
+pkgrel=5
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, February 27, 2019 @ 23:29:04
Author: svenstaro
Revision: 436942
upgpkg: blender 17:2.79.b.git4.2c0c1f49-4
cuda 10.1 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-02-27 23:23:31 UTC (rev 436941)
+++ PKGBUILD2019-02-27 23:29:04 UTC (rev 436942)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git4.${_gitcommit:0:8}
-pkgrel=3
+pkgrel=4
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, January 15, 2019 @ 13:50:51
Author: foutrelis
Revision: 423338
boost 1.69.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-01-15 13:43:56 UTC (rev 423337)
+++ PKGBUILD2019-01-15 13:50:51 UTC (rev 423338)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git4.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=3
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, December 25, 2018 @ 19:48:32
Author: svenstaro
Revision: 418091
upgpkg: blender 17:2.79.b.git4.2c0c1f49-2
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-12-25 19:18:29 UTC (rev 418090)
+++ PKGBUILD2018-12-25 19:48:32 UTC (rev 418091)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git4.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD gcc8.patch)
Date: Friday, October 19, 2018 @ 00:10:38
Author: svenstaro
Revision: 396170
upgpkg: blender 17:2.79.b.git3.32432d91-11
Fix FS#60342
Added:
blender/trunk/gcc8.patch
Modified:
blender/trunk/PKGBUILD
+
PKGBUILD | 31 +--
gcc8.patch | 24
2 files changed, 41 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-10-18 23:52:13 UTC (rev 396169)
+++ PKGBUILD2018-10-19 00:10:38 UTC (rev 396170)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=10
+pkgrel=11
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -40,24 +40,26 @@
tree_hpp.patch
util_sseb.patch
openvdb3-abi.patch
-stl_export_iter.patch)
+stl_export_iter.patch
+gcc8.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
-md5sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '1d6d2064db0e8e4e3a52735406f5106a'
- 'da14d7cbdea1ab5499659a066658cdd2'
- 'feea89510de171946c41c6208461f453'
- '53da216adbc2a9d555a59c15b8f0ef08'
- '3f9613fcb7ea61214982272e9c20a294'
- 'f21e971208232d8d78d1a4c41013a101'
- 'SKIP')
+sha512sums=('SKIP'
+'SKIP'
+'SKIP'
+'SKIP'
+'SKIP'
+
'e6b83d61cf1b48ce78aca11e04196c638f5510f84efc4fb1bd4554f54e0e6ab92911bcd8606845116f4257d0898fa52c026f402f934e1eb7f01bbe96d0afae2c'
+
'446dd46557c7c976a68010c62e04693c61171980abea1cd0a900b00bcc3d525b83bb6ee200739623110e592e37e8f4783a18f234b40e9f85483830ea9785640d'
+
'6c0a619fe8fbc215a9a7c9d4b9c6fc5ec355c37212ec41b05b50787465354bbc7200e76eaafba46a2253196391838190d3de3b2be132095d2162142940e87924'
+
'429ffb6d36efb04c02d506858fc2691ea927ca486d950313dcb0c94d535a66409a14863807e69adc657dafbe243d0aad15cfaadf9f27bdc7c7759211da3fb8a8'
+
'2bd8c59ab8f163b6c7f89b6dfe8aacee3307dae6ecdc0d4878e1376ba29584c891171edd0a57f12241a98e0dd43efff0675a16708d34122bc22faebe3fd8e181'
+
'51f30acc407179f003d1dbec25fb47b0bf1fe8d2eb16e069a6ca83ab8b21f6032d636a42e0b140537ad1ad25ad38c52a87a2a33e51822729ab196fcef4682818'
+
'86f8d6c766644090bb59715b219db74f7acbe31dcd92dc1ecc32beedc1c894a98d2875e9078efa9994511b79e094277a943746dd602be6bc33ba37b7a8a41269'
+'SKIP')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
@@ -76,6 +78,7 @@
patch -Np1 -i "$srcdir"/util_sseb.patch
patch -Np1 -i "$srcdir"/openvdb3-abi.patch
patch -Np1 -i "$srcdir"/stl_export_iter.patch
+ patch -Np1 -i "$srcdir"/gcc8.patch
}
build() {
Added: gcc8.patch
===
--- gcc8.patch (rev 0)
+++ gcc8.patch 2018-10-19 00:10:38 UTC (rev 396170)
@@ -0,0 +1,24 @@
+commit e5767eaad1c48a23eb3d8fed4616722189a70aa1
+Author: Sergey Sharybin
+Date: Mon Jul 2 15:11:48 2018 +0200
+
+Cycles: Fix missing curve hair when building with GCC-8 in release mode
+
+Reshuffle cast intrinsics to make XOR to operate on __m128i rather
+than on __m128.
+
+Hopefully this does not affect performance.
+
+diff --git a/intern/cycles/util/util_ssef.h b/intern/cycles/util/util_ssef.h
+index bb007ff84a9..e9a617bb2cc 100644
+--- a/intern/cycles/util/util_ssef.h
b/intern/cycles/util/util_ssef.h
+@@ -606,7 +606,7 @@ ccl_device_inline const ssef uint32_to_float(const ssei
)
+ template
+ ccl_device_inline const ssef set_sign_bit(const ssef )
+ {
+- return a ^ cast(ssei(S1 << 31, S2 << 31, S3 << 31, S4 << 31));
++ return cast(cast(a) ^ ssei(S1 << 31, S2 << 31, S3 << 31, S4 << 31));
+ }
+
+
[arch-commits] Commit in blender/trunk (PKGBUILD stl_export_iter.patch)
Date: Sunday, October 7, 2018 @ 21:41:13
Author: svenstaro
Revision: 391052
upgpkg: blender 17:2.79.b.git3.32432d91-10
Try to fix FS#60249
Added:
blender/trunk/stl_export_iter.patch
Modified:
blender/trunk/PKGBUILD
---+
PKGBUILD |7 +--
stl_export_iter.patch | 13 +
2 files changed, 18 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-10-07 21:33:46 UTC (rev 391051)
+++ PKGBUILD2018-10-07 21:41:13 UTC (rev 391052)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=9
+pkgrel=10
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -39,7 +39,8 @@
ffmpeg4.0.patch
tree_hpp.patch
util_sseb.patch
-openvdb3-abi.patch)
+openvdb3-abi.patch
+stl_export_iter.patch)
if [[ -n $_gittag ]]; then
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
elif [[ -n $_gitcommit ]]; then
@@ -55,6 +56,7 @@
'feea89510de171946c41c6208461f453'
'53da216adbc2a9d555a59c15b8f0ef08'
'3f9613fcb7ea61214982272e9c20a294'
+ 'f21e971208232d8d78d1a4c41013a101'
'SKIP')
prepare() {
@@ -73,6 +75,7 @@
patch -Np1 -i "$srcdir"/tree_hpp.patch
patch -Np1 -i "$srcdir"/util_sseb.patch
patch -Np1 -i "$srcdir"/openvdb3-abi.patch
+ patch -Np1 -i "$srcdir"/stl_export_iter.patch
}
build() {
Added: stl_export_iter.patch
===
--- stl_export_iter.patch (rev 0)
+++ stl_export_iter.patch 2018-10-07 21:41:13 UTC (rev 391052)
@@ -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)
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Sunday, September 30, 2018 @ 03:20:44
Author: svenstaro
Revision: 388074
upgpkg: blender 17:2.79.b.git3.32432d91-9
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-09-30 02:58:33 UTC (rev 388073)
+++ PKGBUILD2018-09-30 03:20:44 UTC (rev 388074)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=8
+pkgrel=9
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, September 25, 2018 @ 22:16:44
Author: svenstaro
Revision: 385100
upgpkg: blender 17:2.79.b.git3.32432d91-8
cuda 10 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-09-25 22:02:52 UTC (rev 385099)
+++ PKGBUILD2018-09-25 22:16:44 UTC (rev 385100)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=7
+pkgrel=8
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -93,7 +93,7 @@
-DWITH_LLVM=ON \
-DWITH_CYCLES_CUDA_BINARIES=ON \
-DWITH_CYCLES_PTEX=OFF \
-
-DCYCLES_CUDA_BINARIES_ARCH="sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_62;sm_70"
\
+
-DCYCLES_CUDA_BINARIES_ARCH="sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_62;sm_70;sm_72;sm_75"
\
-DPYTHON_VERSION=3.7 \
-DPYTHON_LIBPATH=/usr/lib \
-DPYTHON_LIBRARY=python3.7m \
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, September 18, 2018 @ 06:50:21
Author: foutrelis
Revision: 382934
boost 1.68.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-09-18 05:35:04 UTC (rev 382933)
+++ PKGBUILD2018-09-18 06:50:21 UTC (rev 382934)
@@ -16,7 +16,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=6
+pkgrel=7
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Saturday, September 8, 2018 @ 11:04:25
Author: svenstaro
Revision: 378794
upgpkg: blender 17:2.79.b.git3.32432d91-6
rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-09-08 10:41:08 UTC (rev 378793)
+++ PKGBUILD2018-09-08 11:04:25 UTC (rev 378794)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=5
+pkgrel=6
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, August 22, 2018 @ 08:16:11
Author: arojas
Revision: 373205
ilmbase/openexr 2.3 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-22 07:36:40 UTC (rev 373204)
+++ PKGBUILD2018-08-22 08:16:11 UTC (rev 373205)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=4
+pkgrel=5
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, August 17, 2018 @ 09:03:48
Author: svenstaro
Revision: 372309
upgpkg: blender 17:2.79.b.git3.32432d91-4
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-17 09:03:10 UTC (rev 372308)
+++ PKGBUILD2018-08-17 09:03:48 UTC (rev 372309)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=3
+pkgrel=4
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD python37.patch)
Date: Friday, August 3, 2018 @ 04:39:58
Author: foutrelis
Revision: 367476
upgpkg: blender 17:2.79.b.git3.32432d91-3
Add patch: "Fix PyRNA class registration w/ Python 3.7"
Added:
blender/trunk/python37.patch
Modified:
blender/trunk/PKGBUILD
+
PKGBUILD |5 -
python37.patch | 40
2 files changed, 44 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-02 23:44:13 UTC (rev 367475)
+++ PKGBUILD2018-08-03 04:39:58 UTC (rev 367476)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=2
+pkgrel=3
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -36,6 +36,7 @@
"git://git.blender.org/blender-translations.git"
"git://git.blender.org/blender-dev-tools.git"
"git://git.blender.org/scons.git"
+python37.patch
ffmpeg4.0.patch
tree_hpp.patch
util_sseb.patch
@@ -50,6 +51,7 @@
'SKIP'
'SKIP'
'SKIP'
+ '1d6d2064db0e8e4e3a52735406f5106a'
'da14d7cbdea1ab5499659a066658cdd2'
'feea89510de171946c41c6208461f453'
'53da216adbc2a9d555a59c15b8f0ef08'
@@ -67,6 +69,7 @@
git config submodule."scons".url ${srcdir}/scons
git submodule update
+ patch -Np1 -i "$srcdir"/python37.patch
patch -Np1 -i "$srcdir"/ffmpeg4.0.patch
patch -Np1 -i "$srcdir"/tree_hpp.patch
patch -Np1 -i "$srcdir"/util_sseb.patch
Added: python37.patch
===
--- python37.patch (rev 0)
+++ python37.patch 2018-08-03 04:39:58 UTC (rev 367476)
@@ -0,0 +1,40 @@
+From 1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f Mon Sep 17 00:00:00 2001
+From: Campbell Barton
+Date: Thu, 12 Jul 2018 08:28:06 +0200
+Subject: [PATCH] Fix PyRNA class registration w/ Python 3.7
+
+In Python3.7 this now raises an error.
+---
+ source/blender/python/intern/bpy_rna.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/source/blender/python/intern/bpy_rna.c
b/source/blender/python/intern/bpy_rna.c
+index 9052b6f580a..80b0aa7a51b 100644
+--- a/source/blender/python/intern/bpy_rna.c
b/source/blender/python/intern/bpy_rna.c
+@@ -7577,10 +7577,12 @@ static int bpy_class_validate_recursive(PointerRNA
*dummyptr, StructRNA *srna, v
+ if (!(flag & PROP_REGISTER))
+ continue;
+
++ /* TODO(campbell): Use Python3.7x _PyObject_LookupAttr(), also
in the macro below. */
+ identifier = RNA_property_identifier(prop);
+ item = PyObject_GetAttrString(py_class, identifier);
+
+ if (item == NULL) {
++ PyErr_Clear();
+ /* Sneaky workaround to use the class name as the
bl_idname */
+
+ #define BPY_REPLACEMENT_STRING(rna_attr, py_attr)
\
+@@ -7596,6 +7598,9 @@ static int bpy_class_validate_recursive(PointerRNA
*dummyptr, StructRNA *srna, v
+ }
\
+ Py_DECREF(item);
\
+ }
\
++ else {
\
++ PyErr_Clear();
\
++ }
\
+ } /* intentionally allow else here */
+
+ if (false) {} /* needed for macro */
+--
+2.18.0
+
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, July 24, 2018 @ 08:27:28
Author: svenstaro
Revision: 363271
upgpkg: blender 17:2.79.b.git3.32432d91-2
python 3.7 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-07-24 08:03:22 UTC (rev 363270)
+++ PKGBUILD2018-07-24 08:27:28 UTC (rev 363271)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -92,10 +92,10 @@
-DWITH_CYCLES_CUDA_BINARIES=ON \
-DWITH_CYCLES_PTEX=OFF \
-DCYCLES_CUDA_BINARIES_ARCH="sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_62;sm_70"
\
--DPYTHON_VERSION=3.6 \
+-DPYTHON_VERSION=3.7 \
-DPYTHON_LIBPATH=/usr/lib \
--DPYTHON_LIBRARY=python3.6m \
--DPYTHON_INCLUDE_DIRS=/usr/include/python3.6m
+-DPYTHON_LIBRARY=python3.7m \
+-DPYTHON_INCLUDE_DIRS=/usr/include/python3.7m
make
# PTEX is currently broken and experimental in blender anyway
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Sunday, June 3, 2018 @ 05:09:12
Author: foutrelis
Revision: 338547
boost 1.67.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-06-03 05:01:43 UTC (rev 338546)
+++ PKGBUILD2018-06-03 05:09:12 UTC (rev 338547)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git2.${_gitcommit:0:8}
-pkgrel=15
+pkgrel=16
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, May 30, 2018 @ 19:14:52
Author: svenstaro
Revision: 333479
upgpkg: blender 17:2.79.b.git2.0385b33f-15
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-30 19:13:44 UTC (rev 333478)
+++ PKGBUILD2018-05-30 19:14:52 UTC (rev 333479)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git2.${_gitcommit:0:8}
-pkgrel=14
+pkgrel=15
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Sunday, May 20, 2018 @ 11:13:04
Author: svenstaro
Revision: 325236
upgpkg: blender 17:2.79.b.git2.0385b33f-14
cuda 9.2 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-20 11:09:59 UTC (rev 325235)
+++ PKGBUILD2018-05-20 11:13:04 UTC (rev 325236)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git2.${_gitcommit:0:8}
-pkgrel=13
+pkgrel=14
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, May 11, 2018 @ 20:03:38
Author: svenstaro
Revision: 320899
upgpkg: blender 17:2.79.b.git2.0385b33f-13
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-11 20:02:38 UTC (rev 320898)
+++ PKGBUILD2018-05-11 20:03:38 UTC (rev 320899)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git2.${_gitcommit:0:8}
-pkgrel=12
+pkgrel=13
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, May 11, 2018 @ 19:07:47
Author: svenstaro
Revision: 320892
upgpkg: blender 17:2.79.b.git2.0385b33f-12
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-11 18:54:46 UTC (rev 320891)
+++ PKGBUILD2018-05-11 19:07:47 UTC (rev 320892)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
[[ -n $_gitcommit ]] && pkgver=${pkgver}.git2.${_gitcommit:0:8}
-pkgrel=11
+pkgrel=12
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, May 11, 2018 @ 14:59:28
Author: svenstaro
Revision: 320787
upgpkg: blender 17:2.79.b.git2.0385b33f-11
Fix monster pkgver
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-11 14:50:51 UTC (rev 320786)
+++ PKGBUILD2018-05-11 14:59:28 UTC (rev 320787)
@@ -16,8 +16,8 @@
pkgname=blender
pkgver=2.79.b
-[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=10
+[[ -n $_gitcommit ]] && pkgver=${pkgver}.git2.${_gitcommit:0:8}
+pkgrel=11
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, May 11, 2018 @ 14:24:07
Author: svenstaro
Revision: 320781
upgpkg: blender 17:2.79.b.git1.0385b33f0b3e389ea2a82c4b6bb181c684f0511a-10
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD | 28 +---
1 file changed, 9 insertions(+), 19 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-11 14:08:06 UTC (rev 320780)
+++ PKGBUILD2018-05-11 14:24:07 UTC (rev 320781)
@@ -11,13 +11,13 @@
# or simply roll with a new version. I usually choose the latter when the
former seems
# unreasonable.
- _gittag=v2.79b
-#_gitcommit=3c3d0898b0c1a1d7da70f4a1778d4360b3cfe5c8
+# _gittag=v2.79b
+_gitcommit=0385b33f0b3e389ea2a82c4b6bb181c684f0511a
pkgname=blender
pkgver=2.79.b
-#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=8
+[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
+pkgrel=10
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -28,7 +28,7 @@
'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' 'gcc6' 'cuda')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda')
optdepends=('cuda: cycles renderer cuda support')
options=(!strip)
source=("git://git.blender.org/blender-addons.git"
@@ -35,8 +35,7 @@
"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"
-ffmpeg4.0.patch)
+"git://git.blender.org/scons.git")
if [[ -n $_gittag ]]; then
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
elif [[ -n $_gitcommit ]]; then
@@ -47,7 +46,6 @@
'SKIP'
'SKIP'
'SKIP'
- 'da14d7cbdea1ab5499659a066658cdd2'
'SKIP')
prepare() {
@@ -61,14 +59,8 @@
git config submodule."scons".url ${srcdir}/scons
git submodule update
- # cuda 9.1 fixes
- sed -i -e "s/sm_20;//" -e "s/sm_21;//"
build_files/cmake/config/blender_release.cmake
-
- # openvdb 5 fix
- sed -i "s/OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER ==
3/OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER >= 3/g"
intern/openvdb/intern/openvdb_writer.cc
-
- # ffmpeg 4.0 fixes
- patch -Np1 -i "${srcdir}"/ffmpeg4.0.patch
+ # Fix installation of modules
+ sed -i "144i\ \ \ \ pass"
release/scripts/addons_contrib/np_station/np_point_dimension.py
}
build() {
@@ -85,12 +77,10 @@
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \
-DOPENIMAGEIO_ROOT_DIR=/usr \
--DWITH_LLVM=ON \
-DWITH_SYSTEM_OPENJPEG=ON \
-DWITH_GL_PROFILE_CORE=OFF \
-DWITH_GL_PROFILE_ES20=OFF \
--DLLVM_VERSION=3.6 \
--DLLVM_STATIC=ON \
+-DWITH_LLVM=ON \
-DWITH_CYCLES_CUDA_BINARIES=ON \
-DWITH_CYCLES_PTEX=OFF \
-DPYTHON_VERSION=3.6 \
[arch-commits] Commit in blender/trunk (PKGBUILD ffmpeg4.0.patch)
Date: Tuesday, April 24, 2018 @ 21:31:58
Author: svenstaro
Revision: 317630
upgpkg: blender 17:2.79.b-8
ffmpeg 4.0 rebuild
Added:
blender/trunk/ffmpeg4.0.patch
Modified:
blender/trunk/PKGBUILD
-+
PKGBUILD|9 +++-
ffmpeg4.0.patch | 113 ++
2 files changed, 120 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-24 21:31:29 UTC (rev 317629)
+++ PKGBUILD2018-04-24 21:31:58 UTC (rev 317630)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=7
+pkgrel=8
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -35,7 +35,8 @@
"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")
+"git://git.blender.org/scons.git"
+ffmpeg4.0.patch)
if [[ -n $_gittag ]]; then
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
elif [[ -n $_gitcommit ]]; then
@@ -46,6 +47,7 @@
'SKIP'
'SKIP'
'SKIP'
+ 'da14d7cbdea1ab5499659a066658cdd2'
'SKIP')
prepare() {
@@ -64,6 +66,9 @@
# openvdb 5 fix
sed -i "s/OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER ==
3/OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER >= 3/g"
intern/openvdb/intern/openvdb_writer.cc
+
+ # ffmpeg 4.0 fixes
+ patch -Np1 -i "${srcdir}"/ffmpeg4.0.patch
}
build() {
Added: ffmpeg4.0.patch
===
--- ffmpeg4.0.patch (rev 0)
+++ ffmpeg4.0.patch 2018-04-24 21:31:58 UTC (rev 317630)
@@ -0,0 +1,113 @@
+diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+index e9eea195208..84aea330313 100644
+--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+@@ -264,9 +264,9 @@
AUD_FFMPEGReader::AUD_FFMPEGReader(boost::shared_ptr buffer) :
+ m_membuffer(buffer),
+ m_membufferpos(0)
+ {
+- m_membuf = reinterpret_cast(av_malloc(FF_MIN_BUFFER_SIZE +
FF_INPUT_BUFFER_PADDING_SIZE));
++ m_membuf = reinterpret_cast(av_malloc(AV_INPUT_BUFFER_MIN_SIZE
+ AV_INPUT_BUFFER_PADDING_SIZE));
+
+- m_aviocontext = avio_alloc_context(m_membuf, FF_MIN_BUFFER_SIZE, 0,
this,
++ m_aviocontext = avio_alloc_context(m_membuf, AV_INPUT_BUFFER_MIN_SIZE,
0, this,
+
read_packet, NULL, seek_packet);
+
+ if(!m_aviocontext)
+diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
+index 3f95ac7a4da..2c2f0916406 100644
+--- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
+@@ -163,7 +163,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename,
AUD_DeviceSpecs specs,
+ try
+ {
+ if(m_formatCtx->oformat->flags & AVFMT_GLOBALHEADER)
+- m_codecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ m_codecCtx->flags |=
AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ AVCodec* codec =
avcodec_find_encoder(m_codecCtx->codec_id);
+ if(!codec)
+@@ -185,11 +185,11 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename,
AUD_DeviceSpecs specs,
+ if(avcodec_open2(m_codecCtx, codec, NULL))
+ AUD_THROW(AUD_ERROR_FFMPEG, codec_error);
+
+- m_output_buffer.resize(FF_MIN_BUFFER_SIZE);
++ m_output_buffer.resize(AV_INPUT_BUFFER_MIN_SIZE);
+ int samplesize = AUD_MAX(AUD_SAMPLE_SIZE(m_specs),
AUD_DEVICE_SAMPLE_SIZE(m_specs));
+
+ if(m_codecCtx->frame_size <= 1) {
+- m_input_size = FF_MIN_BUFFER_SIZE * 8 /
m_codecCtx->bits_per_coded_sample / m_codecCtx->channels;
++ m_input_size = AV_INPUT_BUFFER_MIN_SIZE * 8 /
m_codecCtx->bits_per_coded_sample / m_codecCtx->channels;
+ m_input_buffer.resize(m_input_size *
samplesize);
+ }
+ else
+diff --git a/source/blender/blenkernel/intern/writeffmpeg.c
b/source/blender/blenkernel/intern/writeffmpeg.c
+index d7fcd896e11..9e82df17dce 100644
+--- a/source/blender/blenkernel/intern/writeffmpeg.c
b/source/blender/blenkernel/intern/writeffmpeg.c
+@@ -619,8 +619,6 @@ static AVStream *alloc_video_stream(FFMpegContext
*context, RenderData *rd, int
+ c->rc_buffer_aggressivity = 1.0;
+ #endif
+
+- c->me_method =
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, April 24, 2018 @ 03:32:59
Author: svenstaro
Revision: 317485
upgpkg: blender 17:2.79.b-7
rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-24 01:22:54 UTC (rev 317484)
+++ PKGBUILD2018-04-24 03:32:59 UTC (rev 317485)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=6
+pkgrel=7
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Tuesday, April 24, 2018 @ 00:55:54
Author: svenstaro
Revision: 317472
upgpkg: blender 17:2.79.b-6
rebuild for log4cplus 2.0
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-24 00:27:02 UTC (rev 317471)
+++ PKGBUILD2018-04-24 00:55:54 UTC (rev 317472)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=5
+pkgrel=6
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, March 29, 2018 @ 15:26:14
Author: svenstaro
Revision: 313410
upgpkg: blender 17:2.79.b-5
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-29 14:49:24 UTC (rev 313409)
+++ PKGBUILD2018-03-29 15:26:14 UTC (rev 313410)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=4
+pkgrel=5
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, March 29, 2018 @ 14:12:11
Author: svenstaro
Revision: 313396
upgpkg: blender 17:2.79.b-4
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-29 14:02:40 UTC (rev 313395)
+++ PKGBUILD2018-03-29 14:12:11 UTC (rev 313396)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=3
+pkgrel=4
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -28,8 +28,7 @@
'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' 'gcc6')
-makedepends_x86_64=('cuda')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'gcc6' 'cuda')
optdepends=('cuda: cycles renderer cuda support')
options=(!strip)
source=("git://git.blender.org/blender-addons.git"
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, March 29, 2018 @ 13:46:29
Author: svenstaro
Revision: 313390
upgpkg: blender 17:2.79.b-3
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-29 13:30:32 UTC (rev 313389)
+++ PKGBUILD2018-03-29 13:46:29 UTC (rev 313390)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=2
+pkgrel=3
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, March 29, 2018 @ 02:23:08
Author: svenstaro
Revision: 313226
upgpkg: blender 17:2.79.b-2
opensubdiv 3.3.1 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-29 02:14:24 UTC (rev 313225)
+++ PKGBUILD2018-03-29 02:23:08 UTC (rev 313226)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79.b
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, March 29, 2018 @ 00:53:23
Author: svenstaro
Revision: 313211
upgpkg: blender 17:2.79.b-1
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-29 00:26:41 UTC (rev 313210)
+++ PKGBUILD2018-03-29 00:53:23 UTC (rev 313211)
@@ -11,11 +11,11 @@
# or simply roll with a new version. I usually choose the latter when the
former seems
# unreasonable.
- _gittag=v2.79a
+ _gittag=v2.79b
#_gitcommit=3c3d0898b0c1a1d7da70f4a1778d4360b3cfe5c8
pkgname=blender
-pkgver=2.79.a
+pkgver=2.79.b
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
pkgrel=1
epoch=17
[arch-commits] Commit in blender/trunk (PKGBUILD cuda9.patch)
Date: Wednesday, March 28, 2018 @ 22:19:52
Author: svenstaro
Revision: 313186
upgpkg: blender 17:2.79.a-1
Modified:
blender/trunk/PKGBUILD
Deleted:
blender/trunk/cuda9.patch
-+
PKGBUILD| 17 -
cuda9.patch | 40
2 files changed, 8 insertions(+), 49 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-28 22:01:50 UTC (rev 313185)
+++ PKGBUILD2018-03-28 22:19:52 UTC (rev 313186)
@@ -11,13 +11,13 @@
# or simply roll with a new version. I usually choose the latter when the
former seems
# unreasonable.
- _gittag=v2.79
+ _gittag=v2.79a
#_gitcommit=3c3d0898b0c1a1d7da70f4a1778d4360b3cfe5c8
pkgname=blender
-pkgver=2.79
+pkgver=2.79.a
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=10
+pkgrel=1
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -28,7 +28,7 @@
'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' 'llvm35' 'gcc6')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'gcc6')
makedepends_x86_64=('cuda')
optdepends=('cuda: cycles renderer cuda support')
options=(!strip)
@@ -36,8 +36,7 @@
"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"
-cuda9.patch)
+"git://git.blender.org/scons.git")
if [[ -n $_gittag ]]; then
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
elif [[ -n $_gitcommit ]]; then
@@ -48,7 +47,6 @@
'SKIP'
'SKIP'
'SKIP'
- '88f47cac4cac2977f006c0ce22f84e53'
'SKIP')
prepare() {
@@ -62,10 +60,11 @@
git config submodule."scons".url ${srcdir}/scons
git submodule update
- patch -Np1 < "${srcdir}"/cuda9.patch
-
# cuda 9.1 fixes
sed -i -e "s/sm_20;//" -e "s/sm_21;//"
build_files/cmake/config/blender_release.cmake
+
+ # openvdb 5 fix
+ sed -i "s/OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER ==
3/OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER >= 3/g"
intern/openvdb/intern/openvdb_writer.cc
}
build() {
Deleted: cuda9.patch
===
--- cuda9.patch 2018-03-28 22:01:50 UTC (rev 313185)
+++ cuda9.patch 2018-03-28 22:19:52 UTC (rev 313186)
@@ -1,40 +0,0 @@
-X-Git-Url:
https://git.blender.org/gitweb/gitweb.cgi/blender.git/blobdiff_plain/22ecea9e38e708056262f3d98b0d0c6210da75cf..f55735e533601b559d53fd1e2c5297092e844345:/intern/cycles/kernel/CMakeLists.txt
-
-diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
-index b4ca16bdb48..b10dd05cb9b 100644
a/intern/cycles/kernel/CMakeLists.txt
-+++ b/intern/cycles/kernel/CMakeLists.txt
-@@ -321,7 +321,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
- set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
-
- # warn for other versions
-- if(CUDA_VERSION MATCHES "80")
-+ if(CUDA_VERSION MATCHES "80" OR CUDA_VERSION MATCHES "90")
- else()
- message(WARNING
- "CUDA version
${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, "
-@@ -399,13 +399,17 @@ if(WITH_CYCLES_CUDA_BINARIES)
- endmacro()
-
- foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
-- # Compile regular kernel
-- CYCLES_CUDA_KERNEL_ADD(${arch} kernel "" "${cuda_sources}"
FALSE)
-- CYCLES_CUDA_KERNEL_ADD(${arch} filter ""
"${cuda_filter_sources}" FALSE)
--
-- if(WITH_CYCLES_CUDA_SPLIT_KERNEL_BINARIES)
-- # Compile split kernel
-- CYCLES_CUDA_KERNEL_ADD(${arch} kernel_split
"-D__SPLIT__" ${cuda_sources} FALSE)
-+ if(CUDA_VERSION MATCHES "90" AND ${arch} MATCHES "sm_2.")
-+ message(STATUS "CUDA binaries for ${arch} disabled, not
supported by CUDA 9.")
-+ else()
-+ # Compile regular kernel
-+ CYCLES_CUDA_KERNEL_ADD(${arch} kernel ""
"${cuda_sources}" FALSE)
-+ CYCLES_CUDA_KERNEL_ADD(${arch} filter ""
"${cuda_filter_sources}" FALSE)
-+
-+ if(WITH_CYCLES_CUDA_SPLIT_KERNEL_BINARIES)
-+ # Compile split kernel
-+ CYCLES_CUDA_KERNEL_ADD(${arch} kernel_split
"-D__SPLIT__" ${cuda_sources} FALSE)
-+ endif()
- endif()
- endforeach()
-
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Wednesday, February 28, 2018 @ 09:45:44
Author: arojas
Revision: 299946
ilmbase/openexr 2.2.1 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-02-28 09:43:07 UTC (rev 299945)
+++ PKGBUILD2018-02-28 09:45:44 UTC (rev 299946)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=9
+pkgrel=10
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, January 8, 2018 @ 16:55:36
Author: svenstaro
Revision: 280555
upgpkg: blender 17:2.79-9
rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-08 16:39:54 UTC (rev 280554)
+++ PKGBUILD2018-01-08 16:55:36 UTC (rev 280555)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=8
+pkgrel=9
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, December 29, 2017 @ 02:59:19
Author: svenstaro
Revision: 276775
upgpkg: blender 17:2.79-8
boost 1.66.0 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-12-29 02:44:27 UTC (rev 276774)
+++ PKGBUILD2017-12-29 02:59:19 UTC (rev 276775)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=7
+pkgrel=8
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Thursday, December 14, 2017 @ 07:07:15
Author: svenstaro
Revision: 274370
upgpkg: blender 17:2.79-7
cuda 9.1 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-12-14 07:03:50 UTC (rev 274369)
+++ PKGBUILD2017-12-14 07:07:15 UTC (rev 274370)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=6
+pkgrel=7
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
@@ -63,6 +63,9 @@
git submodule update
patch -Np1 < "${srcdir}"/cuda9.patch
+
+ # cuda 9.1 fixes
+ sed -i -e "s/sm_20;//" -e "s/sm_21;//"
build_files/cmake/config/blender_release.cmake
}
build() {
@@ -71,8 +74,6 @@
[[ -d build ]] && rm -rf build
mkdir build && cd build
- [[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON"
-
export CFLAGS="${CFLAGS} -DOPENVDB_3_ABI_COMPATIBLE"
export CXXFLAGS="${CXXFLAGS} -DOPENVDB_3_ABI_COMPATIBLE"
cmake -C../build_files/cmake/config/blender_release.cmake .. \
@@ -87,7 +88,7 @@
-DWITH_GL_PROFILE_ES20=OFF \
-DLLVM_VERSION=3.6 \
-DLLVM_STATIC=ON \
--DWITH_CYCLES_CUDA_BINARIES=$BUILDCUDA \
+-DWITH_CYCLES_CUDA_BINARIES=ON \
-DWITH_CYCLES_PTEX=OFF \
-DPYTHON_VERSION=3.6 \
-DPYTHON_LIBPATH=/usr/lib \
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Sunday, October 15, 2017 @ 08:00:59
Author: svenstaro
Revision: 262862
upgpkg: blender 17:2.79-6
gcc6 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-10-15 07:59:24 UTC (rev 262861)
+++ PKGBUILD2017-10-15 08:00:59 UTC (rev 262862)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=5
+pkgrel=6
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('i686' 'x86_64')
@@ -28,7 +28,7 @@
'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' 'llvm35' 'gcc5')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm35' 'gcc6')
makedepends_x86_64=('cuda')
optdepends=('cuda: cycles renderer cuda support')
options=(!strip)
[arch-commits] Commit in blender/trunk (PKGBUILD cuda9.patch)
Date: Tuesday, October 3, 2017 @ 02:55:52
Author: svenstaro
Revision: 261350
upgpkg: blender 17:2.79-5
cuda9 rebuild
Added:
blender/trunk/cuda9.patch
Modified:
blender/trunk/PKGBUILD
-+
PKGBUILD|9 +++--
cuda9.patch | 40
2 files changed, 47 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-10-03 02:53:43 UTC (rev 261349)
+++ PKGBUILD2017-10-03 02:55:52 UTC (rev 261350)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=4
+pkgrel=5
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('i686' 'x86_64')
@@ -36,7 +36,8 @@
"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")
+"git://git.blender.org/scons.git"
+cuda9.patch)
if [[ -n $_gittag ]]; then
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
elif [[ -n $_gitcommit ]]; then
@@ -47,6 +48,7 @@
'SKIP'
'SKIP'
'SKIP'
+ '88f47cac4cac2977f006c0ce22f84e53'
'SKIP')
prepare() {
@@ -59,11 +61,14 @@
git config submodule."source/tools".url ${srcdir}/blender-dev-tools
git config submodule."scons".url ${srcdir}/scons
git submodule update
+
+ patch -Np1 < "${srcdir}"/cuda9.patch
}
build() {
cd "$srcdir/$pkgname-$pkgver"
+ [[ -d build ]] && rm -rf build
mkdir build && cd build
[[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON"
Added: cuda9.patch
===
--- cuda9.patch (rev 0)
+++ cuda9.patch 2017-10-03 02:55:52 UTC (rev 261350)
@@ -0,0 +1,40 @@
+X-Git-Url:
https://git.blender.org/gitweb/gitweb.cgi/blender.git/blobdiff_plain/22ecea9e38e708056262f3d98b0d0c6210da75cf..f55735e533601b559d53fd1e2c5297092e844345:/intern/cycles/kernel/CMakeLists.txt
+
+diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+index b4ca16bdb48..b10dd05cb9b 100644
+--- a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
+@@ -321,7 +321,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
+ set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
+
+ # warn for other versions
+- if(CUDA_VERSION MATCHES "80")
++ if(CUDA_VERSION MATCHES "80" OR CUDA_VERSION MATCHES "90")
+ else()
+ message(WARNING
+ "CUDA version
${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, "
+@@ -399,13 +399,17 @@ if(WITH_CYCLES_CUDA_BINARIES)
+ endmacro()
+
+ foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
+- # Compile regular kernel
+- CYCLES_CUDA_KERNEL_ADD(${arch} kernel "" "${cuda_sources}"
FALSE)
+- CYCLES_CUDA_KERNEL_ADD(${arch} filter ""
"${cuda_filter_sources}" FALSE)
+-
+- if(WITH_CYCLES_CUDA_SPLIT_KERNEL_BINARIES)
+- # Compile split kernel
+- CYCLES_CUDA_KERNEL_ADD(${arch} kernel_split
"-D__SPLIT__" ${cuda_sources} FALSE)
++ if(CUDA_VERSION MATCHES "90" AND ${arch} MATCHES "sm_2.")
++ message(STATUS "CUDA binaries for ${arch} disabled, not
supported by CUDA 9.")
++ else()
++ # Compile regular kernel
++ CYCLES_CUDA_KERNEL_ADD(${arch} kernel ""
"${cuda_sources}" FALSE)
++ CYCLES_CUDA_KERNEL_ADD(${arch} filter ""
"${cuda_filter_sources}" FALSE)
++
++ if(WITH_CYCLES_CUDA_SPLIT_KERNEL_BINARIES)
++ # Compile split kernel
++ CYCLES_CUDA_KERNEL_ADD(${arch} kernel_split
"-D__SPLIT__" ${cuda_sources} FALSE)
++ endif()
+ endif()
+ endforeach()
+
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Monday, September 25, 2017 @ 16:43:43
Author: svenstaro
Revision: 260566
upgpkg: blender 17:2.79-4
add python-numpy to deps
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-09-25 16:32:09 UTC (rev 260565)
+++ PKGBUILD2017-09-25 16:43:43 UTC (rev 260566)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=3
+pkgrel=4
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@
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'
+ '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')
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Sunday, September 17, 2017 @ 01:08:57
Author: svenstaro
Revision: 258585
upgpkg: blender 17:2.79-3
boost 1.65.1 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-09-17 00:34:43 UTC (rev 258584)
+++ PKGBUILD2017-09-17 01:08:57 UTC (rev 258585)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=2
+pkgrel=3
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('i686' 'x86_64')
@@ -68,6 +68,8 @@
[[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON"
+ export CFLAGS="${CFLAGS} -DOPENVDB_3_ABI_COMPATIBLE"
+ export CXXFLAGS="${CXXFLAGS} -DOPENVDB_3_ABI_COMPATIBLE"
cmake -C../build_files/cmake/config/blender_release.cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
@@ -86,7 +88,6 @@
-DPYTHON_LIBPATH=/usr/lib \
-DPYTHON_LIBRARY=python3.6m \
-DPYTHON_INCLUDE_DIRS=/usr/include/python3.6m
- # We need -DCUDA_NVCC_FLAGS="-D_BITS_FLOATN_H" for glibc 2.26
make
# PTEX is currently broken and experimental in blender anyway
[arch-commits] Commit in blender/trunk (PKGBUILD)
Date: Friday, September 15, 2017 @ 10:12:42
Author: svenstaro
Revision: 257678
upgpkg: blender 17:2.79-2
alembic 1.7.3 rebuild
Modified:
blender/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-09-15 09:38:29 UTC (rev 257677)
+++ PKGBUILD2017-09-15 10:12:42 UTC (rev 257678)
@@ -17,7 +17,7 @@
pkgname=blender
pkgver=2.79
#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
-pkgrel=1
+pkgrel=2
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('i686' 'x86_64')
