From 5fc901d4f3e7cafe7b881fa70b8224ff0f077e26 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 30 Nov 2021 09:58:21 -0800 Subject: [PATCH] Updated to version 2.0.19 for development --- CMakeLists.txt | 6 +++--- Makefile.os2 | 2 +- Xcode/SDL/Info-Framework.plist | 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 ++++---- 9 files changed, 24 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9411c76e7..877735b69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,9 +61,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 18) -set(SDL_INTERFACE_AGE 0) -set(SDL_BINARY_AGE 18) +set(SDL_MICRO_VERSION 19) +set(SDL_INTERFACE_AGE 1) +set(SDL_BINARY_AGE 19) 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) diff --git a/Makefile.os2 b/Makefile.os2 index 6ed043749..86753e6b4 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -2,7 +2,7 @@ # wmake -f Makefile.os2 LIBNAME = SDL2 -VERSION = 2.0.18 +VERSION = 2.0.19 DESCRIPTION = Simple DirectMedia Layer 2 LIBHOME = . diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index c698d0086..a3e9f9a74 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.18 + 2.0.19 CFBundleSignature SDLX CFBundleVersion - 2.0.18 + 2.0.19 diff --git a/build-scripts/winrtbuild.ps1 b/build-scripts/winrtbuild.ps1 index d8d792600..24b43b930 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.18" +$SDLVersion = "2.0.19" # 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 cbd578216..732af5db3 100755 --- a/configure +++ b/configure @@ -2847,9 +2847,9 @@ orig_CFLAGS="$CFLAGS" # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=18 -SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=18 +SDL_MICRO_VERSION=19 +SDL_INTERFACE_AGE=1 +SDL_BINARY_AGE=19 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/configure.ac b/configure.ac index 625681a12..146beb2ec 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=18 -SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=18 +SDL_MICRO_VERSION=19 +SDL_INTERFACE_AGE=1 +SDL_BINARY_AGE=19 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 7f73b6156..5cd96e6f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libsdl2 (2.0.19) UNRELEASED; urgency=low + + * Updated SDL to version 2.0.19 + + -- Sam Lantinga Tue, 30 Nov 2021 09:57:40 -0800 + libsdl2 (2.0.18) UNRELEASED; urgency=low * Updated SDL to version 2.0.18 diff --git a/include/SDL_version.h b/include/SDL_version.h index 949c6594c..fb3ff1b4a 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 18 +#define SDL_PATCHLEVEL 19 /** * Macro to determine SDL version program was compiled against. diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc index e977ac741..a30f28b7b 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,18,0 - PRODUCTVERSION 2,0,18,0 + FILEVERSION 2,0,19,0 + PRODUCTVERSION 2,0,19,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 0, 18, 0\0" + VALUE "FileVersion", "2, 0, 19, 0\0" VALUE "InternalName", "SDL\0" VALUE "LegalCopyright", "Copyright (C) 2021 Sam Lantinga\0" VALUE "OriginalFilename", "SDL2.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 0, 18, 0\0" + VALUE "ProductVersion", "2, 0, 19, 0\0" END END BLOCK "VarFileInfo"