Skip to content
This repository was archived by the owner on Jan 26, 2026. It is now read-only.

Commit 27ad133

Browse files
SibrasSibras
committed
Merge commit 'f461d91cd265d7b9a44b4d472b1df0c0ad2855a0'
2 parents a016ab1 + f461d91 commit 27ad133

37 files changed

+303
-202
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ endif()
8787
# See docs/release_checklist.md
8888
set(SDL_MAJOR_VERSION 2)
8989
set(SDL_MINOR_VERSION 30)
90-
set(SDL_MICRO_VERSION 1)
90+
set(SDL_MICRO_VERSION 2)
9191
set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")
9292

9393
# Set defaults preventing destination file conflicts
@@ -1107,6 +1107,8 @@ if(SDL_LIBC)
11071107
check_symbol_exists(getauxval "sys/auxv.h" HAVE_GETAUXVAL)
11081108
check_symbol_exists(elf_aux_info "sys/auxv.h" HAVE_ELF_AUX_INFO)
11091109
check_symbol_exists(poll "poll.h" HAVE_POLL)
1110+
check_symbol_exists(memfd_create "sys/mman.h" HAVE_MEMFD_CREATE)
1111+
check_symbol_exists(posix_fallocate "fcntl.h" HAVE_POSIX_FALLOCATE)
11101112

11111113
check_library_exists(m pow "" HAVE_LIBM)
11121114
if(HAVE_LIBM)

‎Makefile.os2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
LIBNAME = SDL2
1616
MAJOR_VERSION = 2
1717
MINOR_VERSION = 30
18-
MICRO_VERSION = 1
18+
MICRO_VERSION = 2
1919
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
2020
DESCRIPTION = Simple DirectMedia Layer 2
2121

‎Makefile.w32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
LIBNAME = SDL2
77
MAJOR_VERSION = 2
88
MINOR_VERSION = 30
9-
MICRO_VERSION = 1
9+
MICRO_VERSION = 2
1010
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
1111

1212
LIBHOME = .

‎VisualC-GDK/SDL/SDL.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,6 @@
499499
<ClInclude Include="..\..\src\video\khronos\vulkan\vk_platform.h" />
500500
<ClInclude Include="..\..\src\video\khronos\vulkan\vk_sdk_platform.h" />
501501
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan.h" />
502-
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan.hpp" />
503502
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_android.h" />
504503
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_beta.h" />
505504
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_core.h" />

‎VisualC-GDK/SDL/SDL.vcxproj.filters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -780,9 +780,6 @@
780780
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan.h">
781781
<Filter>video\khronos\vulkan</Filter>
782782
</ClInclude>
783-
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan.hpp">
784-
<Filter>video\khronos\vulkan</Filter>
785-
</ClInclude>
786783
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_android.h">
787784
<Filter>video\khronos\vulkan</Filter>
788785
</ClInclude>

‎VisualC/SDL/SDL.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@
394394
<ClInclude Include="..\..\src\video\khronos\vulkan\vk_platform.h" />
395395
<ClInclude Include="..\..\src\video\khronos\vulkan\vk_sdk_platform.h" />
396396
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan.h" />
397-
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan.hpp" />
398397
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_android.h" />
399398
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_beta.h" />
400399
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_core.h" />

‎VisualC/SDL/SDL.vcxproj.filters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -780,9 +780,6 @@
780780
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan.h">
781781
<Filter>video\khronos\vulkan</Filter>
782782
</ClInclude>
783-
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan.hpp">
784-
<Filter>video\khronos\vulkan</Filter>
785-
</ClInclude>
786783
<ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_android.h">
787784
<Filter>video\khronos\vulkan</Filter>
788785
</ClInclude>

‎Xcode/SDL/Info-Framework.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<key>CFBundlePackageType</key>
2020
<string>FMWK</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>2.30.1</string>
22+
<string>2.30.2</string>
2323
<key>CFBundleSignature</key>
2424
<string>SDLX</string>
2525
<key>CFBundleVersion</key>
26-
<string>2.30.1</string>
26+
<string>2.30.2</string>
2727
</dict>
2828
</plist>

‎Xcode/SDL/SDL.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 46 deletions
Large diffs are not rendered by default.

‎Xcode/SDL/pkg-support/SDL.info‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Title SDL 2.30.1
1+
Title SDL 2.30.2
22
Version 1
33
Description SDL Library for Mac OS X (http://www.libsdl.org)
44
DefaultLocation /Library/Frameworks

0 commit comments

Comments
 (0)