mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-22 17:17:03 +02:00
vigra: update to 1.11.2.
This commit is contained in:
parent
f84a1ceda7
commit
9bd54c0421
3 changed files with 4 additions and 82 deletions
|
@ -1,30 +0,0 @@
|
|||
Index: vigra-1.11.1/include/vigra/stdconvolution.hxx
|
||||
===================================================================
|
||||
--- vigra-1.11.1.orig/include/vigra/stdconvolution.hxx
|
||||
+++ vigra-1.11.1/include/vigra/stdconvolution.hxx
|
||||
@@ -792,7 +792,9 @@ public:
|
||||
{}
|
||||
|
||||
~InitProxy()
|
||||
-#ifndef _MSC_VER
|
||||
+#if __cplusplus >= 201700L
|
||||
+ noexcept(false)
|
||||
+#elif !defined(_MSC_VER)
|
||||
throw(PreconditionViolation)
|
||||
#elif _MSC_VER >= 1900
|
||||
noexcept(false)
|
||||
Index: vigra-1.11.1/include/vigra/separableconvolution.hxx
|
||||
===================================================================
|
||||
--- vigra-1.11.1.orig/include/vigra/separableconvolution.hxx
|
||||
+++ vigra-1.11.1/include/vigra/separableconvolution.hxx
|
||||
@@ -1409,7 +1409,9 @@ class Kernel1D
|
||||
{}
|
||||
|
||||
~InitProxy()
|
||||
-#ifndef _MSC_VER
|
||||
+#if __cplusplus >= 201700L
|
||||
+ noexcept(false)
|
||||
+#elif !defined(_MSC_VER)
|
||||
throw(PreconditionViolation)
|
||||
#elif _MSC_VER >= 1900
|
||||
noexcept(false)
|
|
@ -1,40 +0,0 @@
|
|||
Index: vigra-1.11.1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- vigra-1.11.1.orig/CMakeLists.txt
|
||||
+++ vigra-1.11.1/CMakeLists.txt
|
||||
@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
|
||||
|
||||
|
||||
IF(WITH_OPENEXR)
|
||||
+ FIND_PACKAGE(Imath CONFIG)
|
||||
+ IF(TARGET Imath::Imath)
|
||||
+ FIND_PACKAGE(OpenEXR CONFIG)
|
||||
+ SET(OPENEXR_LIBRARIES
|
||||
+ OpenEXR::OpenEXR
|
||||
+ OpenEXR::Iex
|
||||
+ OpenEXR::IlmThread
|
||||
+ Imath::Imath
|
||||
+ )
|
||||
+ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
|
||||
+ get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
|
||||
+ include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
|
||||
+ set(OPENEXR_FOUND TRUE)
|
||||
+ ELSE()
|
||||
VIGRA_FIND_PACKAGE(OpenEXR)
|
||||
+ ENDIF()
|
||||
ENDIF()
|
||||
|
||||
IF(WITH_HDF5)
|
||||
Index: vigra-1.11.1/src/impex/CMakeLists.txt
|
||||
===================================================================
|
||||
--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
|
||||
+++ vigra-1.11.1/src/impex/CMakeLists.txt
|
||||
@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
|
||||
ENDIF(TIFF_FOUND)
|
||||
|
||||
IF(OPENEXR_FOUND)
|
||||
+ cmake_policy(SET CMP0028 NEW)
|
||||
TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
|
||||
ENDIF(OPENEXR_FOUND)
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'vigra'
|
||||
pkgname=vigra
|
||||
version=1.11.1
|
||||
revision=11
|
||||
version=1.11.2
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DWITH_OPENEXR=1"
|
||||
hostmakedepends="python3"
|
||||
|
@ -11,19 +11,11 @@ short_desc="Image processing and analysis library"
|
|||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||
license="MIT"
|
||||
homepage="https://ukoethe.github.io/vigra/"
|
||||
distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
|
||||
checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
|
||||
distfiles="https://github.com/ukoethe/vigra/archive/refs/tags/Version-${version//./-}.tar.gz"
|
||||
checksum=4841936f5c3c137611ec782e293d961df29d3b5b70ade8cb711374de0f4cb5d3
|
||||
make_check=no # all tests fail with: [Unknown system error -8] Process not started
|
||||
python_version=3
|
||||
|
||||
pre_configure() {
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
g++ config/output_cplusplus_version.cxx -o gccbugcheck
|
||||
sed "s#%OUTPUT%#$(./gccbugcheck)#" $FILESDIR/TryRunResults.cmake > TryRunResults.cmake
|
||||
configure_args+=" -C $PWD/TryRunResults.cmake"
|
||||
fi
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE.txt
|
||||
vmkdir usr/share/$pkgname
|
||||
|
|
Loading…
Add table
Reference in a new issue