hugin: fix compilation

This commit is contained in:
Enno Boland 2016-03-19 23:49:03 +01:00
parent 15406afc5f
commit fb77e6ccbf
2 changed files with 27 additions and 1 deletions

View file

@ -0,0 +1,26 @@
--- 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,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2015.0.0
revision=4
revision=5
build_style=cmake
configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0"
pycompile_module="hpi.py hsi.py"