From 9294634840458a5cec14058ac0cc5bd25649ff4e Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 7 Jan 2022 18:28:25 -0800
Subject: [PATCH] Updated to version 2.0.20 for release
---
CMakeLists.txt | 8 ++++----
Makefile.os2 | 2 +-
WhatsNew.txt | 15 +++++++++++++++
Xcode/SDL/Info-Framework.plist | 4 ++--
Xcode/SDL/SDL.xcodeproj/project.pbxproj | 4 ++--
build-scripts/winrtbuild.ps1 | 2 +-
configure | 6 +++---
configure.ac | 6 +++---
debian/changelog | 6 ++++++
include/SDL_version.h | 2 +-
src/main/windows/version.rc | 8 ++++----
11 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a61ba26bca..3f6b98f8330 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,12 +66,12 @@ include(${SDL2_SOURCE_DIR}/cmake/sdlchecks.cmake)
# set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
set(SDL_MAJOR_VERSION 2)
set(SDL_MINOR_VERSION 0)
-set(SDL_MICRO_VERSION 19)
-set(SDL_INTERFACE_AGE 1)
-set(SDL_BINARY_AGE 19)
+set(SDL_MICRO_VERSION 20)
+set(SDL_INTERFACE_AGE 2)
+set(SDL_BINARY_AGE 20)
set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")
# the following should match the versions in Xcode project file:
-set(DYLIB_CURRENT_VERSION 19.0.0)
+set(DYLIB_CURRENT_VERSION 19.2.0)
set(DYLIB_COMPATIBILITY_VERSION 1.0.0)
# Set defaults preventing destination file conflicts
diff --git a/Makefile.os2 b/Makefile.os2
index fb6289e5d29..7f79dca560a 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -6,7 +6,7 @@
# wmake -f Makefile.os2 LIBICONV=1
LIBNAME = SDL2
-VERSION = 2.0.19
+VERSION = 2.0.20
DESCRIPTION = Simple DirectMedia Layer 2
LIBICONV=0
diff --git a/WhatsNew.txt b/WhatsNew.txt
index db477d358e2..f1b88b1ced7 100644
--- a/WhatsNew.txt
+++ b/WhatsNew.txt
@@ -1,6 +1,21 @@
This is a list of major changes in SDL's version history.
+---------------------------------------------------------------------------
+2.0.20:
+---------------------------------------------------------------------------
+
+General:
+* SDL_RenderGeometryRaw() takes a pointer to SDL_Color, not int. You can cast color data in SDL_PIXELFORMAT_RGBA32 format (SDL_PIXELFORMAT_ABGR8888 on little endian systems) for this parameter.
+* Improved accuracy of horizontal and vertical line drawing when using OpenGL or OpenGLES
+
+Windows:
+* Fixed size of custom cursors
+
+Linux:
+* Fixed hotplug controller detection, broken in 2.0.18
+
+
---------------------------------------------------------------------------
2.0.18:
---------------------------------------------------------------------------
diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist
index a3e9f9a7456..5f9ace08448 100644
--- a/Xcode/SDL/Info-Framework.plist
+++ b/Xcode/SDL/Info-Framework.plist
@@ -19,10 +19,10 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>2.0.19</string>
+ <string>2.0.20</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleVersion</key>
- <string>2.0.19</string>
+ <string>2.0.20</string>
</dict>
</plist>
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index d0df89fd0d7..b23a394b989 100644
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -9111,7 +9111,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
- DYLIB_CURRENT_VERSION = 19.0.0;
+ DYLIB_CURRENT_VERSION = 19.2.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_ALTIVEC_EXTENSIONS = YES;
@@ -9195,7 +9195,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
- DYLIB_CURRENT_VERSION = 19.0.0;
+ DYLIB_CURRENT_VERSION = 19.2.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
diff --git a/build-scripts/winrtbuild.ps1 b/build-scripts/winrtbuild.ps1
index 24b43b93039..d03cccaf1fc 100644
--- a/build-scripts/winrtbuild.ps1
+++ b/build-scripts/winrtbuild.ps1
@@ -39,7 +39,7 @@
#
# Base version of SDL, used for packaging purposes
-$SDLVersion = "2.0.19"
+$SDLVersion = "2.0.20"
# Gets the .bat file that sets up an MSBuild environment, given one of
# Visual Studio's, "PlatformToolset"s.
diff --git a/configure b/configure
index d7c931668e3..0da00de854e 100755
--- a/configure
+++ b/configure
@@ -2855,9 +2855,9 @@ orig_CFLAGS="$CFLAGS"
#
SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0
-SDL_MICRO_VERSION=19
-SDL_INTERFACE_AGE=1
-SDL_BINARY_AGE=19
+SDL_MICRO_VERSION=20
+SDL_INTERFACE_AGE=2
+SDL_BINARY_AGE=20
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
diff --git a/configure.ac b/configure.ac
index fec064d9276..689f54639ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
#
SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0
-SDL_MICRO_VERSION=19
-SDL_INTERFACE_AGE=1
-SDL_BINARY_AGE=19
+SDL_MICRO_VERSION=20
+SDL_INTERFACE_AGE=2
+SDL_BINARY_AGE=20
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
AC_SUBST(SDL_MAJOR_VERSION)
diff --git a/debian/changelog b/debian/changelog
index 5cd96e6f91d..85d81585289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsdl2 (2.0.20) UNRELEASED; urgency=low
+
+ * Updated SDL to version 2.0.20
+
+ -- Sam Lantinga <slouken@libsdl.org> Fri, 7 Jan 2022 18:24:41 -0800
+
libsdl2 (2.0.19) UNRELEASED; urgency=low
* Updated SDL to version 2.0.19
diff --git a/include/SDL_version.h b/include/SDL_version.h
index fc7f19fc3ea..2716eba7b96 100644
--- a/include/SDL_version.h
+++ b/include/SDL_version.h
@@ -59,7 +59,7 @@ typedef struct SDL_version
*/
#define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 0
-#define SDL_PATCHLEVEL 19
+#define SDL_PATCHLEVEL 20
/**
* Macro to determine SDL version program was compiled against.
diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc
index c035c225e71..bedde9b19bc 100644
--- a/src/main/windows/version.rc
+++ b/src/main/windows/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,19,0
- PRODUCTVERSION 2,0,19,0
+ FILEVERSION 2,0,20,0
+ PRODUCTVERSION 2,0,20,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
- VALUE "FileVersion", "2, 0, 19, 0\0"
+ VALUE "FileVersion", "2, 0, 20, 0\0"
VALUE "InternalName", "SDL\0"
VALUE "LegalCopyright", "Copyright (C) 2022 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL2.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "2, 0, 19, 0\0"
+ VALUE "ProductVersion", "2, 0, 20, 0\0"
END
END
BLOCK "VarFileInfo"