fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Upgrade to use SDL3 version of libtcod

Author: HexDecimal

build_sdl.py

@@ -90,7 +90,9 @@ def check_sdl_version() -> None:
         return
     needed_version = f"{SDL_MIN_VERSION[0]}.{SDL_MIN_VERSION[1]}.{SDL_MIN_VERSION[2]}"
     try:
-        sdl_version_str = subprocess.check_output(["sdl3-config", "--version"], universal_newlines=True).strip()
+        sdl_version_str = subprocess.check_output(
+            ["pkg-config", "sdl3", "--modversion"], universal_newlines=True
+        ).strip()
     except FileNotFoundError as exc:
         msg = (
             "libsdl3-dev or equivalent must be installed on your system and must be at least version"
@@ -219,7 +221,7 @@ def on_directive_handle(
 else:  # Unix
     matches = re.findall(
         r"-I(\S+)",
-        subprocess.check_output(["sdl3-config", "--cflags"], universal_newlines=True),
+        subprocess.check_output(["pkg-config", "sdl3", "--cflags"], universal_newlines=True),
     )
     assert matches
 
@@ -323,5 +325,9 @@ def get_cdef() -> str:
 
 # Use sdl-config to link to SDL on Linux.
 if sys.platform not in ["win32", "darwin"]:
-    extra_compile_args += subprocess.check_output(["sdl3-config", "--cflags"], universal_newlines=True).strip().split()
-    extra_link_args += subprocess.check_output(["sdl3-config", "--libs"], universal_newlines=True).strip().split()
+    extra_compile_args += (
+        subprocess.check_output(["pkg-config", "sdl3", "--cflags"], universal_newlines=True).strip().split()
+    )
+    extra_link_args += (
+        subprocess.check_output(["pkg-config", "sdl3", "--libs"], universal_newlines=True).strip().split()
+    )

setup.py

@@ -42,7 +42,10 @@ def check_sdl_version() -> None:
         return
     needed_version = "{}.{}.{}".format(*SDL_VERSION_NEEDED)
     try:
-        sdl_version_str = subprocess.check_output(["pkg-config", "sdl3", "--version"], universal_newlines=True).strip()  # noqa: S603, S607
+        sdl_version_str = subprocess.check_output(
+            ["pkg-config", "sdl3", "--modversion"],  # noqa: S607
+            universal_newlines=True,
+        ).strip()
     except FileNotFoundError:
         try:
             sdl_version_str = subprocess.check_output(["sdl3-config", "--version"], universal_newlines=True).strip()  # noqa: S603, S607