Updated to version 2.2.0 for release

libsdl-org · Aug 19, 2022 · a861543 · a861543
1 parent 1a453c7
commit a861543
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 27 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,6 @@
+2.6.2:
+ * Updated autotools to use ax_compute_relative_paths, fixing homebrew on macOS
+
 2.6.1:
  * Fixed loading grayscale PNGs when using stb_image
 

diff --git 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 6)
-set(MICRO_VERSION 1)
+set(MICRO_VERSION 2)
 set(SDL_REQUIRED_VERSION 2.0.9)
 
 # For historical reasons this is 3.0.0 rather than the expected 1.0.0

diff --git a/Makefile.os2 b/Makefile.os2
@@ -7,7 +7,7 @@
 LIBNAME = SDL2img
 MAJOR_VERSION = 2
 MINOR_VERSION = 6
-MICRO_VERSION = 1
+MICRO_VERSION = 2
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
 
 TITLENAME = $(LIBNAME) $(VERSION)

diff --git a/SDL_image.h b/SDL_image.h
@@ -43,7 +43,7 @@ extern "C" {
  */
 #define SDL_IMAGE_MAJOR_VERSION 2
 #define SDL_IMAGE_MINOR_VERSION 6
-#define SDL_IMAGE_PATCHLEVEL    1
+#define SDL_IMAGE_PATCHLEVEL    2
 
 /**
  * This macro can be used to fill a version structure with the compile-time

diff --git a/VisualC/Version.rc b/VisualC/Version.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,1,0
- PRODUCTVERSION 2,6,1,0
+ FILEVERSION 2,6,2,0
+ PRODUCTVERSION 2,6,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,12 +46,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "SDL_image\0"
-            VALUE "FileVersion", "2, 6, 1, 0\0"
+            VALUE "FileVersion", "2, 6, 2, 0\0"
             VALUE "InternalName", "SDL_image\0"
             VALUE "LegalCopyright", "Copyright � 2022 Sam Lantinga\0"
             VALUE "OriginalFilename", "SDL_image.dll\0"
             VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "2, 6, 1, 0\0"
+            VALUE "ProductVersion", "2, 6, 2, 0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Xcode/Info-Framework.plist b/Xcode/Info-Framework.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.1</string>
+	<string>2.6.2</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.1</string>
+	<string>2.6.2</string>
 </dict>
 </plist>
diff --git a/Xcode/SDL_image.xcodeproj/project.pbxproj b/Xcode/SDL_image.xcodeproj/project.pbxproj
@@ -633,7 +633,7 @@
 				ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 3.0.0;
-				DYLIB_CURRENT_VERSION = 601.1.0;
+				DYLIB_CURRENT_VERSION = 601.2.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\"";
@@ -723,7 +723,7 @@
 				ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
 				DEPLOYMENT_POSTPROCESSING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 3.0.0;
-				DYLIB_CURRENT_VERSION = 601.1.0;
+				DYLIB_CURRENT_VERSION = 601.2.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\"";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;

diff --git 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.6.1.
+# Generated by GNU Autoconf 2.71 for SDL2_image 2.6.2.
 #
 # Report bugs to <https://github.com/libsdl-org/SDL_image/issues>.
 #
@@ -760,8 +760,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='SDL2_image'
 PACKAGE_TARNAME='SDL2_image'
-PACKAGE_VERSION='2.6.1'
-PACKAGE_STRING='SDL2_image 2.6.1'
+PACKAGE_VERSION='2.6.2'
+PACKAGE_STRING='SDL2_image 2.6.2'
 PACKAGE_BUGREPORT='https://github.com/libsdl-org/SDL_image/issues'
 PACKAGE_URL=''
 
@@ -1605,7 +1605,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.6.1 to adapt to many kinds of systems.
+\`configure' configures SDL2_image 2.6.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1676,7 +1676,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of SDL2_image 2.6.1:";;
+     short | recursive ) echo "Configuration of SDL2_image 2.6.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1847,7 +1847,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-SDL2_image configure 2.6.1
+SDL2_image configure 2.6.2
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2147,7 +2147,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.6.1, which was
+It was created by SDL2_image $as_me 2.6.2, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2909,7 +2909,7 @@ MAJOR_VERSION=2
 
 MINOR_VERSION=6
 
-MICRO_VERSION=1
+MICRO_VERSION=2
 
 
 BINARY_AGE=`expr $MINOR_VERSION \* 100 + $MICRO_VERSION`
@@ -11531,7 +11531,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='SDL2_image'
- VERSION='2.6.1'
+ VERSION='2.6.2'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -16359,7 +16359,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.6.1, which was
+This file was extended by SDL2_image $as_me 2.6.2, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16418,7 +16418,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.6.1
+SDL2_image config.status 2.6.2
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

diff --git 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], [6])
-m4_define([MICRO_VERSION_MACRO], [1])
+m4_define([MICRO_VERSION_MACRO], [2])
 
 AC_INIT([SDL2_image],
         [MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO],

diff --git a/version.rc b/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,1,0
- PRODUCTVERSION 2,6,1,0
+ FILEVERSION 2,6,2,0
+ PRODUCTVERSION 2,6,2,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "SDL_image\0"
-            VALUE "FileVersion", "2, 6, 1, 0\0"
+            VALUE "FileVersion", "2, 6, 2, 0\0"
             VALUE "InternalName", "SDL_image\0"
             VALUE "LegalCopyright", "Copyright � 2022 Sam Lantinga\0"
             VALUE "OriginalFilename", "SDL_image.dll\0"
             VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "2, 6, 1, 0\0"
+            VALUE "ProductVersion", "2, 6, 2, 0\0"
         END
     END
     BLOCK "VarFileInfo"