| 1 |
commit: b0ca3df14e110dba28d75a7023b423c79346b58b |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 10 05:22:31 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 10 05:23:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ca3df1 |
| 7 |
|
| 8 |
media-libs/vigra: add -DH5_USE_110_API workaround |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/808731 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/vigra/vigra-1.11.1-r3.ebuild | 6 +++++- |
| 14 |
media-libs/vigra/vigra-9999.ebuild | 6 +++++- |
| 15 |
2 files changed, 10 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild |
| 18 |
index 714a95b192e..65fd07b618a 100644 |
| 19 |
--- a/media-libs/vigra/vigra-1.11.1-r3.ebuild |
| 20 |
+++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild |
| 21 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 22 |
|
| 23 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 24 |
PYTHON_REQ_USE="threads(+),xml" |
| 25 |
-inherit cmake python-r1 |
| 26 |
+inherit cmake flag-o-matic python-r1 |
| 27 |
|
| 28 |
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" |
| 29 |
HOMEPAGE="https://ukoethe.github.io/vigra/" |
| 30 |
@@ -102,6 +102,10 @@ src_prepare() { |
| 31 |
} |
| 32 |
|
| 33 |
src_configure() { |
| 34 |
+ # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12) |
| 35 |
+ # bug #808731 |
| 36 |
+ use hdf5 && append-cppflags -DH5_USE_110_API |
| 37 |
+ |
| 38 |
vigra_configure() { |
| 39 |
local mycmakeargs=( |
| 40 |
-DAUTOEXEC_TESTS=OFF |
| 41 |
|
| 42 |
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild |
| 43 |
index 9ffac6b73b0..171eedd560f 100644 |
| 44 |
--- a/media-libs/vigra/vigra-9999.ebuild |
| 45 |
+++ b/media-libs/vigra/vigra-9999.ebuild |
| 46 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 47 |
|
| 48 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
| 49 |
PYTHON_REQ_USE="threads(+),xml" |
| 50 |
-inherit cmake python-r1 |
| 51 |
+inherit cmake flag-o-matic python-r1 |
| 52 |
|
| 53 |
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" |
| 54 |
HOMEPAGE="https://ukoethe.github.io/vigra/" |
| 55 |
@@ -106,6 +106,10 @@ src_prepare() { |
| 56 |
} |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
+ # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12) |
| 60 |
+ # bug #808731 |
| 61 |
+ use hdf5 && append-cppflags -DH5_USE_110_API |
| 62 |
+ |
| 63 |
vigra_configure() { |
| 64 |
local mycmakeargs=( |
| 65 |
-DAUTOEXEC_TESTS=OFF |
Archives