deps: update sdl2 to 2.30.10

ZDoom · Dec 7, 2024 · 4a4b703 · 4a4b703
1 parent 6784cd1
commit 4a4b703
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/deps/sdl2/bin/sdl2-config b/deps/sdl2/bin/sdl2-config
@@ -43,7 +43,7 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
-      echo 2.30.9
+      echo 2.30.10
       ;;
     --cflags)
       echo -I${prefix}/include/SDL2  -D_THREAD_SAFE

diff --git a/deps/sdl2/include/SDL2/SDL_cpuinfo.h b/deps/sdl2/include/SDL2/SDL_cpuinfo.h
@@ -53,9 +53,11 @@ _m_prefetch(void *__P)
 #ifndef __MMX__
 #define __MMX__
 #endif
+/*
 #ifndef __3dNOW__
 #define __3dNOW__
 #endif
+*/
 #endif
 #ifndef __SSE__
 #define __SSE__

diff --git a/deps/sdl2/include/SDL2/SDL_revision.h b/deps/sdl2/include/SDL2/SDL_revision.h
@@ -2,7 +2,7 @@
 #define SDL_REVISION_NUMBER 0
 
 #ifdef SDL_VENDOR_INFO
-#define SDL_REVISION "SDL-2.30.9 (" SDL_VENDOR_INFO ")"
+#define SDL_REVISION "SDL-release-2.30.10-0-g9c821dc21 (" SDL_VENDOR_INFO ")"
 #else
-#define SDL_REVISION "SDL-2.30.9"
+#define SDL_REVISION "SDL-release-2.30.10-0-g9c821dc21"
 #endif
diff --git a/deps/sdl2/include/SDL2/SDL_stdinc.h b/deps/sdl2/include/SDL2/SDL_stdinc.h
@@ -255,8 +255,8 @@ typedef uint64_t Uint64;
 #ifndef SDL_PRIs64
 #if defined(__WIN32__) || defined(__GDK__)
 #define SDL_PRIs64 "I64d"
-#elif defined(PRIs64)
-#define SDL_PRIs64 PRIs64
+#elif defined(PRId64)
+#define SDL_PRIs64 PRId64
 #elif defined(__LP64__) && !defined(__APPLE__) && !defined(__EMSCRIPTEN__)
 #define SDL_PRIs64 "ld"
 #else

diff --git a/deps/sdl2/include/SDL2/SDL_version.h b/deps/sdl2/include/SDL2/SDL_version.h
@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   30
-#define SDL_PATCHLEVEL      9
+#define SDL_PATCHLEVEL      10
 
 /**
  * Macro to determine SDL version program was compiled against.

diff --git a/deps/sdl2/lib/cmake/SDL2/SDL2ConfigVersion.cmake b/deps/sdl2/lib/cmake/SDL2/SDL2ConfigVersion.cmake
@@ -7,7 +7,7 @@
 # PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
 # The variable CVF_VERSION must be set before calling configure_file().
 
-set(PACKAGE_VERSION "2.30.9")
+set(PACKAGE_VERSION "2.30.10")
 
 if (PACKAGE_FIND_VERSION_RANGE)
   # Package version must be in the requested version range

diff --git a/deps/sdl2/lib/libSDL2.a b/deps/sdl2/lib/libSDL2.a
diff --git a/deps/sdl2/lib/pkgconfig/sdl2.pc b/deps/sdl2/lib/pkgconfig/sdl2.pc
@@ -7,7 +7,7 @@ includedir=${prefix}/include
 
 Name: sdl2
 Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.
-Version: 2.30.9
+Version: 2.30.10
 Requires.private: 
 Conflicts:
 Libs: -L${libdir}   -lSDL2    -lSDL2 -Wl,-framework,CoreVideo -Wl,-framework,Cocoa -Wl,-framework,IOKit -Wl,-framework,ForceFeedback -Wl,-framework,Carbon -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AVFoundation -Wl,-framework,Foundation -Wl,-weak_framework,GameController -Wl,-weak_framework,Metal -Wl,-weak_framework,QuartzCore -Wl,-weak_framework,CoreHaptics  -lm