Re: [PR PATCH] [Updated] blender: update to 2.83.2, enable alembic support

[mvf <mvf@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

There is an updated pull request by mvf against master on the void-packages repository

https://github.com/mvf/void-packages pr/blender-alembic
https://github.com/void-linux/void-packages/pull/23498

blender: update to 2.83.2, enable alembic support
Smoke-tested (export and import simple mesh) on x86_64. Fixes #23112

A patch file from https://github.com/void-linux/void-packages/pull/23498.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/blender-alembic-23498.patch --]
[-- Type: text/x-diff, Size: 3785 bytes --]

From 46acef15d74d53fda68d18ca4477d743cd133553 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 9 Jul 2020 19:34:54 +0200
Subject: [PATCH 1/2] alembic: update to 1.7.13, build without TR1

TR1 is an obsolete C++ extension and incompatible with Blender
---
 common/shlibs            |  2 +-
 srcpkgs/alembic/template | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 75bf83002d5..be52293607b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3939,7 +3939,7 @@ libOpenImageDenoise.so.0 openimagedenoise-1.2.0_1
 libcbang0.so cbang-1.3.3_1
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.7.0 openvdb-7.0.0_1
-libAlembic.so.1.7 alembic-1.7.12_1
+libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 89c51cb461f..71fc79c0da4 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,17 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.12
+version=1.7.13
 revision=1
 build_style=cmake
-configure_args="-DALEMBIC_LIB_USES_TR1=1"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel libatomic-devel"
+makedepends="zlib-devel ilmbase-devel"
 short_desc="Open framework for storing and sharing scene data"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=6c603b87c9a3eaa13618e577dd9ef5277018cdcd09ac82d3c196ad8bed6a1b48
+checksum=14a44a1d28d1a0736655e53fc529dd4d3993bf4d03535f66de9e634c9b47d441
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
@@ -22,6 +21,14 @@ if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+
+	post_patch() {
+		printf '\ntarget_link_libraries(Alembic PRIVATE atomic)\n' >> lib/Alembic/CMakeLists.txt
+	}
+fi
+
 post_install() {
 	vlicense LICENSE.txt
 }

From ec2e85c7fa82ab9e7596683bf7c80cbdef56f295 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 9 Jul 2020 19:35:11 +0200
Subject: [PATCH 2/2] blender: update to 2.83.3, enable alembic support

---
 srcpkgs/blender/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 754af3f0c47..0b0f729e425 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,6 +1,6 @@
 # Template file for 'blender'
 pkgname=blender
-version=2.83.0
+version=2.83.3
 revision=1
 build_style="cmake"
 makedepends="
@@ -9,14 +9,14 @@ makedepends="
  libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
  libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
  opencolorio-devel opencollada-devel python3-numpy libXrender-devel
- OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel"
+ OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="3D graphics creation suite"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.blender.org"
 distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=14e2bc85e076b12ae94438ff3c1dd417eba642840ed32d7c979724a93aa93f1f
+checksum=57400f66da3e1500d23f8864e7e4dca26f86abc8ad99dc10d97d4872973aa2a2
 patch_args="-Np1"
 
 python_version=3
@@ -40,6 +40,7 @@ configure_args="
 -DWITH_OPENCOLLADA=ON
 -DWITH_SYSTEM_GLEW=ON
 -DWITH_OPENVDB=ON
+-DWITH_ALEMBIC=ON
 -DWITH_BUILDINFO=OFF
 -DPYTHON_VERSION=$py3_ver
 -DPYTHON_LIBPATH=/usr/lib