update sdl2_image to 2.6.0

deps/sdl2_image/lib/cmake/Findlibjxl.cmake

@@ -0,0 +1,32 @@
+include(FindPackageHandleStandardArgs)
+
+find_library(libjxl_LIBRARY
+    NAMES jxl
+)
+
+find_path(libjxl_INCLUDE_PATH
+    NAMES jxl/decode.h
+)
+
+set(libjxl_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of libjxl")
+
+set(libjxl_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of libjxl")
+
+set(libjxl_LINK_FLAGS "" CACHE STRING "Extra link flags of libjxl")
+
+find_package_handle_standard_args(libjxl
+    REQUIRED_VARS libjxl_LIBRARY libjxl_INCLUDE_PATH
+)
+
+if (libjxl_FOUND)
+    if (NOT TARGET libjxl::libjxl)
+        add_library(libjxl::libjxl UNKNOWN IMPORTED)
+        set_target_properties(libjxl::libjxl PROPERTIES
+            IMPORTED_LOCATION "${libjxl_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${libjxl_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${libjxl_COMPILE_OPTIONS}"
+            INTERFACE_LINK_LIBRARIES "${libjxl_LINK_LIBRARIES}"
+            INTERFACE_LINK_FLAGS "${libjxl_LINK_FLAGS}"
+        )
+    endif()
+endif()

deps/sdl2_image/lib/cmake/Findwebp.cmake

@@ -0,0 +1,32 @@
+include(FindPackageHandleStandardArgs)
+
+find_library(webp_LIBRARY
+    NAMES webp
+)
+
+find_path(webp_INCLUDE_PATH
+    NAMES webp/decode.h
+)
+
+set(webp_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of webp")
+
+set(webp_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of webp")
+
+set(webp_LINK_FLAGS "" CACHE STRING "Extra link flags of webp")
+
+find_package_handle_standard_args(webp
+    REQUIRED_VARS webp_LIBRARY webp_INCLUDE_PATH
+)
+
+if (webp_FOUND)
+    if (NOT TARGET WebP::webp)
+        add_library(WebP::webp UNKNOWN IMPORTED)
+        set_target_properties(WebP::webp PROPERTIES
+            IMPORTED_LOCATION "${webp_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${webp_INCLUDE_PATH}"
+            INTERFACE_COMPILE_OPTIONS "${webp_COMPILE_FLAGS}"
+            INTERFACE_LINK_LIBRARIES "${webp_LINK_LIBRARIES}"
+            INTERFACE_LINK_FLAGS "${webp_LINK_FLAGS}"
+        )
+    endif()
+endif()

deps/sdl2_image/lib/cmake/SDL2_image-static-targets-release.cmake

@@ -0,0 +1,19 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "SDL2_image::SDL2_image-static" for configuration "Release"
+set_property(TARGET SDL2_image::SDL2_image-static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(SDL2_image::SDL2_image-static PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libSDL2_image.a"
+  )
+
+list(APPEND _IMPORT_CHECK_TARGETS SDL2_image::SDL2_image-static )
+list(APPEND _IMPORT_CHECK_FILES_FOR_SDL2_image::SDL2_image-static "${_IMPORT_PREFIX}/lib/libSDL2_image.a" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)

deps/sdl2_image/lib/cmake/SDL2_image-static-targets.cmake

@@ -0,0 +1,98 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
+   message(FATAL_ERROR "CMake >= 2.6.0 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.6...3.19)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_targetsDefined)
+set(_targetsNotDefined)
+set(_expectedTargets)
+foreach(_expectedTarget SDL2_image::SDL2_image-static)
+  list(APPEND _expectedTargets ${_expectedTarget})
+  if(NOT TARGET ${_expectedTarget})
+    list(APPEND _targetsNotDefined ${_expectedTarget})
+  endif()
+  if(TARGET ${_expectedTarget})
+    list(APPEND _targetsDefined ${_expectedTarget})
+  endif()
+endforeach()
+if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
+  unset(_targetsDefined)
+  unset(_targetsNotDefined)
+  unset(_expectedTargets)
+  set(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT "${_targetsDefined}" STREQUAL "")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
+endif()
+unset(_targetsDefined)
+unset(_targetsNotDefined)
+unset(_expectedTargets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target SDL2_image::SDL2_image-static
+add_library(SDL2_image::SDL2_image-static STATIC IMPORTED)
+
+set_target_properties(SDL2_image::SDL2_image-static PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/SDL2"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:SDL2::SDL2-static>;\$<LINK_ONLY:objc>"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+file(GLOB CONFIG_FILES "${_DIR}/SDL2_image-static-targets-*.cmake")
+foreach(f ${CONFIG_FILES})
+  include(${f})
+endforeach()
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(target ${_IMPORT_CHECK_TARGETS} )
+  foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
+    if(NOT EXISTS "${file}" )
+      message(FATAL_ERROR "The imported target \"${target}\" references the file
+   \"${file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_IMPORT_CHECK_FILES_FOR_${target})
+endforeach()
+unset(_IMPORT_CHECK_TARGETS)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)

deps/sdl2_image/lib/cmake/SDL2_imageConfig.cmake

@@ -0,0 +1,90 @@
+# sdl2_image cmake project-config input for CMakeLists.txt script
+
+include(FeatureSummary)
+set_package_properties(SDL2_image PROPERTIES
+    URL "https://www.libsdl.org/projects/SDL_image/"
+    DESCRIPTION "SDL_image is an image file loading library"
+)
+
+set(SDL2_image_FOUND ON)
+
+set(SDL2IMAGE_AVIF  OFF)
+set(SDL2IMAGE_BMP   ON)
+set(SDL2IMAGE_GIF   ON)
+set(SDL2IMAGE_JPG   ON)
+set(SDL2IMAGE_JXL   OFF)
+set(SDL2IMAGE_LBM   ON)
+set(SDL2IMAGE_PCX   ON)
+set(SDL2IMAGE_PNG   ON)
+set(SDL2IMAGE_PNM   ON)
+set(SDL2IMAGE_QOI   ON)
+set(SDL2IMAGE_SVG   ON)
+set(SDL2IMAGE_TGA   ON)
+set(SDL2IMAGE_TIF   OFF)
+set(SDL2IMAGE_XCF   ON)
+set(SDL2IMAGE_XPM   ON)
+set(SDL2IMAGE_XV    ON)
+set(SDL2IMAGE_WEBP  OFF)
+
+set(SDL2IMAGE_JPG_SAVE ON)
+set(SDL2IMAGE_PNG_SAVE ON)
+
+set(SDL2IMAGE_VENDORED  OFF)
+
+set(SDL2IMAGE_BACKEND_IMAGEIO   ON)
+set(SDL2IMAGE_BACKEND_STB       ON)
+set(SDL2IMAGE_BACKEND_WIC       OFF)
+
+set(SDL2IMAGE_SDL2_REQUIRED_VERSION  2.0.9)
+
+if(NOT SDL2IMAGE_VENDORED)
+    set(_sdl_cmake_module_path "${CMAKE_MODULE_PATH}")
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+endif()
+
+include(CMakeFindDependencyMacro)
+
+if(SDL2IMAGE_AVIF AND NOT SDL2IMAGE_VENDORED AND NOT TARGET avif)
+    find_dependency(libavif 0.9.1)
+endif()
+
+if(SDL2IMAGE_JPG AND NOT SDL2IMAGE_VENDORED AND NOT TARGET JPEG::JPEG)
+    find_dependency(JPEG)
+endif()
+
+if(SDL2IMAGE_JXL AND NOT SDL2IMAGE_VENDORED AND NOT TARGET libjxl::libjxl)
+    list(APPEND libjxl_ROOT "${CMAKE_CURRENT_LIST_DIR}")
+    find_dependency(libjxl)
+endif()
+
+if(SDL2IMAGE_PNG AND NOT SDL2IMAGE_VENDORED AND NOT TARGET PNG::PNG)
+    find_dependency(PNG)
+endif()
+
+if(SDL2IMAGE_TIF AND NOT SDL2IMAGE_VENDORED AND NOT TARGET TIFF::TIFF)
+    find_dependency(TIFF)
+endif()
+
+if(SDL2IMAGE_WEBP AND NOT SDL2IMAGE_VENDORED AND NOT TARGET WebP::webp)
+    list(APPEND webp_ROOT "${CMAKE_CURRENT_LIST_DIR}")
+    find_dependency(webp)
+endif()
+
+#FIXME: can't add SDL2IMAGE_SDL2_REQUIRED_VERSION since not all SDL2 installs ship SDL2ConfigVersion.cmake
+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_image-shared-targets.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/SDL2_image-shared-targets.cmake")
+endif()
+
+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_image-static-targets.cmake")
+    include(CheckLanguage)
+    check_language(CXX)
+    if(SDL2IMAGE_VENDORED AND NOT CMAKE_CXX_COMPILER AND NOT _sdl2image_nowarning)
+        message(WARNING "CXX language not enabled. Linking to SDL2_image::SDL2_image-static might fail.")
+    endif()
+    include("${CMAKE_CURRENT_LIST_DIR}/SDL2_image-static-targets.cmake")
+endif()
+
+if(NOT SDL2IMAGE_VENDORED)
+    set(CMAKE_MODULE_PATH "${_sdl_cmake_module_path}")
+    unset(_sdl_cmake_module_path)
+endif()

deps/sdl2_image/lib/cmake/SDL2_imageConfigVersion.cmake

@@ -0,0 +1,48 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "2.6.0")
+
+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)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  endif()
+else()
+  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()

deps/sdl2_image/lib/pkgconfig/SDL2_image.pc

@@ -5,9 +5,9 @@ includedir=${prefix}/include
 
 Name: SDL2_image
 Description: image loading library for Simple DirectMedia Layer
-Version: 2.0.5
-Requires: sdl2 >= 2.0.8
+Version: 2.6.0
+Requires: sdl2 >= 2.0.9
 Requires.private: libwebp
 Libs: -L${libdir} -lSDL2_image
-Cflags: -I${includedir}/SDL2
-
+Libs.private: 
+Cflags: -I${includedir} -I${includedir}/SDL2