From 853334afedfbcbf1e9bbc77f6fdbb96313d47c55 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 9 Feb 2014 03:09:56 -0800 Subject: [PATCH] Updated SDL to version 2.0.2 --- CMakeLists.txt | 6 +++--- WhatsNew.txt | 13 +++++++++++-- Xcode/SDL/Info-Framework.plist | 4 ++-- configure | 4 ++-- configure.in | 4 ++-- debian/changelog | 6 ++++++ include/SDL_version.h | 2 +- src/main/windows/version.rc | 8 ++++---- 8 files changed, 31 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 809459b39..e81c8f9dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,9 +29,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 1) -set(SDL_INTERFACE_AGE 1) -set(SDL_BINARY_AGE 1) +set(SDL_MICRO_VERSION 2) +set(SDL_INTERFACE_AGE 0) +set(SDL_BINARY_AGE 2) set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}") # Calculate a libtool-like version number diff --git a/WhatsNew.txt b/WhatsNew.txt index db2ad8fb2..bb10895bf 100644 --- a/WhatsNew.txt +++ b/WhatsNew.txt @@ -5,11 +5,19 @@ This is a list of major changes in SDL's version history. 2.0.2: --------------------------------------------------------------------------- General: +* Added SDL_GL_ResetAttributes() to reset OpenGL attributes to default values * Added an API to load a database of Game Controller mappings from a file: SDL_GameControllerAddMappingsFromFile +* Added game controller mappings for the PS4 and OUYA controllers +* Added SDL_GetDefaultAssertionHandler() and SDL_GetAssertionHandler() +* Added SDL_DetachThread() +* Added SDL_HasAVX() to determine if the CPU has AVX features +* Added SDL_vsscanf(), SDL_acos(), and SDL_asin() to the stdlib routines * EGL can now create/manage OpenGL and OpenGL ES 1.x/2.x contexts, and share them using SDL_GL_SHARE_WITH_CURRENT_CONTEXT -* Added testgles2. testgl2 does not need to link with libGL anymore. +* testgl2 does not need to link with libGL anymore +* Added testgles2 test program to demonstrate working with OpenGL ES 2.0 +* Added controllermap test program to visually map a game controller Windows: * Support for OpenGL ES 2.x contexts using either WGL or EGL (natively via @@ -23,7 +31,8 @@ Android: Linux: * Fixed fullscreen and focused behavior when receiving NotifyGrab events -* Wayland support +* Added experimental Wayland and Mir support, disabled by default + --------------------------------------------------------------------------- 2.0.1: diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index 696ef99d9..656742a6b 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.1 + 2.0.2 CFBundleSignature SDLX CFBundleVersion - 2.0.1 + 2.0.2 diff --git a/configure b/configure index ed0793901..ccb585e25 100755 --- a/configure +++ b/configure @@ -2671,9 +2671,9 @@ orig_CFLAGS="$CFLAGS" # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=1 +SDL_MICRO_VERSION=2 SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=1 +SDL_BINARY_AGE=2 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/configure.in b/configure.in index 68a9586ec..3c7adcba1 100644 --- a/configure.in +++ b/configure.in @@ -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=1 +SDL_MICRO_VERSION=2 SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=1 +SDL_BINARY_AGE=2 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 8e9dd49bc..eae34b194 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libsdl2 (2.0.2) UNRELEASED; urgency=low + + * Updated SDL to version 2.0.2 + + -- Sam Lantinga Sun, 9 Feb 2014 2:55:59 -0800 + libsdl2 (2.0.1) UNRELEASED; urgency=low * Updated SDL to version 2.0.1 diff --git a/include/SDL_version.h b/include/SDL_version.h index 66acca99c..22e0f5ea6 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 1 +#define SDL_PATCHLEVEL 2 /** * \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 6120e2552..f9c528edc 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,1,0 - PRODUCTVERSION 2,0,1,0 + FILEVERSION 2,0,2,0 + PRODUCTVERSION 2,0,2,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 0, 1, 0\0" + VALUE "FileVersion", "2, 0, 2, 0\0" VALUE "InternalName", "SDL\0" VALUE "LegalCopyright", "Copyright © 2014 Sam Lantinga\0" VALUE "OriginalFilename", "SDL2.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 0, 1, 0\0" + VALUE "ProductVersion", "2, 0, 2, 0\0" END END BLOCK "VarFileInfo"