hugin: unbreak cross
Cmake checks whether vigra links against openexr. The check always fails despite we link against openexr. The old patch that removed the check didn't apply anymore. This adds a replacement for the old patch.
This commit is contained in:
parent
a255afd2ce
commit
11434c15ca
2 changed files with 42 additions and 1 deletions
|
@ -0,0 +1,41 @@
|
|||
From c4ef0397cf4a85109a83b0a76553629d6d8fd87f Mon Sep 17 00:00:00 2001
|
||||
From: lemmi <lemmi@nerd2nerd.org>
|
||||
Date: Tue, 15 Dec 2020 14:54:48 +0100
|
||||
Subject: [PATCH] disable vigra-links-exr check
|
||||
|
||||
---
|
||||
CMakeModules/FindVIGRA.cmake | 18 ------------------
|
||||
1 file changed, 18 deletions(-)
|
||||
|
||||
diff --git CMakeModules/FindVIGRA.cmake CMakeModules/FindVIGRA.cmake
|
||||
index 2349916..f867b55 100755
|
||||
--- CMakeModules/FindVIGRA.cmake
|
||||
+++ CMakeModules/FindVIGRA.cmake
|
||||
@@ -63,24 +63,6 @@ IF (VIGRA_FOUND)
|
||||
"VIGRA lib is too old.\nHugin requires at least version 1.9.0, but found version ${VIGRA_VERSION}."
|
||||
)
|
||||
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)
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'hugin'
|
||||
pkgname=hugin
|
||||
version=2020.0.0
|
||||
revision=1
|
||||
revision=2
|
||||
wrksrc="${pkgname}-${version}"
|
||||
build_style=cmake
|
||||
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
|
||||
|
|
Loading…
Reference in a new issue