From 086d63cc4eb4e7bde24d2e4aa993375d644e14ca Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 21 Feb 2024 18:00:26 +0000 Subject: [PATCH] [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 ``` --- ports/sdl2-image/fix-findwebp.patch | 10 +++++----- ports/sdl2-image/fix-pkgconfig.patch | 22 ---------------------- ports/sdl2-image/portfile.cmake | 5 +++-- ports/sdl2-image/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sdl2-image.json | 5 +++++ 6 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 ports/sdl2-image/fix-pkgconfig.patch diff --git a/ports/sdl2-image/fix-findwebp.patch b/ports/sdl2-image/fix-findwebp.patch index b2d40eca3d..b6ded4a714 100644 --- a/ports/sdl2-image/fix-findwebp.patch +++ b/ports/sdl2-image/fix-findwebp.patch @@ -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}") diff --git a/ports/sdl2-image/fix-pkgconfig.patch b/ports/sdl2-image/fix-pkgconfig.patch deleted file mode 100644 index 1bd8bcaf21..0000000000 --- a/ports/sdl2-image/fix-pkgconfig.patch +++ /dev/null @@ -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))) diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake index dadacc3334..c541249bd8 100644 --- a/ports/sdl2-image/portfile.cmake +++ b/ports/sdl2-image/portfile.cmake @@ -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( diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json index bcec81ee07..9e85351f15 100644 --- a/ports/sdl2-image/vcpkg.json +++ b/ports/sdl2-image/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index 571967111f..313941daf3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index 5292e9b68a..f6d94d3422 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "849a6f697c249f583d942ce2ce08ba3e4a9c195c", + "version": "2.8.2", + "port-version": 0 + }, { "git-tree": "641c3eeecdd7f109ac777e1a2792dd2b755f07fc", "version": "2.6.3",