From f76bf7cfb723ff2d9b71e0a6e70241e81dac9aa7 Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Thu, 9 Jul 2020 19:34:54 +0200 Subject: [PATCH 1/2] alembic: build without TR1 Workaround for old compilers, incompatible with Blender --- common/shlibs | 2 +- srcpkgs/alembic/template | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 86ee9fcb734..7e0041531c1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3947,7 +3947,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.12_2 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..b04fbcbfa91 100644 --- a/srcpkgs/alembic/template +++ b/srcpkgs/alembic/template @@ -1,11 +1,10 @@ # Template file for 'alembic' pkgname=alembic version=1.7.12 -revision=1 +revision=2 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 " license="BSD-3-Clause, MIT" @@ -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 3ead4f59407203a87b0a3638757444350db307ff Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Thu, 9 Jul 2020 19:35:11 +0200 Subject: [PATCH 2/2] blender: update to 2.83.2, 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..6da9c2bd8c7 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.2 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 " license="GPL-2.0-or-later" homepage="http://www.blender.org" distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz" -checksum=14e2bc85e076b12ae94438ff3c1dd417eba642840ed32d7c979724a93aa93f1f +checksum=c18b70349df96bdd1fcec75f61ab6f17cbebd406ddcc8e6ba442773b734c4e22 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