summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-06-23 19:31:07 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-06-24 12:16:07 +0200
commit68cb32940b7d2b16923ca4963b6cb447eb3e1dbe (patch)
tree52568c143c6b42237eaf7a5168a68e4a1ca38931
parent0ce42698b0485f9723cf517ef3f28b7442a19c33 (diff)
downloadscientific-68cb32940b7d2b16923ca4963b6cb447eb3e1dbe.tar.gz
scientific-68cb32940b7d2b16923ca4963b6cb447eb3e1dbe.tar.xz
vigra: Version bump to 1.11.1
This also fixes a build error with dependent packages and gcc7. Change-Id: I9110dd4c28d3e170a19cec22ab5e64be32ccf681
-rw-r--r--packages/dev-libs/vigra/vigra-1.11.1.exheres-0 (renamed from packages/dev-libs/vigra/vigra-1.10.0-r6.exheres-0)19
1 files changed, 17 insertions, 2 deletions
diff --git a/packages/dev-libs/vigra/vigra-1.10.0-r6.exheres-0 b/packages/dev-libs/vigra/vigra-1.11.1.exheres-0
index 5094d02..6a756f1 100644
--- a/packages/dev-libs/vigra/vigra-1.10.0-r6.exheres-0
+++ b/packages/dev-libs/vigra/vigra-1.11.1.exheres-0
@@ -12,7 +12,7 @@ its main emphasize on customizable algorithms and data structures.
By using template techniques similar to those in the C++ Standard Template Library, you can easily
adapt any VIGRA component to the needs of your application, without thereby giving up execution speed.
"
-HOMEPAGE="http://ukoethe.github.io/${PN}"
+HOMEPAGE="https://ukoethe.github.io/${PN}"
BUGS_TO="ingmar@exherbo.org"
@@ -34,7 +34,11 @@ DEPENDENCIES="
build+run:
media-libs/libpng:=
sci-libs/fftw[>=3.3]
- openexr? ( media-libs/openexr )
+ sys-libs/zlib
+ openexr? (
+ media-libs/ilmbase
+ media-libs/openexr
+ )
providers:ijg-jpeg? ( media-libs/jpeg:= )
providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
tiff? ( media-libs/tiff )
@@ -44,7 +48,10 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DDOCINSTALL:PATH=../share/doc/${PNVR}
-DWITH_HDF5:BOOL=FALSE
-DWITH_VALGRIND:BOOL=FALSE
+ # Would need boost
-DWITH_VIGRANUMPY:BOOL=FALSE
+ -DWITH_BOOST_GRAPH:BOOL=FALSE
+ -DWITH_BOOST_THREAD:BOOL=FALSE
)
CMAKE_SRC_CONFIGURE_OPTION_DISABLE_FINDS=(
'doc Doxygen'
@@ -52,3 +59,11 @@ CMAKE_SRC_CONFIGURE_OPTION_DISABLE_FINDS=(
)
CMAKE_SRC_CONFIGURE_OPTION_WITHS=( OPENEXR )
+src_prepare() {
+ cmake_src_prepare
+
+ # Disable failing tests, https://github.com/ukoethe/vigra/issues/409
+ edo sed -e "/VIGRA_ADD_TEST(test_blockwiselabeling /d" \
+ -e "/VIGRA_ADD_TEST(test_blockwisewatersheds /d" \
+ -i test/blockwisealgorithms/CMakeLists.txt
+}