From cb1fd30e9a2edf0bce6e86f5aae33dc28fe1822b Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sat, 31 Jul 2021 13:28:54 -0700
Subject: [PATCH] Updated to version 2.0.16 for release
---
CMakeLists.txt | 6 +++---
Makefile.os2 | 2 +-
Xcode/SDL/Info-Framework.plist | 4 ++--
Xcode/SDL/SDL.xcodeproj/project.pbxproj | 6 ++++--
build-scripts/winrtbuild.ps1 | 2 +-
configure | 6 +++---
configure.ac | 6 +++---
debian/changelog | 6 ++++++
include/SDL_version.h | 2 +-
src/main/windows/version.rc | 8 ++++----
10 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86ea5e66a7..d4f6e445f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,9 +47,9 @@ 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 15)
-set(SDL_INTERFACE_AGE 1)
-set(SDL_BINARY_AGE 15)
+set(SDL_MICRO_VERSION 16)
+set(SDL_INTERFACE_AGE 0)
+set(SDL_BINARY_AGE 16)
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 15.1.0)
diff --git a/Makefile.os2 b/Makefile.os2
index 1dbe20b92a..b7b13aaed4 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -2,7 +2,7 @@
# wmake -f Makefile.os2
LIBNAME = SDL2
-VERSION = 2.0.15
+VERSION = 2.0.16
DESCRIPTION = Simple DirectMedia Layer 2
LIBHOME = .
diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist
index b505912e28..a2a7537e57 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.15</string>
+ <string>2.0.16</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleVersion</key>
- <string>2.0.15</string>
+ <string>2.0.16</string>
</dict>
</plist>
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index f71f92617c..d1cb8dcd73 100644
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -10120,7 +10120,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
- DYLIB_CURRENT_VERSION = 15.1.0;
+ DYLIB_CURRENT_VERSION = 17.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_ALTIVEC_EXTENSIONS = YES;
@@ -10161,6 +10161,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_LINK_OBJC_RUNTIME = NO;
+ MARKETING_VERSION = 2.0.16;
OTHER_LDFLAGS = "-liconv";
};
name = Release;
@@ -10203,7 +10204,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
- DYLIB_CURRENT_VERSION = 15.1.0;
+ DYLIB_CURRENT_VERSION = 17.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@@ -10245,6 +10246,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_LINK_OBJC_RUNTIME = NO;
+ MARKETING_VERSION = 2.0.16;
OTHER_LDFLAGS = "-liconv";
};
name = Debug;
diff --git a/build-scripts/winrtbuild.ps1 b/build-scripts/winrtbuild.ps1
index 0468e7df56..0b010b16bb 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.15"
+$SDLVersion = "2.0.16"
# 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 e254fe9f49..98aa633092 100755
--- a/configure
+++ b/configure
@@ -2839,9 +2839,9 @@ orig_CFLAGS="$CFLAGS"
#
SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0
-SDL_MICRO_VERSION=15
-SDL_INTERFACE_AGE=1
-SDL_BINARY_AGE=15
+SDL_MICRO_VERSION=16
+SDL_INTERFACE_AGE=0
+SDL_BINARY_AGE=16
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
diff --git a/configure.ac b/configure.ac
index 452d3f0a09..6b7b5a0765 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=15
-SDL_INTERFACE_AGE=1
-SDL_BINARY_AGE=15
+SDL_MICRO_VERSION=16
+SDL_INTERFACE_AGE=0
+SDL_BINARY_AGE=16
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 57a18e3631..feeaebf42b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsdl2 (2.0.16) UNRELEASED; urgency=low
+
+ * Updated SDL to version 2.0.16
+
+ -- Sam Lantinga <slouken@libsdl.org> Sat, 31 Jul 2021 13:27:38 -0800
+
libsdl2 (2.0.15) UNRELEASED; urgency=low
* Updated SDL to version 2.0.15 for development builds
diff --git a/include/SDL_version.h b/include/SDL_version.h
index 362a0c567b..f4f8be2148 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 15
+#define SDL_PATCHLEVEL 16
/**
* Macro to determine SDL version program was compiled against.
diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc
index b8ac4b0730..dc58912271 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,15,0
- PRODUCTVERSION 2,0,15,0
+ FILEVERSION 2,0,16,0
+ PRODUCTVERSION 2,0,16,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
- VALUE "FileVersion", "2, 0, 15, 0\0"
+ VALUE "FileVersion", "2, 0, 16, 0\0"
VALUE "InternalName", "SDL\0"
VALUE "LegalCopyright", "Copyright 2021 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL2.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "2, 0, 15, 0\0"
+ VALUE "ProductVersion", "2, 0, 16, 0\0"
END
END
BLOCK "VarFileInfo"