[sdl2-image] Bump to 2.6.2. (#27627)

* [sdl2-image] Update to 2.6.2. * [sdl2-image] Update baseline and version history. * [sdl2pp] Update sdl2-image target name. * [sdl2pp] Update baseline and version history. * [sdl2-image] Fix .pc file generation. * [sdl2-image] Visually align features in portfile. * [sdl2-image] Shorten patch to the strict minimum.
microsoft · Nov 8, 2022 · 39b028f · 39b028f
1 parent 76a79d9
commit 39b028f
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 219 deletions.
diff --git a/...s/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch b/...s/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch
diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt
diff --git a/ports/sdl2-image/fix-pkgconfig.patch b/ports/sdl2-image/fix-pkgconfig.patch
@@ -0,0 +1,22 @@
+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
@@ -1,43 +1,54 @@
-set(SDL2_IMAGE_VERSION "2.0.5")
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${SDL2_IMAGE_VERSION}.zip"
-    FILENAME "SDL2_image-${SDL2_IMAGE_VERSION}.zip"
-    SHA512 c10e28a0d50fb7a6c985ffe8904370ab4faeb9bbed6f2ffbc81536422e8f8bb66eddbf69b12423082216c2bcfcb617cba4c5970f63fe75bfacccd9f99f02a6a2
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${SDL2_IMAGE_VERSION}
+    REPO libsdl-org/SDL_image
+    REF release-${VERSION}
+    SHA512 8ecf26a13ffc00b9941bf0befb669c1fd2f2d2e9ca1dcf7210cb93eb18f49cf749af1f491f85627eed7030d1e603051720c9470bfed9b031b0219e3a47d06622
+    HEAD_REF main
     PATCHES
-        0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch
+        fix-pkgconfig.patch
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/sdl2-image-config.cmake.in" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        libjpeg-turbo USE_JPEG
-        tiff USE_TIFF
-        libwebp USE_WEBP
+        libjpeg-turbo SDL2IMAGE_JPG
+        libwebp       SDL2IMAGE_WEBP
+        tiff          SDL2IMAGE_TIF
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SDL2IMAGE_DEPS_SHARED)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DUSE_PNG=ON
         ${FEATURE_OPTIONS}
+        -DSDL2IMAGE_BACKEND_IMAGEIO=OFF
+        -DSDL2IMAGE_BACKEND_STB=OFF
+        -DSDL2IMAGE_DEPS_SHARED=${SDL2IMAGE_DEPS_SHARED}
+        -DSDL2IMAGE_SAMPLES=OFF
+        -DSDL2IMAGE_VENDORED=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup()
+if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
+    vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_image CONFIG_PATH cmake)
+elseif(EXISTS "${CURRENT_PACKAGES_DIR}/SDL2_image.framework/Resources")
+    vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_image CONFIG_PATH SDL2_image.framework/Resources)
+else()
+    vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_image CONFIG_PATH lib/cmake/SDL2_image)
+endif()
+
 vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE 
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/SDL2_image.framework"
+    "${CURRENT_PACKAGES_DIR}/debug/SDL2_image.framework"
+)
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/ports/sdl2-image/sdl2-image-config.cmake.in b/ports/sdl2-image/sdl2-image-config.cmake.in
diff --git a/ports/sdl2-image/usage b/ports/sdl2-image/usage
@@ -0,0 +1,4 @@
+sdl2-image provides CMake targets:
+
+    find_package(SDL2_image CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:SDL2_image::SDL2_image>,SDL2_image::SDL2_image,SDL2_image::SDL2_image-static>)
diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json
@@ -1,9 +1,8 @@
 {
   "name": "sdl2-image",
-  "version": "2.0.5",
-  "port-version": 7,
+  "version": "2.6.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://www.libsdl.org/projects/SDL_image",
+  "homepage": "https://github.com/libsdl-org/SDL_image",
   "license": "Zlib",
   "dependencies": [
     "libpng",
@@ -21,39 +20,18 @@
     "libjpeg-turbo": {
       "description": "Support for JPEG image format",
       "dependencies": [
-        "libjpeg-turbo",
-        {
-          "name": "sdl2",
-          "features": [
-            "x11"
-          ],
-          "platform": "!windows"
-        }
+        "libjpeg-turbo"
       ]
     },
     "libwebp": {
       "description": "Support for WEBP image format.",
       "dependencies": [
-        "libwebp",
-        {
-          "name": "sdl2",
-          "features": [
-            "x11"
-          ],
-          "platform": "!windows"
-        }
+        "libwebp"
       ]
     },
     "tiff": {
       "description": "Support for TIFF image format",
       "dependencies": [
-        {
-          "name": "sdl2",
-          "features": [
-            "x11"
-          ],
-          "platform": "!windows"
-        },
         "tiff"
       ]
     }

diff --git a/ports/sdl2pp/fix-dependencies.patch b/ports/sdl2pp/fix-dependencies.patch
@@ -35,11 +35,10 @@ index cdfd2a6..dc08748 100644
  ENDIF(MINGW)
 
  IF(SDL2PP_WITH_IMAGE)
--	FIND_PACKAGE(SDL2_image REQUIRED)
+  FIND_PACKAGE(SDL2_image REQUIRED)
 -	SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIR})
 -	SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_IMAGE_LIBRARY})
-+	FIND_PACKAGE(sdl2-image CONFIG REQUIRED)
-+	SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_image)
++	SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} $<IF:$<TARGET_EXISTS:SDL2_image::SDL2_image>,SDL2_image::SDL2_image,SDL2_image::SDL2_image-static>)
  	SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_image")
  ELSE(SDL2PP_WITH_IMAGE)
  	MESSAGE(STATUS "SDL2_image support disabled")

diff --git a/ports/sdl2pp/vcpkg.json b/ports/sdl2pp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sdl2pp",
   "version": "0.16.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "C++11 bindings/wrapper for SDL2",
   "homepage": "https://sdl2pp.amdmi3.ru",
   "license": "Zlib",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6765,8 +6765,8 @@
       "port-version": 8
     },
     "sdl2-image": {
-      "baseline": "2.0.5",
-      "port-version": 7
+      "baseline": "2.6.2",
+      "port-version": 0
     },
     "sdl2-mixer": {
       "baseline": "2.6.1",
@@ -6782,7 +6782,7 @@
     },
     "sdl2pp": {
       "baseline": "0.16.1",
-      "port-version": 5
+      "port-version": 6
     },
     "seal": {
       "baseline": "3.7.2",

diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b5bbf1d2cbb382ec8adb25ca10cb3fa4913829f9",
+      "version": "2.6.2",
+      "port-version": 0
+    },
     {
       "git-tree": "4890f12d4639bf57d7eac19097b5903c06574184",
       "version": "2.0.5",

diff --git a/versions/s-/sdl2pp.json b/versions/s-/sdl2pp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "064e16bf7d04b929d0175c6c0aff6486032370db",
+      "version": "0.16.1",
+      "port-version": 6
+    },
     {
       "git-tree": "89665ed749a05bebacf76088e7781d0f1ef4c06a",
       "version": "0.16.1",