From 983bbf9ef3e572a073a6f5877faf1c0b4803527c Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 10 Mar 2020 18:35:31 -0700 Subject: [PATCH] Backed out changeset 51622f74dc85 --- CMakeLists.txt | 6 +++--- Makefile.os2 | 2 +- Xcode/SDL/Info-Framework.plist | 4 ++-- build-scripts/winrtbuild.ps1 | 2 +- configure | 6 +++--- configure.ac | 6 +++--- debian/changelog | 8 +------- include/SDL_version.h | 2 +- src/main/windows/version.rc | 8 ++++---- 9 files changed, 19 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58ab7f893dc98..7dfd353890ac7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,9 +42,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 13) -set(SDL_INTERFACE_AGE 1) -set(SDL_BINARY_AGE 13) +set(SDL_MICRO_VERSION 12) +set(SDL_INTERFACE_AGE 0) +set(SDL_BINARY_AGE 12) 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 12.0.0) diff --git a/Makefile.os2 b/Makefile.os2 index 444ab329e0c03..7fa55d74b2a41 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -2,7 +2,7 @@ # wmake -f Makefile.os2 LIBNAME = SDL2 -VERSION = 2.0.13 +VERSION = 2.0.12 DESCRIPTION = Simple DirectMedia Layer 2 LIBHOME = . diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index cb34f9df08c5d..9828759a5a51f 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.13 + 2.0.12 CFBundleSignature SDLX CFBundleVersion - 2.0.13 + 2.0.12 diff --git a/build-scripts/winrtbuild.ps1 b/build-scripts/winrtbuild.ps1 index 137ec710c08cc..214b751ef1fdd 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.13" +$SDLVersion = "2.0.12" # 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 e422846f0a2f5..9c46ffe2bc582 100755 --- a/configure +++ b/configure @@ -2817,9 +2817,9 @@ orig_CFLAGS="$CFLAGS" # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=13 -SDL_INTERFACE_AGE=1 -SDL_BINARY_AGE=13 +SDL_MICRO_VERSION=12 +SDL_INTERFACE_AGE=0 +SDL_BINARY_AGE=12 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/configure.ac b/configure.ac index a8ceb8ba51cfc..19361a4b81d0c 100644 --- a/configure.ac +++ b/configure.ac @@ -20,9 +20,9 @@ dnl Set various version strings - taken gratefully from the GTk sources # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=13 -SDL_INTERFACE_AGE=1 -SDL_BINARY_AGE=13 +SDL_MICRO_VERSION=12 +SDL_INTERFACE_AGE=0 +SDL_BINARY_AGE=12 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 ad4a11802d58f..76f6ae592d554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,6 @@ libsdl2 (2.0.12) UNRELEASED; urgency=low - * Updated SDL to version 2.0.13 for development builds - - -- Sam Lantinga Tue, 10 Mar 2020 18:24:22 -0800 - -libsdl2 (2.0.12) UNRELEASED; urgency=low - - * Updated SDL to version 2.0.12 + * Updated SDL to version 2.0.12 for development builds -- Sam Lantinga Sun, 1 Mar 2020 14:57:07 -0800 diff --git a/include/SDL_version.h b/include/SDL_version.h index ec2cc8f650c47..c824b1d319bb8 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 13 +#define SDL_PATCHLEVEL 12 /** * \brief Macro to determine SDL version program was compiled against. diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc index 0c2b94c1ebdac..f188494c98b56 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,13,0 - PRODUCTVERSION 2,0,13,0 + FILEVERSION 2,0,12,0 + PRODUCTVERSION 2,0,12,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 0, 13, 0\0" + VALUE "FileVersion", "2, 0, 12, 0\0" VALUE "InternalName", "SDL\0" VALUE "LegalCopyright", "Copyright © 2020 Sam Lantinga\0" VALUE "OriginalFilename", "SDL2.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 0, 13, 0\0" + VALUE "ProductVersion", "2, 0, 12, 0\0" END END BLOCK "VarFileInfo"