From db518863bdf000b04b54b1d909232028e47a2999 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 14 Oct 2019 21:42:07 +0200 Subject: [PATCH] make jasper a dependency of qt5-imageformats to fix flaky CI build. --- ports/qt5-imageformats/CONTROL | 4 ++-- ports/qt5-imageformats/portfile.cmake | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index 1fe00cbdcd57a8..24108f974215b8 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,4 +1,4 @@ Source: qt5-imageformats -Version: 5.12.5-1 +Version: 5.12.5-2 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP -Build-Depends: qt5-base, tiff, libwebp +Build-Depends: qt5-base, tiff, libwebp, jasper diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index ad7f37070f3630..fbac5100af20ef 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -5,8 +5,9 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) list(APPEND CORE_OPTIONS -system-tiff -system-webp + -jasper -verbose) - + find_library(TIFF_RELEASE NAMES tiff PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on lzma find_library(TIFF_DEBUG NAMES tiffd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)