Merge branch 'main' of https://github.com/pygame-community/pygame-ce into base-header

Author: oddbookworm

meson.build

@@ -94,12 +94,38 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
     # yes, this is a bit ugly and hardcoded but it is what it is
     # TODO (middle-term goal) - Should migrate away from this
     # consider meson wraps? Hopefully can also get the same build path as below
+    sdl_ver = (sdl_api == 3) ? '3.2.10' : '2.32.8'
+    sdl_image_ver = (sdl_api == 3) ? '3.2.4' : '2.8.8'
+    sdl_mixer_ver = '2.8.1'
+    sdl_ttf_ver = (sdl_api == 3) ? '3.2.2' : '2.24.0'
+
     arch_suffix = 'x' + host_machine.cpu_family().substring(-2)
     base_dir = meson.current_source_dir()
     prebuilt_dir = base_dir / 'prebuilt-' + arch_suffix
 
-    # download prebuilts (uses legacy builconfig code)
-    if not fs.is_dir(prebuilt_dir)
+    sdl_dir = prebuilt_dir / '@0@-@1@'.format(sdl, sdl_ver)
+    sdl_image_dir = prebuilt_dir / '@0@-@1@'.format(sdl_image, sdl_image_ver)
+    sdl_mixer_dir = prebuilt_dir / '@0@-@1@'.format(sdl_mixer, sdl_mixer_ver)
+    sdl_ttf_dir = prebuilt_dir / '@0@-@1@'.format(sdl_ttf, sdl_ttf_ver)
+    common_lib_dir = prebuilt_dir / 'lib'
+
+    # download prebuilts (uses legacy buildconfig code)
+    required_dirs = [
+        prebuilt_dir,
+        sdl_dir,
+        sdl_image_dir,
+        sdl_mixer_dir,
+        sdl_ttf_dir,
+        common_lib_dir,
+    ]
+    any_missing = false
+    foreach d : required_dirs
+        if not fs.is_dir(d)
+            any_missing = true
+            break
+        endif
+    endforeach
+    if any_missing
         run_command(
             [
                 find_program('python3', 'python'),
@@ -109,23 +135,16 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
         )
     endif
 
-    sdl_ver = (sdl_api == 3) ? '3.2.10' : '2.32.8'
-    sdl_image_ver = (sdl_api == 3) ? '3.2.4' : '2.8.8'
-    sdl_mixer_ver = '2.8.1'
-    sdl_ttf_ver = (sdl_api == 3) ? '3.2.2' : '2.24.0'
-
     dlls = []
 
     # SDL
-    sdl_dir = prebuilt_dir / '@0@-@1@'.format(sdl, sdl_ver)
     sdl_lib_dir = sdl_dir / 'lib' / arch_suffix
     pg_inc_dirs += fs.relative_to(sdl_dir / 'include', base_dir)
     pg_lib_dirs += sdl_lib_dir
     dlls += sdl_lib_dir / '@0@.dll'.format(sdl)
 
     # SDL_image
     if get_option('image').enabled()
-        sdl_image_dir = prebuilt_dir / '@0@-@1@'.format(sdl_image, sdl_image_ver)
         sdl_image_lib_dir = sdl_image_dir / 'lib' / arch_suffix
         pg_inc_dirs += fs.relative_to(sdl_image_dir / 'include', base_dir)
         pg_lib_dirs += sdl_image_lib_dir
@@ -147,7 +166,6 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
 
     # SDL_mixer
     if get_option('mixer').enabled()
-        sdl_mixer_dir = prebuilt_dir / '@0@-@1@'.format(sdl_mixer, sdl_mixer_ver)
         sdl_mixer_lib_dir = sdl_mixer_dir / 'lib' / arch_suffix
         pg_inc_dirs += fs.relative_to(sdl_mixer_dir / 'include', base_dir)
         pg_lib_dirs += sdl_mixer_lib_dir
@@ -163,7 +181,6 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
 
     # SDL_ttf
     if get_option('font').enabled()
-        sdl_ttf_dir = prebuilt_dir / '@0@-@1@'.format(sdl_ttf, sdl_ttf_ver)
         sdl_ttf_lib_dir = sdl_ttf_dir / 'lib' / arch_suffix
         pg_inc_dirs += fs.relative_to(sdl_ttf_dir / 'include', base_dir)
         pg_lib_dirs += sdl_ttf_lib_dir
@@ -172,7 +189,6 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
 
     # freetype, portmidi and porttime
     if get_option('freetype').enabled() and get_option('midi').enabled()
-        common_lib_dir = prebuilt_dir / 'lib'
         pg_inc_dirs += fs.relative_to(prebuilt_dir / 'include', base_dir)
         pg_lib_dirs += common_lib_dir
         dlls += [common_lib_dir / 'freetype.dll', common_lib_dir / 'portmidi.dll']

src_c/_pygame.h

@@ -151,6 +151,7 @@ PG_GetSurfaceFormat(SDL_Surface *surf)
 #define PG_EventEnabled(type) SDL_EventEnabled(type)
 #define PG_SetJoystickEventsEnabled(enabled) \
     SDL_SetJoystickEventsEnabled(enabled)
+#define PG_InitSubSystem(flags) SDL_InitSubSystem(flags)
 
 #define PG_FIND_VNUM_MAJOR(ver) SDL_VERSIONNUM_MAJOR(ver)
 #define PG_FIND_VNUM_MINOR(ver) SDL_VERSIONNUM_MINOR(ver)
@@ -316,6 +317,12 @@ PG_MapRGB(PG_PixelFormat *format, const SDL_Palette *palette, Uint8 r, Uint8 g,
     return SDL_MapRGB(format, r, g, b);
 }
 
+static inline bool
+PG_InitSubSystem(Uint32 flags)
+{
+    return SDL_InitSubSystem(flags) == 0;
+}
+
 /* Mask to test if surface flags are in a fullscreen window.
  * SDL_WINDOW_FULLSCREEN_DESKTOP works here because it also contains
  * SDL_WINDOW_FULLSCREEN. */

src_c/_sdl2/controller.c

@@ -26,7 +26,7 @@ static PyObject *
 controller_module_init(PyObject *module, PyObject *_null)
 {
     if (!SDL_WasInit(SDL_INIT_GAMECONTROLLER)) {
-        if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER)) {
+        if (!PG_InitSubSystem(SDL_INIT_GAMECONTROLLER)) {
             return RAISE(pgExc_SDLError, SDL_GetError());
         }
     }