rebuilt SDL2 for OSX/Win from mainstream SDL repo, hg-12241:f72836cfb92b (not-yet-released v2.0.9)

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1593 af15c1b1-3010-417e-b628-4374ebc0bcbd

MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h

@@ -1,2 +1,2 @@
-#define SDL_REVISION "hg-12191:3c9c784e85bb"
-#define SDL_REVISION_NUMBER 12191
+#define SDL_REVISION "hg-12241:f72836cfb92b"
+#define SDL_REVISION_NUMBER 12241

MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h

@@ -248,6 +248,13 @@ extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface,
 extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface,
                                             int flag, Uint32 key);
 
+/**
+ *  \brief Returns whether the surface has a color key
+ *
+ *  \return SDL_TRUE if the surface has a color key, or SDL_FALSE if the surface is NULL or has no color key
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasColorKey(SDL_Surface * surface);
+
 /**
  *  \brief Gets the color key (transparent pixel) in a blittable surface.
  *

MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h

@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   0
-#define SDL_PATCHLEVEL      8
+#define SDL_PATCHLEVEL      9
 
 /**
  *  \brief Macro to determine SDL version program was compiled against.

MacOSX/SDL2.framework/Versions/A/Resources/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.8</string>
+	<string>2.0.9</string>
 	<key>CFBundleSignature</key>
 	<string>SDLX</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -27,7 +27,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.8</string>
+	<string>2.0.9</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

Windows/SDL2/bin/sdl2-config

@@ -40,7 +40,7 @@ while test $# -gt 0; do
       lib_suffix=$optarg
       ;;
     --version)
-      echo 2.0.8
+      echo 2.0.9
       ;;
     --cflags)
       echo -I${prefix}/include -Dmain=SDL_main

Windows/SDL2/include/SDL_revision.h

@@ -1,2 +1,2 @@
-#define SDL_REVISION "hg-12191:3c9c784e85bb"
-#define SDL_REVISION_NUMBER 12191
+#define SDL_REVISION "hg-12241:f72836cfb92b"
+#define SDL_REVISION_NUMBER 12241

Windows/SDL2/include/SDL_surface.h

@@ -248,6 +248,13 @@ extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface,
 extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface,
                                             int flag, Uint32 key);
 
+/**
+ *  \brief Returns whether the surface has a color key
+ *
+ *  \return SDL_TRUE if the surface has a color key, or SDL_FALSE if the surface is NULL or has no color key
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasColorKey(SDL_Surface * surface);
+
 /**
  *  \brief Gets the color key (transparent pixel) in a blittable surface.
  *

Windows/SDL2/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      8
+#define SDL_PATCHLEVEL      9
 
 /**
  *  \brief Macro to determine SDL version program was compiled against.

Windows/SDL2/watcom/SDL2.def

@@ -280,6 +280,7 @@ SDL_HasAVX2
 SDL_HasAVX512F
 SDL_HasAltiVec
 SDL_HasClipboardText
+SDL_HasColorKey
 SDL_HasEvent
 SDL_HasEvents
 SDL_HasIntersection

Windows/SDL2/watcom/SDL2.exp

@@ -277,6 +277,7 @@
 ++'_SDL_HasAVX512F'.'SDL2.DLL'..'SDL_HasAVX512F'
 ++'_SDL_HasAltiVec'.'SDL2.DLL'..'SDL_HasAltiVec'
 ++'_SDL_HasClipboardText'.'SDL2.DLL'..'SDL_HasClipboardText'
+++'_SDL_HasColorKey'.'SDL2.DLL'..'SDL_HasColorKey'
 ++'_SDL_HasEvent'.'SDL2.DLL'..'SDL_HasEvent'
 ++'_SDL_HasEvents'.'SDL2.DLL'..'SDL_HasEvents'
 ++'_SDL_HasIntersection'.'SDL2.DLL'..'SDL_HasIntersection'