mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2025-02-16 16:41:42 +00:00
update webp to 1.2.2
This commit is contained in:
parent
397c14c12f
commit
a2103b9819
6 changed files with 21 additions and 10 deletions
2
deps/webp/include/webp/decode.h
vendored
2
deps/webp/include/webp/decode.h
vendored
|
@ -85,7 +85,7 @@ WEBP_EXTERN uint8_t* WebPDecodeBGR(const uint8_t* data, size_t data_size,
|
||||||
// Upon return, the Y buffer has a stride returned as '*stride', while U and V
|
// Upon return, the Y buffer has a stride returned as '*stride', while U and V
|
||||||
// have a common stride returned as '*uv_stride'.
|
// have a common stride returned as '*uv_stride'.
|
||||||
// Return NULL in case of error.
|
// Return NULL in case of error.
|
||||||
// (*) Also named Y'CbCr. See: http://en.wikipedia.org/wiki/YCbCr
|
// (*) Also named Y'CbCr. See: https://en.wikipedia.org/wiki/YCbCr
|
||||||
WEBP_EXTERN uint8_t* WebPDecodeYUV(const uint8_t* data, size_t data_size,
|
WEBP_EXTERN uint8_t* WebPDecodeYUV(const uint8_t* data, size_t data_size,
|
||||||
int* width, int* height,
|
int* width, int* height,
|
||||||
uint8_t** u, uint8_t** v,
|
uint8_t** u, uint8_t** v,
|
||||||
|
|
2
deps/webp/lib/cmake/WebP/WebPConfig.cmake
vendored
2
deps/webp/lib/cmake/WebP/WebPConfig.cmake
vendored
|
@ -1,4 +1,4 @@
|
||||||
set(WebP_VERSION 1.2.0)
|
set(WebP_VERSION 1.2.2)
|
||||||
set(WEBP_VERSION ${WebP_VERSION})
|
set(WEBP_VERSION ${WebP_VERSION})
|
||||||
|
|
||||||
|
|
||||||
|
|
15
deps/webp/lib/cmake/WebP/WebPConfigVersion.cmake
vendored
15
deps/webp/lib/cmake/WebP/WebPConfigVersion.cmake
vendored
|
@ -7,15 +7,26 @@
|
||||||
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
||||||
# The variable CVF_VERSION must be set before calling configure_file().
|
# The variable CVF_VERSION must be set before calling configure_file().
|
||||||
|
|
||||||
set(PACKAGE_VERSION "1.2.0")
|
set(PACKAGE_VERSION "1.2.2")
|
||||||
|
|
||||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
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)
|
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||||
|
else()
|
||||||
|
set(PACKAGE_VERSION_COMPATIBLE TRUE)
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
|
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||||
|
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||||
|
else()
|
||||||
set(PACKAGE_VERSION_COMPATIBLE TRUE)
|
set(PACKAGE_VERSION_COMPATIBLE TRUE)
|
||||||
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
|
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
|
||||||
set(PACKAGE_VERSION_EXACT TRUE)
|
set(PACKAGE_VERSION_EXACT TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
2
deps/webp/lib/cmake/WebP/WebPTargets.cmake
vendored
2
deps/webp/lib/cmake/WebP/WebPTargets.cmake
vendored
|
@ -4,7 +4,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
|
||||||
message(FATAL_ERROR "CMake >= 2.6.0 required")
|
message(FATAL_ERROR "CMake >= 2.6.0 required")
|
||||||
endif()
|
endif()
|
||||||
cmake_policy(PUSH)
|
cmake_policy(PUSH)
|
||||||
cmake_policy(VERSION 2.6...3.17)
|
cmake_policy(VERSION 2.6...3.19)
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
# Generated CMake target import file.
|
# Generated CMake target import file.
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
|
|
BIN
deps/webp/lib/libwebp.a
vendored
BIN
deps/webp/lib/libwebp.a
vendored
Binary file not shown.
2
deps/webp/lib/pkgconfig/libwebp.pc
vendored
2
deps/webp/lib/pkgconfig/libwebp.pc
vendored
|
@ -5,7 +5,7 @@ includedir=${prefix}/include
|
||||||
|
|
||||||
Name: libwebp
|
Name: libwebp
|
||||||
Description: Library for the WebP graphics format
|
Description: Library for the WebP graphics format
|
||||||
Version: 1.2.0
|
Version: 1.2.2
|
||||||
Cflags: -I${prefix}/include
|
Cflags: -I${prefix}/include
|
||||||
Libs: -L${prefix}/lib -lwebp
|
Libs: -L${prefix}/lib -lwebp
|
||||||
Libs.private:
|
Libs.private:
|
||||||
|
|
Loading…
Reference in a new issue