diff --git a/ports/sdl2-image/fix-findwebp.patch b/ports/sdl2-image/fix-findwebp.patch new file mode 100644 index 0000000000..b2d40eca3d --- /dev/null +++ b/ports/sdl2-image/fix-findwebp.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 438a0aa..5f019fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -607,7 +607,7 @@ if(SDL2IMAGE_WEBP) + list(APPEND INSTALL_EXTRA_TARGETS webp) + else() + message(STATUS "${PROJECT_NAME}: Using system libwebp") +- find_package(webp REQUIRED) ++ find_package(webp NAMES WebP CONFIG REQUIRED) + list(APPEND PC_REQUIRES libwebp) + endif() + if(SDL2IMAGE_WEBP_SHARED) +diff --git a/SDL2_imageConfig.cmake.in b/SDL2_imageConfig.cmake.in +index ae38719..f1cc020 100644 +--- a/SDL2_imageConfig.cmake.in ++++ b/SDL2_imageConfig.cmake.in +@@ -67,7 +67,7 @@ endif() + + if(SDL2IMAGE_WEBP AND NOT SDL2IMAGE_VENDORED AND NOT TARGET WebP::webp) + list(APPEND webp_ROOT "${CMAKE_CURRENT_LIST_DIR}") +- find_dependency(webp) ++ find_dependency(webp NAMES WebP CONFIG) + endif() + + #FIXME: can't add SDL2IMAGE_SDL2_REQUIRED_VERSION since not all SDL2 installs ship SDL2ConfigVersion.cmake diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake index f1bbd9f72b..dadacc3334 100644 --- a/ports/sdl2-image/portfile.cmake +++ b/ports/sdl2-image/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL_image - REF release-${VERSION} - SHA512 8ecf26a13ffc00b9941bf0befb669c1fd2f2d2e9ca1dcf7210cb93eb18f49cf749af1f491f85627eed7030d1e603051720c9470bfed9b031b0219e3a47d06622 + REF "release-${VERSION}" + SHA512 ffd0f838525e17a43d03ea5d4a094b0c79b2627bdbfb4589645abfb606c594773d60184de31bda45999421da75a69f1987ed696b255991212e498161102972b1 HEAD_REF main - PATCHES - fix-pkgconfig.patch + PATCHES fix-pkgconfig.patch fix-findwebp.patch ) vcpkg_check_features( diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json index 9c61947681..8198bbd180 100644 --- a/ports/sdl2-image/vcpkg.json +++ b/ports/sdl2-image/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdl2-image", - "version": "2.6.2", - "port-version": 1, + "version": "2.6.3", "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 3a37ed9083..580b255976 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7025,8 +7025,8 @@ "port-version": 8 }, "sdl2-image": { - "baseline": "2.6.2", - "port-version": 1 + "baseline": "2.6.3", + "port-version": 0 }, "sdl2-mixer": { "baseline": "2.6.1", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index d776eae01a..38f9a2a45f 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cea786776b9bf5d0af613153194d58fa74aaf011", + "version": "2.6.3", + "port-version": 0 + }, { "git-tree": "a4a1c7cb5a7a8f391ad42e354dc4e578bcf2f590", "version": "2.6.2",