hugin: update to 2020.0.0.

This commit is contained in:
lemmi 2020-12-15 10:42:29 +01:00
parent f8be314de6
commit 96ebe2d86c
3 changed files with 3 additions and 76 deletions

View file

@ -1,26 +0,0 @@
--- CMakeModules/FindVIGRA.cmake.orig 2016-03-19 23:33:56.993637763 +0100
+++ CMakeModules/FindVIGRA.cmake 2016-03-19 23:34:16.445636308 +0100
@@ -65,23 +65,6 @@ IF (VIGRA_FOUND)
)
ENDIF()
- # check if vigraimpex is linked against OpenEXR
- IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- FIND_PROGRAM(LDD_EXECUTABLE ldd)
- IF(LDD_EXECUTABLE)
- EXECUTE_PROCESS(
- COMMAND ${LDD_EXECUTABLE} ${VIGRA_LIBRARIES}
- OUTPUT_VARIABLE OUTPUT_LDD_VIGRA
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
- IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
- MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
- ENDIF()
- ELSE()
- MESSAGE(FATAL_ERROR "Could not check libraries on which vigraimpex depends. (ldd is missing)")
- ENDIF()
- ENDIF()
ELSE (VIGRA_FOUND)
MESSAGE(FATAL_ERROR "Could not find VIGRA")
ENDIF (VIGRA_FOUND)

View file

@ -1,47 +0,0 @@
--- CMakeModules/FindOpenEXR.cmake 2018-07-23 19:34:46.000000000 +0200
+++ CMakeModules/FindOpenEXR.cmake 2019-12-02 16:00:26.781901111 +0100
@@ -35,7 +35,7 @@
include(FindLibraryWithDebug)
find_library_with_debug(OPENEXR_HALF_LIBRARY
WIN32_DEBUG_POSTFIX d
- NAMES Half-2_3 Half
+ NAMES Half-2_4 Half-2_3 Half
PATHS
${_OPENEXRLinkDir}
${SYSTEM_LIB_DIRS}
@@ -45,7 +45,7 @@
find_library_with_debug(OPENEXR_IEX_LIBRARY
WIN32_DEBUG_POSTFIX d
- NAMES Iex-2_3 Iex-2_2 Iex
+ NAMES Iex-2_4 Iex-2_3 Iex-2_2 Iex
PATHS
${_OPENEXRLinkDir}
${SYSTEM_LIB_DIRS}
@@ -55,7 +55,7 @@
find_library_with_debug(OPENEXR_ILMTHREAD_LIBRARY
WIN32_DEBUG_POSTFIX d
- NAMES IlmThread-2_3 IlmThread-2_2 IlmThread
+ NAMES IlmThread-2_4 IlmThread-2_3 IlmThread-2_2 IlmThread
PATHS
${_OPENEXRLinkDir}
${SYSTEM_LIB_DIRS}
@@ -65,7 +65,7 @@
find_library_with_debug(OPENEXR_IMATH_LIBRARY
WIN32_DEBUG_POSTFIX d
- NAMES Imath-2_3 Imath-2_2 Imath
+ NAMES Imath-2_4 Imath-2_3 Imath-2_2 Imath
PATHS
${_OPENEXRLinkDir}
${SYSTEM_LIB_DIRS}
@@ -76,7 +76,7 @@
find_library_with_debug(OPENEXR_ILMIMF_LIBRARY
WIN32_DEBUG_POSTFIX d
- NAMES IlmImf-2_3 IlmImf-2_2 IlmImf
+ NAMES IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf
PATHS
${_OPENEXRLinkDir}
${SYSTEM_LIB_DIRS}

View file

@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.2.0
revision=3
version=2020.0.0
revision=1
wrksrc="${pkgname}-${version}"
build_style=cmake
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
@ -16,7 +16,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="http://hugin.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2"
checksum=8ba6bdfea246313f142f17f42e066c6888f51b72e4f8814b5e1c84ff56a95a3e
checksum=283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb
python_version=3
if [ "$CROSS_BUILD" ]; then