Skip to content

Commit 92eb422

Browse files
authored
Update sdl2_mixer. NFC (#21013)
This avoids the need for the warning suppression since they fixed the warning upstream in: libsdl-org/SDL_mixer@64ab759111
1 parent ab01f91 commit 92eb422

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

Diff for: tools/ports/sdl2_mixer.py

+12-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import os
77

8-
TAG = 'release-2.0.4'
9-
HASH = '5ba387f997219a1deda868f380bf7ee8bc0842261dd54772ad2d560f5282fcbe7bc130e8d16dccc259eeb8cda993a0f34cd3be103fc38f8c6a68428a10e5db4c'
8+
TAG = 'release-2.6.0'
9+
HASH = '5909e06fe334eadf1753b97233a6f82c60e03bfafaaca4cb90b0468cb94343e72cd7513b57096e543282eefaef76e80fb0f23f4d4da4ccc43229ea74beb14ce1'
1010

1111
deps = ['sdl2']
1212
variants = {
@@ -53,7 +53,6 @@ def create(final):
5353

5454
if "mp3" in settings.SDL2_MIXER_FORMATS:
5555
flags += [
56-
'-Wno-incompatible-function-pointer-types',
5756
'-sUSE_MPG123',
5857
'-DMUSIC_MP3_MPG123',
5958
]
@@ -70,6 +69,12 @@ def create(final):
7069
]
7170

7271
build_dir = ports.clear_project_build('sdl2_mixer')
72+
include_path = os.path.join(source_path, 'include')
73+
includes = [
74+
include_path,
75+
os.path.join(source_path, 'src'),
76+
os.path.join(source_path, 'src', 'codecs')
77+
]
7378
ports.build_port(
7479
source_path,
7580
final,
@@ -82,11 +87,12 @@ def create(final):
8287
exclude_dirs=[
8388
'native_midi',
8489
'external',
85-
]
90+
'Xcode',
91+
],
92+
includes=includes,
8693
)
8794

88-
# copy header to a location so it can be used as 'SDL2/'
89-
ports.install_headers(source_path, pattern='SDL_*.h', target='SDL2')
95+
ports.install_headers(include_path, target='SDL2')
9096

9197
return [shared.cache.get_lib(libname, create, what='port')]
9298

0 commit comments

Comments
 (0)