zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-22 03:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

update jpeg-turbo to 2.1.1

Browse source
This commit is contained in:
alexey.lysiuk 2021-08-10 10:08:28 +03:00
parent dd5a6b52fb
commit 34fb30be93
5 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
deps/jpeg-turbo/include/jconfig.h vendored
View file

@ -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

23
deps/jpeg-turbo/lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake vendored
View file

@ -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()

2
deps/jpeg-turbo/lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake vendored
View file

@ -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.
#----------------------------------------------------------------

BIN
deps/jpeg-turbo/lib/libjpeg.a vendored
View file

Binary file not shown.

2
deps/jpeg-turbo/lib/pkgconfig/libjpeg.pc vendored
View file

@ -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}