* [PR PATCH] blender: enable alembic support
@ 2020-07-09 17:44 mvf
2020-07-09 23:44 ` fosslinux
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: mvf @ 2020-07-09 17:44 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
@ 2020-07-09 23:44 ` fosslinux
2020-07-10 1:09 ` q66
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: fosslinux @ 2020-07-09 23:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-656403544
Comment:
I think the TR1 in alembic would be better as a build-option.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
2020-07-09 23:44 ` fosslinux
@ 2020-07-10 1:09 ` q66
2020-07-10 1:09 ` q66
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: q66 @ 2020-07-10 1:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-656425864
Comment:
what's up with that tr1 change
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
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
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: q66 @ 2020-07-10 1:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-656425864
Comment:
what's up with that tr1 change
without tr1, atomic shouldn't be necessary at all
why disable it though
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] blender: enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (2 preceding siblings ...)
2020-07-10 1:09 ` q66
@ 2020-07-10 6:24 ` mvf
2020-07-10 6:28 ` mvf
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mvf @ 2020-07-10 6:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 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: 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: 3452 bytes --]
From f76bf7cfb723ff2d9b71e0a6e70241e81dac9aa7 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 3ead4f59407203a87b0a3638757444350db307ff 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.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 <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=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
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (3 preceding siblings ...)
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
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mvf @ 2020-07-10 6:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2041 bytes --]
New comment by mvf on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-656507808
Comment:
**TL;DR**
- the TR1 flavor of `alembic` is useless
- `libatomic` is required on `armv6l*`
**Prose**
> what's up with that tr1 change
TR1 is an obsolete non-standard C++ extension that has been effectively superseded by C++11. `alembic`'s TR1 build option is merely a fallback for people stuck on GCC < 4.8. Enabling it changes `alembic`'s interfaces, making it useless on modern systems. That's also why a build option makes no sense. From the README:
```
Some examples of OPTIONS you may want or need to use include:
[...]
-DALEMBIC_LIB_USES_TR1=ON or -DALEMBIC_LIB_USES_BOOST=ON if you do not have
a C++11 capable compiler specify one of these to use TR1, or boost as
a dependency of the Alembic library.
```
My guess is that the original `alembic` packager wasn't a C++ person and thought enabling TR1 was a neat way to get it to link without patching. From `lib/Alembic/CMakeLists.txt`:
```cmake
# link in atomic if we are using tr1 and the compiler is new enough
# to want __atomic_compare_exchange_n
IF ( ${ALEMBIC_LIB_USES_TR1} AND CMAKE_COMPILER_IS_GNUCXX AND
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8 )
TARGET_LINK_LIBRARIES( Alembic atomic )
ENDIF()
```
> without tr1, atomic shouldn't be necessary at all
`armv6l*` disagrees:
```
/usr/lib/gcc/arm-linux-gnueabihf/9.3.0/../../../../arm-linux-gnueabihf/bin/ld: ../../libAlembic.so.1.7.12: undefined reference to `__atomic_fetch_or_8'
/usr/lib/gcc/arm-linux-gnueabihf/9.3.0/../../../../arm-linux-gnueabihf/bin/ld: ../../libAlembic.so.1.7.12: undefined reference to `__atomic_compare_exchange_8'
/usr/lib/gcc/arm-linux-gnueabihf/9.3.0/../../../../arm-linux-gnueabihf/bin/ld: ../../libAlembic.so.1.7.12: undefined reference to `__atomic_load_8'
/usr/lib/gcc/arm-linux-gnueabihf/9.3.0/../../../../arm-linux-gnueabihf/bin/ld: ../../libAlembic.so.1.7.12: undefined reference to `__atomic_store_8'
```
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: update to 2.83.2, enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (4 preceding siblings ...)
2020-07-10 6:28 ` mvf
@ 2020-07-10 7:16 ` mvf
2020-07-10 10:57 ` fosslinux
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mvf @ 2020-07-10 7:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
New comment by mvf on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-656524827
Comment:
Guess I didn't really explain the "useless" part. It means: Recent applications don't compile against the TR1 flavor of `alembic`: https://github.com/void-linux/void-packages/issues/23112#issue-642559341
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: update to 2.83.2, enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (5 preceding siblings ...)
2020-07-10 7:16 ` blender: update to 2.83.2, " mvf
@ 2020-07-10 10:57 ` fosslinux
2020-07-10 10:57 ` fosslinux
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: fosslinux @ 2020-07-10 10:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-656615883
Comment:
Well, this is the most well-thought out answer to a question I have ever given.
I get it now, thanks, agree with the changes in that case.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: update to 2.83.2, enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (6 preceding siblings ...)
2020-07-10 10:57 ` fosslinux
@ 2020-07-10 10:57 ` fosslinux
2020-07-10 13:03 ` q66
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: fosslinux @ 2020-07-10 10:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-656615883
Comment:
Well, this is the most well-thought out answer to something I have put forward I have seen that i can think of. :)
I get it now, thanks, agree with the changes in that case.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: update to 2.83.2, enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (7 preceding siblings ...)
2020-07-10 10:57 ` fosslinux
@ 2020-07-10 13:03 ` q66
2020-07-10 15:57 ` mvf
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: q66 @ 2020-07-10 13:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 380 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-656665494
Comment:
that's strange, i only see atomic ever used if TR1 is on https://github.com/alembic/alembic/search?q=atomic&unscoped_q=atomic
but if that's the case, leave that in place, yeah - it'll be necessary for 32-bit powerpc and mips in the same way
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: update to 2.83.2, enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (8 preceding siblings ...)
2020-07-10 13:03 ` q66
@ 2020-07-10 15:57 ` mvf
2020-07-10 17:55 ` q66
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mvf @ 2020-07-10 15:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
New comment by mvf on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-656750681
Comment:
Atomics are always used. It won't even compile without. From [lib/Alembic/AbcCoreOgawa/StreamManager.cpp](https://github.com/alembic/alembic/blob/HEAD/lib/Alembic/AbcCoreOgawa/StreamManager.cpp):
```c++
// C++11 std::atomics version
#if !defined( ALEMBIC_LIB_USES_TR1 ) && __cplusplus >= 201103L
#define COMPARE_EXCHANGE( V, COMP, EXCH ) V.compare_exchange_weak( COMP, EXCH, std::memory_order_seq_cst, std::memory_order_seq_cst )
...
// gcc 4.8 and above not using C++11
#elif defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8
#define COMPARE_EXCHANGE( V, COMP, EXCH ) __atomic_compare_exchange_n( &V, &COMP, EXCH, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST )
// gcc 4.1 and above not using C++11
#elif defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1
#define COMPARE_EXCHANGE( V, COMP, EXCH ) __sync_bool_compare_and_swap( &V, COMP, EXCH )
#else
#error Please contact alembic-discuss@googlegroups.com for support.
#endif
```
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: update to 2.83.2, enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (9 preceding siblings ...)
2020-07-10 15:57 ` mvf
@ 2020-07-10 17:55 ` q66
2020-07-23 18:19 ` [PR PATCH] [Updated] " mvf
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: q66 @ 2020-07-10 17:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-656805414
Comment:
silly me, it uses `!` (and intrinsics as a fallback)
yes, lgtm
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] blender: update to 2.83.2, enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (10 preceding siblings ...)
2020-07-10 17:55 ` q66
@ 2020-07-23 18:19 ` mvf
2020-07-24 5:16 ` blender: update to 2.83.3, " mvf
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: mvf @ 2020-07-23 18:19 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: update to 2.83.3, enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (11 preceding siblings ...)
2020-07-23 18:19 ` [PR PATCH] [Updated] " mvf
@ 2020-07-24 5:16 ` mvf
2020-07-24 5:25 ` Gottox
2020-07-24 5:25 ` [PR PATCH] [Merged]: " Gottox
14 siblings, 0 replies; 16+ messages in thread
From: mvf @ 2020-07-24 5:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by mvf on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-663350519
Comment:
@Gottox Since you're the `blender` maintainer, care to merge this? The `x86_64` build timed out, but I actually tested it.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: blender: update to 2.83.3, enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (12 preceding siblings ...)
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
14 siblings, 0 replies; 16+ messages in thread
From: Gottox @ 2020-07-24 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/23498#issuecomment-663352535
Comment:
Thanks for taking care! Looks good to me! :+1:
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Merged]: blender: update to 2.83.3, enable alembic support
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
` (13 preceding siblings ...)
2020-07-24 5:25 ` Gottox
@ 2020-07-24 5:25 ` Gottox
14 siblings, 0 replies; 16+ messages in thread
From: Gottox @ 2020-07-24 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
There's a merged pull request on the void-packages repository
blender: update to 2.83.3, enable alembic support
https://github.com/void-linux/void-packages/pull/23498
Description:
Smoke-tested (export and import simple mesh) on x86_64. Fixes #23112
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2020-07-24 5:25 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-09 17:44 [PR PATCH] blender: enable alembic support mvf
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
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).