summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2021-04-16 06:28:24 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2021-04-16 16:02:57 -0400
commite4a53732b22ddf50e293003a4ec490543f726a4e (patch)
tree08e3c3cfe14f773edb84f0a3ed743743bc24e2cd
parent92ed5cd876d441c56f12dc8c27c1240f4c7e7db7 (diff)
[blender]: upgrade to v2.92.0
-rw-r--r--libre/blender/PKGBUILD52
1 files changed, 30 insertions, 22 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 094e42b91..61e8c73cd 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -1,6 +1,6 @@
-# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor (Arch): John Sowiak <john@archlinux.org>
-# Contributor (Arch): tobias <tobias@archlinux.org>
+# Maintainer (arch): Sven-Hendrik Haase <svenstaro@gmail.com>
+# Contributor: John Sowiak <john@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
# Contributor: Andreas Grapentin <andreas@grapentin.org>
# Contributor: Márcio Silva <coadde@hyperbola.info>
# Contributor: bill-auger <bill-auger@programmer.net>
@@ -13,9 +13,9 @@
pkgname=blender
-pkgver=2.91.0
-pkgrel=4
-pkgrel+=.parabola5
+pkgver=2.92.0
+pkgrel=2
+pkgrel+=.parabola1
epoch=17
_pythonver_x86_64=3.9
_pythonver_i686=3.9
@@ -26,26 +26,29 @@ pkgdesc+=", without non-free CUDA or optix support"
arch=('x86_64')
arch+=('i686' 'armv7h')
license=('GPL')
-url="http://www.blender.org"
+url="https://www.blender.org"
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'
- 'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2')
-depends_x86_64=('embree' 'openimagedenoise')
-depends_i686=('embree')
-makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'ninja')
+ 'openimageio' 'libsndfile' 'jack' 'opencolorio1' 'openshadinglanguage' 'openimagedenoise'
+ 'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2' 'embree')
+[[ "${CARCH}" != 'x86_64' ]] && depends=( ${depends[*]/openimagedenoise/} )
+[[ "${CARCH}" == 'armv7h' ]] && depends=( ${depends[*]/embree/} )
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda' 'ninja')
+makedepends=( ${makedepends[*]/cuda/} )
options=(!strip)
-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")
+source=("git+https://git.blender.org/blender.git#tag=v$pkgver"
+ "git+https://git.blender.org/blender-addons.git"
+ "git+https://git.blender.org/blender-addons-contrib.git"
+ "git+https://git.blender.org/blender-translations.git"
+ "git+https://git.blender.org/blender-dev-tools.git"
+)
sha512sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP')
+ 'SKIP'
+)
_version_constraint() # (dep_pkgname [precision])
@@ -111,6 +114,8 @@ build() {
'x86_64') _extra_opts+=( -DWITH_CYCLES_EMBREE=ON ) ;;
esac
+ local PYTHON_VER=${_python_ver}
+
cmake . \
-Bbuild \
-GNinja \
@@ -120,11 +125,11 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_PYTHON_INSTALL=OFF \
- -DPYTHON_VERSION=${_python_ver} \
+ -DPYTHON_VERSION=$PYTHON_VER \
-DPYTHON_LIBPATH=/usr/lib \
- -DPYTHON_LIBRARY=python${_python_ver} \
- -DPYTHON_INCLUDE_DIRS=/usr/include/python${_python_ver} \
- -DCMAKE_CXX_FLAGS="-I /usr/include/python${_python_ver}"
+ -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
}
@@ -150,4 +155,7 @@ package() {
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"
+
+ # Manually install additional scripts (See FS#69351)
+ cp -r release/scripts/addons_contrib/* "${pkgdir}"/usr/share/blender/2*/scripts/addons_contrib/
}