diff --git a/deps/jpeg-turbo/include/jconfig.h b/deps/jpeg-turbo/include/jconfig.h index fb504a58..81adf8c8 100644 --- a/deps/jpeg-turbo/include/jconfig.h +++ b/deps/jpeg-turbo/include/jconfig.h @@ -4,10 +4,10 @@ #define JPEG_LIB_VERSION 62 /* libjpeg-turbo version */ -#define LIBJPEG_TURBO_VERSION 2.1.0 +#define LIBJPEG_TURBO_VERSION 2.1.1 /* libjpeg-turbo version in integer form */ -#define LIBJPEG_TURBO_VERSION_NUMBER 2001000 +#define LIBJPEG_TURBO_VERSION_NUMBER 2001001 /* Support arithmetic encoding */ #define C_ARITH_CODING_SUPPORTED 1 diff --git a/deps/jpeg-turbo/lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake b/deps/jpeg-turbo/lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake index 29606b1c..aa8d7e46 100644 --- a/deps/jpeg-turbo/lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake +++ b/deps/jpeg-turbo/lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake @@ -7,14 +7,25 @@ # PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version. # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "2.1.0") +set(PACKAGE_VERSION "2.1.1") -if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) - set(PACKAGE_VERSION_COMPATIBLE FALSE) +if (PACKAGE_FIND_VERSION_RANGE) + # Package version must be in the requested version range + if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN) + OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX))) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + endif() else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) - set(PACKAGE_VERSION_EXACT TRUE) + if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + set(PACKAGE_VERSION_EXACT TRUE) + endif() endif() endif() diff --git a/deps/jpeg-turbo/lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake b/deps/jpeg-turbo/lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake index 736c4d07..e4808f81 100644 --- a/deps/jpeg-turbo/lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake +++ b/deps/jpeg-turbo/lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake @@ -4,7 +4,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) message(FATAL_ERROR "CMake >= 2.6.0 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.6...3.17) +cmake_policy(VERSION 2.6...3.19) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- diff --git a/deps/jpeg-turbo/lib/libjpeg.a b/deps/jpeg-turbo/lib/libjpeg.a index 2a700455..917484ea 100644 Binary files a/deps/jpeg-turbo/lib/libjpeg.a and b/deps/jpeg-turbo/lib/libjpeg.a differ diff --git a/deps/jpeg-turbo/lib/pkgconfig/libjpeg.pc b/deps/jpeg-turbo/lib/pkgconfig/libjpeg.pc index c08dcdef..75c82a5d 100644 --- a/deps/jpeg-turbo/lib/pkgconfig/libjpeg.pc +++ b/deps/jpeg-turbo/lib/pkgconfig/libjpeg.pc @@ -5,6 +5,6 @@ includedir=${prefix}/include Name: libjpeg Description: A SIMD-accelerated JPEG codec that provides the libjpeg API -Version: 2.1.0 +Version: 2.1.1 Libs: -L${libdir} -ljpeg Cflags: -I${includedir}