Updated SDL to 2.0.14 in preparation for release candidate

12 files changed, 102 insertions, 22 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 546509ff9..fd8d68876 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,9 +54,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 14)
+set(SDL_INTERFACE_AGE 0)
+set(SDL_BINARY_AGE 14)
 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 f7b5005e5..412e91b58 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -2,7 +2,7 @@
 # wmake -f Makefile.os2
 
 LIBNAME = SDL2
-VERSION = 2.0.13
+VERSION = 2.0.14
 DESCRIPTION = Simple DirectMedia Layer 2
 
 LIBHOME = .
diff --git a/WhatsNew.txt b/WhatsNew.txt
index 606b80d8a..f498145fc 100644
--- a/WhatsNew.txt
+++ b/WhatsNew.txt
@@ -2,6 +2,80 @@
 This is a list of major changes in SDL's version history.

 

 ---------------------------------------------------------------------------

+2.0.14:

+---------------------------------------------------------------------------

+General:

+* Added support for PS5 DualSense and Xbox Series X controllers to the HIDAPI controller driver

+* Added game controller button constants for paddles and new buttons

+* Added game controller functions to get additional information:

+	* SDL_GameControllerGetSerial()

+	* SDL_GameControllerHasAxis()

+	* SDL_GameControllerHasButton()

+	* SDL_GameControllerGetNumTouchpads()

+	* SDL_GameControllerGetNumTouchpadFingers()

+	* SDL_GameControllerGetTouchpadFinger()

+	* SDL_GameControllerHasSensor()

+	* SDL_GameControllerSetSensorEnabled()

+	* SDL_GameControllerIsSensorEnabled()

+	* SDL_GameControllerGetSensorData()

+	* SDL_GameControllerRumbleTriggers()

+	* SDL_GameControllerHasLED()

+	* SDL_GameControllerSetLED()

+* Added the hint SDL_JOYSTICK_HIDAPI_PS5 to control whether the HIDAPI driver for PS5 controllers should be used.

+* Added joystick functions to get additional information:

+	* SDL_JoystickGetSerial()

+	* SDL_JoystickRumbleTriggers()

+	* SDL_JoystickHasLED()

+	* SDL_JoystickSetLED()

+* Added an API to allow the application to create virtual joysticks:

+	* SDL_JoystickAttachVirtual()

+	* SDL_JoystickDetachVirtual()

+	* SDL_JoystickIsVirtual()

+	* SDL_JoystickSetVirtualAxis()

+	* SDL_JoystickSetVirtualButton()

+	* SDL_JoystickSetVirtualHat()

+* Added SDL_LockSensors() and SDL_UnlockSensors() to guarantee exclusive access to the sensor list

+* Added SDL_HAPTIC_STEERING_AXIS to play an effect on the steering wheel

+* Added the hint SDL_HINT_MOUSE_RELATIVE_SCALING to control whether relative motion is scaled by the screen DPI or renderer logical size

+* The default value for SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS is now false for better compatibility with modern window managers

+* Added SDL_GetPreferredLocales() to get the application's current locale setting

+* Added the hint SDL_HINT_PREFERRED_LOCALES to override your application's default locale setting

+* Added SDL_OpenURL() to open a URL in the system's default browser

+* Added SDL_HasSurfaceRLE() to tell whether a surface is currently using RLE encoding

+* Added SDL_SIMDRealloc() to reallocate memory obtained from SDL_SIMDAlloc()

+* Added SDL_GetErrorMsg() to get the last error in a thread-safe way

+* Added SDL_crc32(), SDL_wcscasecmp(), SDL_wcsncasecmp(), SDL_trunc(), SDL_truncf()

+* Added clearer names for RGB pixel formats, e.g. SDL_PIXELFORMAT_XRGB8888, SDL_PIXELFORMAT_XBGR8888, etc.

+

+Windows:

+* Added the RAWINPUT controller driver to support more than 4 Xbox controllers simultaneously

+* Added the hint SDL_HINT_JOYSTICK_RAWINPUT to control whether the RAWINPUT driver should be used

+* Added the hint SDL_HINT_JOYSTICK_HIDAPI_CORRELATE_XINPUT to control whether XInput and WGI should be used to for complete controller functionality with the RAWINPUT driver.

+

+macOS:

+* Added the SDL_WINDOW_METAL flag to specify that a window should be created with a Metal view

+* Added SDL_Metal_GetLayer() to get the CAMetalLayer backing a Metal view

+* Added SDL_Metal_GetDrawableSize() to get the size of a window's drawable, in pixels

+

+Linux:

+* Added the hint SDL_HINT_AUDIO_DEVICE_APP_NAME to specify the name that shows up in PulseAudio for your application

+* Added the hint SDL_HINT_AUDIO_DEVICE_STREAM_NAME to specify the name that shows up in PulseAudio associated with your audio stream

+* Added the hint SDL_HINT_LINUX_JOYSTICK_DEADZONES to control whether HID defined dead zones should be respected on Linux

+* Added the hint SDL_HINT_THREAD_PRIORITY_POLICY to specify the thread scheduler policy

+* Added the hint SDL_HINT_THREAD_FORCE_REALTIME_TIME_CRITICAL to allow time critical threads to use a realtime scheduling policy

+

+Android:

+* Added SDL_AndroidRequestPermission() to request a specific system permission

+* Added the hint SDL_HINT_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO to control whether audio will pause when the application goes intot he background

+

+OS/2:

+* Added support for OS/2, see docs/README-os2.md for details

+

+Emscripten (running in a web browser):

+* Added the hint SDL_HINT_EMSCRIPTEN_ASYNCIFY to control whether SDL should call emscripten_sleep internally

+

+

+---------------------------------------------------------------------------

 2.0.12:

 ---------------------------------------------------------------------------

 

diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist
index cb34f9df0..ee9ddd564 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.13</string>
+	<string>2.0.14</string>
 	<key>CFBundleSignature</key>
 	<string>SDLX</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.13</string>
+	<string>2.0.14</string>
 </dict>
 </plist>
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index 47a7a8dee..d2d9f8f2c 100755
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -10010,7 +10010,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEPLOYMENT_POSTPROCESSING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1.0.0;
-				DYLIB_CURRENT_VERSION = 12.0.0;
+				DYLIB_CURRENT_VERSION = 15.0.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_ALTIVEC_EXTENSIONS = YES;
@@ -10089,7 +10089,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 1.0.0;
-				DYLIB_CURRENT_VERSION = 12.0.0;
+				DYLIB_CURRENT_VERSION = 15.0.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 137ec710c..f69ee07fb 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.14"

 

 # 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 7823da989..d453c5fde 100755
--- a/configure
+++ b/configure
@@ -2816,9 +2816,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=14
+SDL_INTERFACE_AGE=0
+SDL_BINARY_AGE=14
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
 
 
diff --git a/configure.ac b/configure.ac
index a1aada199..11bbc5cc4 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=14
+SDL_INTERFACE_AGE=0
+SDL_BINARY_AGE=14
 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 ad4a11802..2a8c1688e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-libsdl2 (2.0.12) UNRELEASED; urgency=low
+libsdl2 (2.0.14) UNRELEASED; urgency=low
+
+  * Updated SDL to version 2.0.14
+
+ -- Sam Lantinga <slouken@libsdl.org>  Tue, 8 Dec 2020 17:54:33 -0800
+
+libsdl2 (2.0.13) UNRELEASED; urgency=low
 
   * Updated SDL to version 2.0.13 for development builds
 
diff --git a/include/SDL_misc.h b/include/SDL_misc.h
index e6ac925c6..a04f19ba8 100644
--- a/include/SDL_misc.h
+++ b/include/SDL_misc.h
@@ -70,6 +70,6 @@ extern DECLSPEC int SDLCALL SDL_OpenURL(const char *url);
 #endif
 #include "close_code.h"
 
-#endif /* SDL_filesystem_h_ */
+#endif /* SDL_misc_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL_version.h b/include/SDL_version.h
index ec2cc8f65..23b65f434 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      14
 
 /**
  *  \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 0c2b94c1e..9c319261d 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,14,0

+ PRODUCTVERSION 2,0,14,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, 14, 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, 14, 0\0"

         END

     END

     BLOCK "VarFileInfo"