diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c9777d1..cbe0b7ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") # See docs/release_checklist.md set(MAJOR_VERSION 2) set(MINOR_VERSION 8) -set(MICRO_VERSION 3) +set(MICRO_VERSION 4) set(SDL_REQUIRED_VERSION 2.0.9) include(PrivateSdlFunctions) diff --git a/Makefile.os2 b/Makefile.os2 index e47cddb7..3e779cdf 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -7,7 +7,7 @@ LIBNAME = SDL2img MAJOR_VERSION = 2 MINOR_VERSION = 8 -MICRO_VERSION = 3 +MICRO_VERSION = 4 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) TITLENAME = $(LIBNAME) $(VERSION) diff --git a/VisualC/Version.rc b/VisualC/Version.rc index db0a4965..dde4a5d9 100644 --- a/VisualC/Version.rc +++ b/VisualC/Version.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,3,0 - PRODUCTVERSION 2,8,3,0 + FILEVERSION 2,8,4,0 + PRODUCTVERSION 2,8,4,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,12 +46,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_image\0" - VALUE "FileVersion", "2, 8, 3, 0\0" + VALUE "FileVersion", "2, 8, 4, 0\0" VALUE "InternalName", "SDL_image\0" VALUE "LegalCopyright", "Copyright (C) 2024 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_image.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 8, 3, 0\0" + VALUE "ProductVersion", "2, 8, 4, 0\0" END END BLOCK "VarFileInfo" diff --git a/Xcode/Info-Framework.plist b/Xcode/Info-Framework.plist index a46551d6..44d8ea8f 100644 --- a/Xcode/Info-Framework.plist +++ b/Xcode/Info-Framework.plist @@ -15,8 +15,8 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.8.3 + 2.8.4 CFBundleVersion - 2.8.3 + 2.8.4 diff --git a/Xcode/SDL_image.xcodeproj/project.pbxproj b/Xcode/SDL_image.xcodeproj/project.pbxproj index 37dd286f..ae518c20 100644 --- a/Xcode/SDL_image.xcodeproj/project.pbxproj +++ b/Xcode/SDL_image.xcodeproj/project.pbxproj @@ -627,7 +627,7 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 801.0.0; - DYLIB_CURRENT_VERSION = 801.3.0; + DYLIB_CURRENT_VERSION = 801.4.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\""; @@ -718,7 +718,7 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = 801.0.0; - DYLIB_CURRENT_VERSION = 801.3.0; + DYLIB_CURRENT_VERSION = 801.4.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; diff --git a/configure b/configure index 8631a168..853cb48f 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for SDL2_image 2.8.3. +# Generated by GNU Autoconf 2.71 for SDL2_image 2.8.4. # # Report bugs to . # @@ -760,8 +760,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='SDL2_image' PACKAGE_TARNAME='SDL2_image' -PACKAGE_VERSION='2.8.3' -PACKAGE_STRING='SDL2_image 2.8.3' +PACKAGE_VERSION='2.8.4' +PACKAGE_STRING='SDL2_image 2.8.4' PACKAGE_BUGREPORT='https://github.com/libsdl-org/SDL_image/issues' PACKAGE_URL='' @@ -1609,7 +1609,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures SDL2_image 2.8.3 to adapt to many kinds of systems. +\`configure' configures SDL2_image 2.8.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1680,7 +1680,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of SDL2_image 2.8.3:";; + short | recursive ) echo "Configuration of SDL2_image 2.8.4:";; esac cat <<\_ACEOF @@ -1858,7 +1858,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -SDL2_image configure 2.8.3 +SDL2_image configure 2.8.4 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2158,7 +2158,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by SDL2_image $as_me 2.8.3, which was +It was created by SDL2_image $as_me 2.8.4, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2920,7 +2920,7 @@ MAJOR_VERSION=2 MINOR_VERSION=8 -MICRO_VERSION=3 +MICRO_VERSION=4 BINARY_AGE=`expr $MINOR_VERSION \* 100 + $MICRO_VERSION` @@ -11542,7 +11542,7 @@ fi # Define the identity of the package. PACKAGE='SDL2_image' - VERSION='2.8.3' + VERSION='2.8.4' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -16782,7 +16782,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by SDL2_image $as_me 2.8.3, which was +This file was extended by SDL2_image $as_me 2.8.4, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16841,7 +16841,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -SDL2_image config.status 2.8.3 +SDL2_image config.status 2.8.4 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5023f330..16316456 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Set various version strings - taken gratefully from the GTk sources # See docs/release_checklist.md m4_define([MAJOR_VERSION_MACRO], [2]) m4_define([MINOR_VERSION_MACRO], [8]) -m4_define([MICRO_VERSION_MACRO], [3]) +m4_define([MICRO_VERSION_MACRO], [4]) AC_INIT([SDL2_image], [MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO], diff --git a/external/libtiff b/external/libtiff index 5201ffee..f0b67bbb 160000 --- a/external/libtiff +++ b/external/libtiff @@ -1 +1 @@ -Subproject commit 5201ffee79beb91f38c57171bafe79c11271c01a +Subproject commit f0b67bbb55584c7c48dd2e0a20823c3c3ed0dc75 diff --git a/external/libwebp b/external/libwebp index 05b15cb8..fa992316 160000 --- a/external/libwebp +++ b/external/libwebp @@ -1 +1 @@ -Subproject commit 05b15cb850e7bed3b4fed1d360873de352411659 +Subproject commit fa992316e4517b25a4e667a3668b930170becd56 diff --git a/include/SDL_image.h b/include/SDL_image.h index 3b0e30f0..c8321b4f 100644 --- a/include/SDL_image.h +++ b/include/SDL_image.h @@ -43,7 +43,7 @@ extern "C" { */ #define SDL_IMAGE_MAJOR_VERSION 2 #define SDL_IMAGE_MINOR_VERSION 8 -#define SDL_IMAGE_PATCHLEVEL 3 +#define SDL_IMAGE_PATCHLEVEL 4 /** * This macro can be used to fill a version structure with the compile-time diff --git a/src/version.rc b/src/version.rc index 8221dfc4..59131dac 100644 --- a/src/version.rc +++ b/src/version.rc @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,3,0 - PRODUCTVERSION 2,8,3,0 + FILEVERSION 2,8,4,0 + PRODUCTVERSION 2,8,4,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_image\0" - VALUE "FileVersion", "2, 8, 3, 0\0" + VALUE "FileVersion", "2, 8, 4, 0\0" VALUE "InternalName", "SDL_image\0" VALUE "LegalCopyright", "Copyright (C) 2024 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_image.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 8, 3, 0\0" + VALUE "ProductVersion", "2, 8, 4, 0\0" END END BLOCK "VarFileInfo"