Backed out changeset 51622f74dc85

libsdl-org · Mar 11, 2020 · 983bbf9 · 983bbf9
1 parent 9fdc6cf
commit 983bbf9
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 25 deletions.
diff --git 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
@@ -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
@@ -19,10 +19,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.13</string>
+	<string>2.0.12</string>
 	<key>CFBundleSignature</key>
 	<string>SDLX</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.13</string>
+	<string>2.0.12</string>
 </dict>
 </plist>
diff --git 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
@@ -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
@@ -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
@@ -1,12 +1,6 @@
 libsdl2 (2.0.12) UNRELEASED; urgency=low
 
-  * Updated SDL to version 2.0.13 for development builds
-
- -- Sam Lantinga <slouken@libsdl.org>  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 <slouken@libsdl.org>  Sun, 1 Mar 2020 14:57:07 -0800
 

diff --git 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
@@ -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"