| 1 |
commit: cae650d89e8ff3ceb61818bc90b216339deff77d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 31 06:26:04 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 31 06:29:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae650d8 |
| 7 |
|
| 8 |
media-gfx/alembic: force use of OpenEXR 2 (ilmbase), not imath for now |
| 9 |
|
| 10 |
We want to avoid mismatches within Blender. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/818232 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../{alembic-1.8.3.ebuild => alembic-1.8.3-r1.ebuild} | 17 ++++++++--------- |
| 16 |
profiles/arch/arm/package.use.mask | 4 ++++ |
| 17 |
profiles/arch/arm64/package.use.mask | 4 ++++ |
| 18 |
3 files changed, 16 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-gfx/alembic/alembic-1.8.3.ebuild b/media-gfx/alembic/alembic-1.8.3-r1.ebuild |
| 21 |
similarity index 86% |
| 22 |
rename from media-gfx/alembic/alembic-1.8.3.ebuild |
| 23 |
rename to media-gfx/alembic/alembic-1.8.3-r1.ebuild |
| 24 |
index 5cf7be6360a..3ec597c047e 100644 |
| 25 |
--- a/media-gfx/alembic/alembic-1.8.3.ebuild |
| 26 |
+++ b/media-gfx/alembic/alembic-1.8.3-r1.ebuild |
| 27 |
@@ -3,15 +3,15 @@ |
| 28 |
|
| 29 |
EAPI=8 |
| 30 |
|
| 31 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 32 |
+PYTHON_COMPAT=( python3_{8..9} ) |
| 33 |
|
| 34 |
inherit cmake python-single-r1 |
| 35 |
|
| 36 |
DESCRIPTION="Open framework for storing and sharing scene data" |
| 37 |
HOMEPAGE="https://www.alembic.io/" |
| 38 |
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 39 |
-LICENSE="BSD" |
| 40 |
|
| 41 |
+LICENSE="BSD" |
| 42 |
SLOT="0" |
| 43 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 44 |
IUSE="examples hdf5 python test" |
| 45 |
@@ -20,13 +20,8 @@ RESTRICT="!test? ( test )" |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
${PYTHON_DEPS} |
| 49 |
- || ( |
| 50 |
- >=dev-libs/imath-3.0.1[python?,${PYTHON_SINGLE_USEDEP}] |
| 51 |
- ( |
| 52 |
- >=media-libs/ilmbase-2.5.5 |
| 53 |
- python? ( >=dev-python/pyilmbase-2.5.5[${PYTHON_SINGLE_USEDEP}] ) |
| 54 |
- ) |
| 55 |
- ) |
| 56 |
+ >=media-libs/ilmbase-2.5.5:= |
| 57 |
+ python? ( >=dev-python/pyilmbase-2.5.5[${PYTHON_SINGLE_USEDEP}] ) |
| 58 |
hdf5? ( |
| 59 |
>=sci-libs/hdf5-1.10.2:=[zlib(+)] |
| 60 |
>=sys-libs/zlib-1.2.11-r1 |
| 61 |
@@ -50,6 +45,10 @@ src_prepare() { |
| 62 |
|
| 63 |
src_configure() { |
| 64 |
local mycmakeargs=( |
| 65 |
+ # Force falling back to ilmbase for now |
| 66 |
+ # bug #818232 |
| 67 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Imath=ON |
| 68 |
+ |
| 69 |
-DALEMBIC_BUILD_LIBS=ON |
| 70 |
-DALEMBIC_SHARED_LIBS=ON |
| 71 |
# currently does nothing but require doxygen |
| 72 |
|
| 73 |
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask |
| 74 |
index 88a8463a077..fa5842d8a52 100644 |
| 75 |
--- a/profiles/arch/arm/package.use.mask |
| 76 |
+++ b/profiles/arch/arm/package.use.mask |
| 77 |
@@ -1,6 +1,10 @@ |
| 78 |
# Copyright 1999-2021 Gentoo Authors |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
+# Sam James <sam@g.o> (2021-10-31) |
| 82 |
+# dev-python/pyilmbase isn't keyworded on arm |
| 83 |
+media-gfx/alembic python |
| 84 |
+ |
| 85 |
# Sam James <sam@g.o> (2021-10-26) |
| 86 |
# Avoid dragging in obscure parts of dev-qt/* unless/until |
| 87 |
# somebody needs them. bug #816981. |
| 88 |
|
| 89 |
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask |
| 90 |
index 4dbdd22f3d1..badf15963e1 100644 |
| 91 |
--- a/profiles/arch/arm64/package.use.mask |
| 92 |
+++ b/profiles/arch/arm64/package.use.mask |
| 93 |
@@ -1,6 +1,10 @@ |
| 94 |
# Copyright 1999-2021 Gentoo Authors |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
|
| 97 |
+# Sam James <sam@g.o> (2021-10-31) |
| 98 |
+# dev-python/pyilmbase isn't keyworded on arm64 |
| 99 |
+media-gfx/alembic python |
| 100 |
+ |
| 101 |
# Ben Kohler <bkohler@g.o> (2021-10-18) |
| 102 |
# missing keywords on net-misc/pyhoca-cli and its deps |
| 103 |
net-misc/remmina x2go |
Archives