From c167d1f6a8c7c46f3d6fb4512492a43b7dd4596c Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 9 Mar 2014 10:38:30 -0700 Subject: [PATCH] Updated SDL to version 2.0.3 --- CMakeLists.txt | 6 +++--- WhatsNew.txt | 5 +++++ Xcode/SDL/Info-Framework.plist | 4 ++-- configure | 6 +++--- configure.in | 6 +++--- debian/changelog | 6 ++++++ include/SDL_version.h | 2 +- src/main/windows/version.rc | 8 ++++---- 8 files changed, 27 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ab486ffaec04..c9d89d1b54435 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 2) -set(SDL_INTERFACE_AGE 0) -set(SDL_BINARY_AGE 2) +set(SDL_MICRO_VERSION 3) +set(SDL_INTERFACE_AGE 1) +set(SDL_BINARY_AGE 3) 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 ae1ed18e96a14..23caa2af36e7d 100644 --- a/WhatsNew.txt +++ b/WhatsNew.txt @@ -1,6 +1,11 @@ This is a list of major changes in SDL's version history. +--------------------------------------------------------------------------- +2.0.3: +--------------------------------------------------------------------------- + + --------------------------------------------------------------------------- 2.0.2: --------------------------------------------------------------------------- diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index 656742a6b9dc2..fa55492b80af2 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.2 + 2.0.3 CFBundleSignature SDLX CFBundleVersion - 2.0.2 + 2.0.3 diff --git a/configure b/configure index dc614f79830ca..0362d61def4c4 100755 --- a/configure +++ b/configure @@ -2671,9 +2671,9 @@ orig_CFLAGS="$CFLAGS" # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=2 -SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=2 +SDL_MICRO_VERSION=3 +SDL_INTERFACE_AGE=1 +SDL_BINARY_AGE=3 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/configure.in b/configure.in index ee22e420a432f..cbb4b187aca00 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=2 -SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=2 +SDL_MICRO_VERSION=3 +SDL_INTERFACE_AGE=1 +SDL_BINARY_AGE=3 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 eae34b194b074..84d1b878be8ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libsdl2 (2.0.3) UNRELEASED; urgency=low + + * Updated SDL to version 2.0.3 + + -- Sam Lantinga Sun, 9 Mar 2014 10:35:54 -0800 + libsdl2 (2.0.2) UNRELEASED; urgency=low * Updated SDL to version 2.0.2 diff --git a/include/SDL_version.h b/include/SDL_version.h index 22e0f5ea6478e..d02898bbbab0e 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 2 +#define SDL_PATCHLEVEL 3 /** * \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 f9c528edc6666..2b7e2ddee1b9a 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,2,0 - PRODUCTVERSION 2,0,2,0 + FILEVERSION 2,0,3,0 + PRODUCTVERSION 2,0,3,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 0, 2, 0\0" + VALUE "FileVersion", "2, 0, 3, 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, 2, 0\0" + VALUE "ProductVersion", "2, 0, 3, 0\0" END END BLOCK "VarFileInfo"