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

.github/workflows/python-package.yml

@@ -47,6 +47,7 @@ jobs:
       - uses: libsdl-org/setup-sdl@6574e20ac65ce362cd12f9c26b3a5e4d3cd31dee
         with:
           install-linux-dependencies: true
+          build-type: "Debug"
           version: "3.2.14"
       - uses: actions/checkout@v4
         with:
@@ -123,10 +124,11 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install xvfb
-      - uses: libsdl-org/setup-sdl@v1
+      - uses: libsdl-org/setup-sdl@6574e20ac65ce362cd12f9c26b3a5e4d3cd31dee
         if: runner.os == 'Linux'
         with:
           install-linux-dependencies: true
+          build-type: "Release"
           version: "3.2.14"
       - name: Install Python dependencies
         run: |
@@ -165,10 +167,11 @@ jobs:
     needs: [ruff, mypy, sdist]
     runs-on: ubuntu-latest
     steps:
-      - uses: libsdl-org/setup-sdl@v1
+      - uses: libsdl-org/setup-sdl@6574e20ac65ce362cd12f9c26b3a5e4d3cd31dee
         if: runner.os == 'Linux'
         with:
           install-linux-dependencies: true
+          build-type: "Debug"
           version: "3.2.14"
       - uses: actions/checkout@v4
         with:
@@ -206,10 +209,11 @@ jobs:
       - name: Install Python dependencies
         run: |
           python -m pip install --upgrade pip tox
-      - uses: libsdl-org/setup-sdl@v1
+      - uses: libsdl-org/setup-sdl@6574e20ac65ce362cd12f9c26b3a5e4d3cd31dee
         if: runner.os == 'Linux'
         with:
           install-linux-dependencies: true
+          build-type: "Debug"
           version: "3.2.14"
       - name: Run tox
         run: |

setup.py

@@ -42,13 +42,16 @@ def check_sdl_version() -> None:
         return
     needed_version = "{}.{}.{}".format(*SDL_VERSION_NEEDED)
     try:
-        sdl_version_str = subprocess.check_output(["sdl3-config", "--version"], universal_newlines=True).strip()  # noqa: S603, S607
-    except FileNotFoundError as exc:
-        msg = (
-            f"libsdl3-dev or equivalent must be installed on your system and must be at least version {needed_version}."
-            "\nsdl3-config must be on PATH."
-        )
-        raise RuntimeError(msg) from exc
+        sdl_version_str = subprocess.check_output(["pkg-config", "sdl3", "--version"], universal_newlines=True).strip()  # noqa: S603, S607
+    except FileNotFoundError:
+        try:
+            sdl_version_str = subprocess.check_output(["sdl3-config", "--version"], universal_newlines=True).strip()  # noqa: S603, S607
+        except FileNotFoundError as exc:
+            msg = (
+                f"libsdl3-dev or equivalent must be installed on your system and must be at least version {needed_version}."
+                "\nsdl3-config must be on PATH."
+            )
+            raise RuntimeError(msg) from exc
     print(f"Found SDL {sdl_version_str}.")
     sdl_version = tuple(int(s) for s in sdl_version_str.split("."))
     if sdl_version < SDL_VERSION_NEEDED: