mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 05:50:58 +08:00
[sdl2-image] Update to 2.8.2 (#36830)
Fixes https://github.com/microsoft/vcpkg/issues/36769 Removed `fix-pkgconfig.patch`. - [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [X] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [X] Any patches that are no longer applied are deleted from the port's directory. - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file. All features passed with following triplets: ``` x86-windows x64-windows x64-windows-static ``` Usage test pass with following triplets: ``` x86-windows x64-windows x64-windows-static ```
This commit is contained in:
parent
ea54f653ed
commit
086d63cc4e
@ -1,9 +1,9 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 438a0aa..5f019fa 100644
|
||||
index 65a8811..1f29faa 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -607,7 +607,7 @@ if(SDL2IMAGE_WEBP)
|
||||
list(APPEND INSTALL_EXTRA_TARGETS webp)
|
||||
@@ -690,7 +690,7 @@ if(SDL2IMAGE_WEBP)
|
||||
add_library(SDL2_image::external_libwebp ALIAS webp)
|
||||
else()
|
||||
message(STATUS "${PROJECT_NAME}: Using system libwebp")
|
||||
- find_package(webp REQUIRED)
|
||||
@ -12,10 +12,10 @@ index 438a0aa..5f019fa 100644
|
||||
endif()
|
||||
if(SDL2IMAGE_WEBP_SHARED)
|
||||
diff --git a/SDL2_imageConfig.cmake.in b/SDL2_imageConfig.cmake.in
|
||||
index ae38719..f1cc020 100644
|
||||
index c59e844..7b16a60 100644
|
||||
--- a/SDL2_imageConfig.cmake.in
|
||||
+++ b/SDL2_imageConfig.cmake.in
|
||||
@@ -67,7 +67,7 @@ endif()
|
||||
@@ -74,7 +74,7 @@ endif()
|
||||
|
||||
if(SDL2IMAGE_WEBP AND NOT SDL2IMAGE_VENDORED AND NOT TARGET WebP::webp)
|
||||
list(APPEND webp_ROOT "${CMAKE_CURRENT_LIST_DIR}")
|
||||
|
@ -1,22 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9abeefb..ba42875 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -694,7 +694,7 @@ if(SDL2IMAGE_INSTALL)
|
||||
COMPONENT devel
|
||||
)
|
||||
|
||||
- if(SDL2IMAGE_BUILD_SHARED_LIBS)
|
||||
+ if(1)
|
||||
# Only create a .pc file for a shared SDL2_image
|
||||
set(prefix "${CMAKE_INSTALL_PREFIX}")
|
||||
set(exec_prefix "\${prefix}")
|
||||
@@ -723,7 +723,7 @@ if(SDL2IMAGE_INSTALL)
|
||||
\"${CMAKE_CURRENT_BINARY_DIR}/SDL2_image.pc\")
|
||||
file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${PC_DESTDIR}\"
|
||||
TYPE FILE
|
||||
- FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_image.pc\")" CONFIG Release COMPONENT devel)
|
||||
+ FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_image.pc\")" COMPONENT devel)
|
||||
endif()
|
||||
|
||||
if(SDL2IMAGE_BUILD_SHARED_LIBS AND (APPLE OR (UNIX AND NOT ANDROID)))
|
@ -2,9 +2,10 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO libsdl-org/SDL_image
|
||||
REF "release-${VERSION}"
|
||||
SHA512 ffd0f838525e17a43d03ea5d4a094b0c79b2627bdbfb4589645abfb606c594773d60184de31bda45999421da75a69f1987ed696b255991212e498161102972b1
|
||||
SHA512 1ec6e7d08bbcd28bba6c972b2e4a11a1da841abef3ffb3d29669b0f5eb0839f39044b0b334c0707274dd51192e081f25bdab97c6710d632422c4ed0274a30f18
|
||||
HEAD_REF main
|
||||
PATCHES fix-pkgconfig.patch fix-findwebp.patch
|
||||
PATCHES
|
||||
fix-findwebp.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "sdl2-image",
|
||||
"version": "2.6.3",
|
||||
"port-version": 1,
|
||||
"version": "2.8.2",
|
||||
"description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV",
|
||||
"homepage": "https://github.com/libsdl-org/SDL_image",
|
||||
"license": "Zlib",
|
||||
|
@ -7845,8 +7845,8 @@
|
||||
"port-version": 11
|
||||
},
|
||||
"sdl2-image": {
|
||||
"baseline": "2.6.3",
|
||||
"port-version": 1
|
||||
"baseline": "2.8.2",
|
||||
"port-version": 0
|
||||
},
|
||||
"sdl2-mixer": {
|
||||
"baseline": "2.8.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "849a6f697c249f583d942ce2ce08ba3e4a9c195c",
|
||||
"version": "2.8.2",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "641c3eeecdd7f109ac777e1a2792dd2b755f07fc",
|
||||
"version": "2.6.3",
|
||||
|
Loading…
Reference in New Issue
Block a user