Skip to content

Commit 4f2465d

Browse files
committed
chore: update sdl2 wrap to 2.32.8
1 parent 1759ddb commit 4f2465d

File tree

3 files changed

+62
-78
lines changed

3 files changed

+62
-78
lines changed

subprojects/packagefiles/SDL2-2.30.6_android.diff

Lines changed: 0 additions & 68 deletions
This file was deleted.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
diff --git a/meson.build b/meson.build
2+
index 34fa8a3..4e27b5d 100644
3+
--- a/meson.build
4+
+++ b/meson.build
5+
@@ -357,7 +357,7 @@ threads_dep = dependency(
6+
required: opt_threads,
7+
)
8+
9+
-if platform_is_apple
10+
+if platform_is_apple or platform_is_android
11+
libusb_dep = fake_dep
12+
else
13+
libusb_dep = dependency(
14+
@@ -1301,7 +1301,7 @@ if platform_is_android
15+
sys_audio_driver = ['opensles', 'android']
16+
sys_video_driver = ['android']
17+
sys_video_render = ['ogl_es2']
18+
- extra_deps += [cc.find_library('android'), cc.find_library('log')]
19+
+ extra_deps += [cc.find_library('android'), cc.find_library('log'), cc.find_library('OpenSLES')]
20+
if not opt_video_openglesv2.disabled()
21+
extra_deps += cc.find_library(
22+
'GLESv2',
23+
@@ -1565,7 +1565,7 @@ if platform_is_darwin
24+
all_sources += [objc_sources]
25+
endif
26+
27+
-if platform_is_winrt or platform_is_haiku
28+
+if platform_is_winrt or platform_is_haiku or platform_is_android
29+
add_languages(
30+
'cpp',
31+
native: false,
32+
diff --git a/src/core/android/meson.build b/src/core/android/meson.build
33+
index 9097eee..670052e 100644
34+
--- a/src/core/android/meson.build
35+
+++ b/src/core/android/meson.build
36+
@@ -1 +1,2 @@
37+
c_sources += files('SDL_android.c')
38+
+extra_deps += dependency('cpu-features')
39+
diff --git a/src/video/haiku/meson.build b/src/video/haiku/meson.build
40+
index 01c0215..5f353c8 100644
41+
--- a/src/video/haiku/meson.build
42+
+++ b/src/video/haiku/meson.build
43+
@@ -1,3 +1,4 @@
44+
+if platform_is_haiku
45+
cxx_sources += files(
46+
'SDL_bclipboard.cc',
47+
'SDL_bevents.cc',
48+
@@ -8,3 +9,4 @@ cxx_sources += files(
49+
'SDL_bvideo.cc',
50+
'SDL_bwindow.cc',
51+
)
52+
+endif

subprojects/sdl2.wrap

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[wrap-file]
2-
directory = SDL2-2.30.6
3-
source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-2.30.6.tar.gz
4-
source_filename = SDL2-2.30.6.tar.gz
5-
source_hash = c6ef64ca18a19d13df6eb22df9aff19fb0db65610a74cc81dae33a82235cacd4
6-
patch_filename = sdl2_2.30.6-2_patch.zip
7-
patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.30.6-2/get_patch
8-
patch_hash = aa9f6a4947b07510c2ea84fb457e965bebe5a5deeb9f5059fbcf10dfe6b76d1f
9-
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.30.6-2/SDL2-2.30.6.tar.gz
10-
wrapdb_version = 2.30.6-2
11-
diff_files = SDL2-2.30.6_android.diff
2+
directory = SDL2-2.32.8
3+
source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.32.8/SDL2-2.32.8.tar.gz
4+
source_filename = SDL2-2.32.8.tar.gz
5+
source_hash = 0ca83e9c9b31e18288c7ec811108e58bac1f1bb5ec6577ad386830eac51c787e
6+
patch_filename = sdl2_2.32.8-1_patch.zip
7+
patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.32.8-1/get_patch
8+
patch_hash = 5df17ea39ca418826db20e96bd821fa52b5718dac64b6225119fb6588c2744f0
9+
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.32.8-1/SDL2-2.32.8.tar.gz
10+
wrapdb_version = 2.32.8-1
11+
diff_files = SDL2-2.32.8_android.diff
1212

1313
[provide]
1414
sdl2 = sdl2_dep

0 commit comments

Comments
 (0)