Skip to content

Commit

Permalink
make jasper a dependency of qt5-imageformats to fix flaky CI build.
Browse files Browse the repository at this point in the history
  • Loading branch information
Neumann-A committed Oct 14, 2019
1 parent 5e30bcd commit db51886
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions ports/qt5-imageformats/CONTROL
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion ports/qt5-imageformats/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit db51886

Please sign in to comment.