From f270fb25c792bc805514bd3708ebf59849953ed5 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 6 Feb 2023 15:41:21 -0800
Subject: [PATCH] Updated version to 2.6.3 for release
---
CMakeLists.txt | 2 +-
Makefile.os2 | 2 +-
SDL_image.h | 2 +-
VisualC/Version.rc | 8 ++++----
Xcode/Info-Framework.plist | 4 ++--
configure | 22 +++++++++++-----------
configure.ac | 2 +-
external/libwebp | 2 +-
version.rc | 8 ++++----
9 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 305d9af3..438a0aa2 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 6)
-set(MICRO_VERSION 2)
+set(MICRO_VERSION 3)
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
index 617eee67..d414364a 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -7,7 +7,7 @@
LIBNAME = SDL2img
MAJOR_VERSION = 2
MINOR_VERSION = 6
-MICRO_VERSION = 2
+MICRO_VERSION = 3
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
TITLENAME = $(LIBNAME) $(VERSION)
diff --git a/SDL_image.h b/SDL_image.h
index 3db23b2f..27490da6 100644
--- 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 2
+#define SDL_IMAGE_PATCHLEVEL 3
/**
* This macro can be used to fill a version structure with the compile-time
diff --git a/VisualC/Version.rc b/VisualC/Version.rc
index 0a26c3f1..accd9b0a 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,6,2,0
- PRODUCTVERSION 2,6,2,0
+ FILEVERSION 2,6,3,0
+ PRODUCTVERSION 2,6,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 6, 3, 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, 2, 0\0"
+ VALUE "ProductVersion", "2, 6, 3, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Xcode/Info-Framework.plist b/Xcode/Info-Framework.plist
index 79315cd1..a1001efc 100644
--- 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.2</string>
+ <string>2.6.3</string>
<key>CFBundleVersion</key>
- <string>2.6.2</string>
+ <string>2.6.3</string>
</dict>
</plist>
diff --git a/configure b/configure
index 75f4d1ec..5669c584 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.6.2.
+# Generated by GNU Autoconf 2.71 for SDL2_image 2.6.3.
#
# 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.2'
-PACKAGE_STRING='SDL2_image 2.6.2'
+PACKAGE_VERSION='2.6.3'
+PACKAGE_STRING='SDL2_image 2.6.3'
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.2 to adapt to many kinds of systems.
+\`configure' configures SDL2_image 2.6.3 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.2:";;
+ short | recursive ) echo "Configuration of SDL2_image 2.6.3:";;
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.2
+SDL2_image configure 2.6.3
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.2, which was
+It was created by SDL2_image $as_me 2.6.3, 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=2
+MICRO_VERSION=3
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.2'
+ VERSION='2.6.3'
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.2, which was
+This file was extended by SDL2_image $as_me 2.6.3, 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.2
+SDL2_image config.status 2.6.3
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 38473995..40621334 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], [6])
-m4_define([MICRO_VERSION_MACRO], [2])
+m4_define([MICRO_VERSION_MACRO], [3])
AC_INIT([SDL2_image],
[MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO],
diff --git a/external/libwebp b/external/libwebp
index d13b8dbe..12cf7b31 160000
--- a/external/libwebp
+++ b/external/libwebp
@@ -1 +1 @@
-Subproject commit d13b8dbe45a01df15c3896203f7734abc35230c8
+Subproject commit 12cf7b315fb7a9df56fa6b8ee30e36312659d63c
diff --git a/version.rc b/version.rc
index a0bc1aed..f178ed13 100644
--- a/version.rc
+++ b/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,2,0
- PRODUCTVERSION 2,6,2,0
+ FILEVERSION 2,6,3,0
+ PRODUCTVERSION 2,6,3,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, 2, 0\0"
+ VALUE "FileVersion", "2, 6, 3, 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, 2, 0\0"
+ VALUE "ProductVersion", "2, 6, 3, 0\0"
END
END
BLOCK "VarFileInfo"