Skip to content

Fix build by disabling mpg123 and libflac #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 15, 2025
Merged

Fix build by disabling mpg123 and libflac #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
454e23e
Update submodules
smoogipoo Aug 13, 2025
5a16446
Regenerate bindings
smoogipoo Aug 13, 2025
01def28
Fix build by disabling mpg123 and libflac
smoogipoo Aug 13, 2025
9a9cc15
Fix missing info in comment
Susko3 Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion External/SDL
Open in desktop
Submodule SDL updated 79 files
+1 −1 .github/workflows/release.yml
+0 −4 Android.mk
+23 −28 CMakeLists.txt
+1 −1 android-project/app/build.gradle
+0 −3 android-project/app/jni/Application.mk
+0 −5 android-project/app/jni/src/CMakeLists.txt
+6 −6 build-scripts/SDL_migration.cocci
+0 −7 build-scripts/androidbuildlibs.sh
+4 −0 build-scripts/build-release.py
+1 −1 build-scripts/release-info.json
+15 −1 cmake/sdlchecks.cmake
+5 −2 cmake/sdlplatform.cmake
+2 −2 include/SDL3/SDL_assert.h
+1 −1 include/SDL3/SDL_camera.h
+1 −1 include/SDL3/SDL_endian.h
+1 −1 include/SDL3/SDL_filesystem.h
+6 −6 include/SDL3/SDL_gamepad.h
+2 −2 include/SDL3/SDL_gpu.h
+1 −1 include/SDL3/SDL_hints.h
+10 −0 include/SDL3/SDL_platform_defines.h
+5 −2 include/SDL3/SDL_rect.h
+1 −1 include/SDL3/SDL_render.h
+9 −9 include/SDL3/SDL_stdinc.h
+0 −19 include/SDL3/SDL_tray.h
+3 −4 include/SDL3/SDL_video.h
+2 −1 include/build_config/SDL_build_config.h.cmake
+2 −0 src/SDL.c
+2 −2 src/audio/SDL_wave.c
+2 −1 src/audio/coreaudio/SDL_coreaudio.m
+3 −2 src/core/android/SDL_android.c
+7 −26 src/core/linux/SDL_fcitx.c
+2 −2 src/core/unix/SDL_appid.c
+6 −3 src/core/unix/SDL_gtk.c
+3 −2 src/core/unix/SDL_gtk.h
+0 −1 src/dynapi/SDL_dynapi.sym
+0 −1 src/dynapi/SDL_dynapi_overrides.h
+0 −1 src/dynapi/SDL_dynapi_procs.h
+0 −1 src/events/SDL_events.c
+6 −0 src/events/SDL_windowevents.c
+17 −4 src/gpu/vulkan/SDL_gpu_vulkan.c
+2 −3 src/haptic/linux/SDL_syshaptic.c
+34 −31 src/joystick/SDL_gamepad.c
+1 −1 src/joystick/SDL_joystick.c
+6 −0 src/joystick/gdk/SDL_gameinputjoystick.cpp
+19 −13 src/joystick/hidapi/SDL_hidapi_sinput.c
+1 −1 src/joystick/usb_ids.h
+1 −1 src/joystick/virtual/SDL_virtualjoystick.c
+0 −4 src/render/SDL_render.c
+1 −1 src/render/vulkan/SDL_render_vulkan.c
+0 −10 src/tray/cocoa/SDL_tray.m
+0 −5 src/tray/dummy/SDL_tray.c
+48 −39 src/tray/unix/SDL_tray.c
+0 −10 src/tray/windows/SDL_tray.c
+1 −0 src/video/SDL_sysvideo.h
+46 −3 src/video/SDL_video.c
+20 −5 src/video/android/SDL_androidtouch.c
+1 −0 src/video/android/SDL_androidtouch.h
+13 −0 src/video/cocoa/SDL_cocoawindow.m
+12 −1 src/video/uikit/SDL_uikitviewcontroller.m
+11 −2 src/video/wayland/SDL_waylandevents.c
+1 −1 src/video/wayland/SDL_waylandvideo.c
+1 −1 src/video/windows/SDL_windowsevents.c
+1 −1 src/video/x11/SDL_x11dyn.h
+278 −138 src/video/x11/SDL_x11events.c
+1 −0 src/video/x11/SDL_x11events.h
+232 −151 src/video/x11/SDL_x11keyboard.c
+0 −1 src/video/x11/SDL_x11keyboard.h
+68 −63 src/video/x11/SDL_x11modes.c
+2 −0 src/video/x11/SDL_x11modes.h
+1 −0 src/video/x11/SDL_x11mouse.h
+16 −85 src/video/x11/SDL_x11settings.c
+1 −5 src/video/x11/SDL_x11settings.h
+7 −20 src/video/x11/SDL_x11sym.h
+2 −0 src/video/x11/SDL_x11video.c
+36 −13 src/video/x11/SDL_x11video.h
+1 −1 src/video/x11/SDL_x11window.c
+321 −81 src/video/x11/SDL_x11xinput2.c
+2 −2 src/video/x11/SDL_x11xinput2.h
+1 −1 test/testgles2.c
2 changes: 1 addition & 1 deletion External/SDL_image
Open in desktop
Submodule SDL_image updated 42 files
+1 −1 .github/workflows/release.yml
+1 −1 .gitmodules
+45 −29 Android.mk
+51 −9 CMakeLists.txt
+54 −5 VisualC/SDL_image.vcxproj
+34 −1 VisualC/SDL_image.vcxproj.filters
+3,377 −0 VisualC/external/include/png.h
+615 −0 VisualC/external/include/pngconf.h
+233 −0 VisualC/external/include/pnglibconf.h
+134 −0 VisualC/external/optional/x64/LICENSE.libpng.txt
+ − VisualC/external/optional/x64/libpng16-16.dll
+134 −0 VisualC/external/optional/x86/LICENSE.libpng.txt
+ − VisualC/external/optional/x86/libpng16-16.dll
+17 −5 Xcode/SDL_image.xcodeproj/project.pbxproj
+10 −14 build-scripts/build-release.py
+1 −1 build-scripts/release-info.json
+5 −4 examples/showanim.c
+1 −14 examples/showimage.c
+1 −1 external/libpng
+508 −98 include/SDL3_image/SDL_image.h
+74 −2 src/IMG.c
+347 −0 src/IMG_anim_decoder.c
+40 −0 src/IMG_anim_decoder.h
+61 −53 src/IMG_anim_encoder.c
+6 −6 src/IMG_anim_encoder.h
+893 −5 src/IMG_avif.c
+23 −0 src/IMG_avif.h
+39 −0 src/IMG_bmp.c
+2,229 −252 src/IMG_gif.c
+23 −0 src/IMG_gif.h
+5 −5 src/IMG_jpg.c
+2,454 −0 src/IMG_libpng.c
+23 −0 src/IMG_libpng.h
+17 −664 src/IMG_png.c
+51 −30 src/IMG_tga.c
+407 −190 src/IMG_webp.c
+2 −1 src/IMG_webp.h
+1 −0 src/IMG_xcf.c
+24 −5 src/SDL_image.sym
+256 −0 src/xmlman.c
+43 −0 src/xmlman.h
+42 −35 test/main.c
2 changes: 1 addition & 1 deletion External/SDL_mixer
Open in desktop
Submodule SDL_mixer updated 21 files
+1 −1 .github/workflows/release.yml
+2 −2 .gitmodules
+1 −1 Android.mk
+9 −3 CMakeLists.txt
+77 −75 Xcode/mpg123/arm64/config.h
+78 −76 Xcode/mpg123/armv7/config.h
+0 −2,001 Xcode/mpg123/mpg123.h
+23 −19 Xcode/mpg123/mpg123.xcodeproj/project.pbxproj
+77 −75 Xcode/mpg123/x86_64/config.h
+8 −3 build-scripts/build-release.py
+1 −2 build-scripts/release-info.json
+7 −7 cmake/SDL3_mixerConfig.cmake.in
+1 −1 external/flac
+1 −1 external/mpg123
+1 −1 external/ogg
+1 −1 external/vorbis
+1 −1 external/wavpack
+2 −2 src/SDL_mixer.c
+8 −0 src/SDL_mixer_spatialization.c
+4 −1 src/decoder_voc.c
+11 −9 src/decoder_wav.c
2 changes: 1 addition & 1 deletion External/SDL_ttf
Open in desktop
Submodule SDL_ttf updated 11 files
+1 −1 .github/workflows/release.yml
+8 −3 build-scripts/build-release.py
+1 −1 build-scripts/release-info.json
+103 −95 cmake/PrivateSdlFunctions.cmake
+12 −0 examples/showfont.c
+2 −1 include/SDL3_ttf/SDL_textengine.h
+39 −0 include/SDL3_ttf/SDL_ttf.h
+1 −0 src/SDL_gpu_textengine.c
+1 −0 src/SDL_renderer_textengine.c
+29 −3 src/SDL_ttf.c
+2 −0 src/SDL_ttf.sym
8 changes: 7 additions & 1 deletion External/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,12 @@ run_cmake SDL_ttf ${OUTPUT_LIB/variant/_ttf} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_P
# TODO: Add support for avif on windows (VisualC script uses dynamic imports)
run_cmake SDL_image ${OUTPUT_LIB/variant/_image} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLIMAGE_AVIF=OFF -DSDLIMAGE_DEPS_SHARED=OFF -DSDLIMAGE_VENDORED=ON

run_cmake SDL_mixer ${OUTPUT_LIB/variant/_mixer} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLMIXER_DEPS_SHARED=OFF -DSDLMIXER_VENDORED=ON
# -DSDLMIXER_MP3_MPG123=OFF is used because upstream build is broken. Fallback to dr_mp3.
# See: https://github.com/libsdl-org/SDL_mixer/pull/744#issuecomment-3180682130
# Fixing using the proposed solution causes more issues.
#
# -DSDLMIXER_FLAC_LIBFLAC=OFF is used because the build fails on android-x86. Fallback to dr_flac.
# See: https://github.com/libsdl-org/SDL_mixer/issues/745
run_cmake SDL_mixer ${OUTPUT_LIB/variant/_mixer} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLMIXER_MP3_MPG123=OFF -DSDLMIXER_FLAC_LIBFLAC=OFF -DSDLMIXER_DEPS_SHARED=OFF -DSDLMIXER_VENDORED=ON

popd
4 changes: 0 additions & 4 deletions SDL3-CS/SDL3/ClangSharp/SDL_tray.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ public partial struct SDL_TrayEntry

public static unsafe partial class SDL3
{
[DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("bool")]
public static extern SDLBool SDL_IsTraySupported();

[DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
public static extern SDL_Tray* SDL_CreateTray(SDL_Surface* icon, [NativeTypeName("const char *")] byte* tooltip);

Expand Down
149 changes: 123 additions & 26 deletions SDL3_image-CS/SDL3_image/ClangSharp/SDL_image.g.cs
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions SDL3_ttf-CS/SDL3_ttf/ClangSharp/SDL_ttf.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,13 @@ public static unsafe partial class SDL3_ttf
[DllImport("SDL3_ttf", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
public static extern TTF_Direction TTF_GetFontDirection(TTF_Font* font);

[DllImport("SDL3_ttf", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("bool")]
public static extern SDLBool TTF_SetFontCharSpacing(TTF_Font* font, int spacing);

[DllImport("SDL3_ttf", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
public static extern int TTF_GetFontCharSpacing(TTF_Font* font);

[DllImport("SDL3_ttf", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("Uint32")]
public static extern uint TTF_StringToTag([NativeTypeName("const char *")] byte* @string);
Expand Down