From: mvf <mvf@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] blender: enable alembic support
Date: Thu, 09 Jul 2020 19:44:10 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23498@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
There is a new 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: 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: 3161 bytes --]
From 405052f11a3ac6225d4f83df47d85eee172c29fd 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: 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 <orphan@voidlinux.org>"
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 101487eb3f7d538286d41b2f153b3ddb76a7c00c 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: enable alembic support
---
srcpkgs/blender/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 754af3f0c47..9d87347732f 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.83.0
-revision=1
+revision=2
build_style="cmake"
makedepends="
libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
@@ -9,7 +9,7 @@ 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>"
@@ -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
next reply other threads:[~2020-07-09 17:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 17:44 mvf [this message]
2020-07-09 23:44 ` fosslinux
2020-07-10 1:09 ` q66
2020-07-10 1:09 ` q66
2020-07-10 6:24 ` [PR PATCH] [Updated] " mvf
2020-07-10 6:28 ` mvf
2020-07-10 7:16 ` blender: update to 2.83.2, " mvf
2020-07-10 10:57 ` fosslinux
2020-07-10 10:57 ` fosslinux
2020-07-10 13:03 ` q66
2020-07-10 15:57 ` mvf
2020-07-10 17:55 ` q66
2020-07-23 18:19 ` [PR PATCH] [Updated] " mvf
2020-07-24 5:16 ` blender: update to 2.83.3, " mvf
2020-07-24 5:25 ` Gottox
2020-07-24 5:25 ` [PR PATCH] [Merged]: " Gottox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23498@inbox.vuxu.org \
--to=mvf@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).