root/ubuntu-post-install
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #420 from outis1one/claude/wolf-pair-port-conflict-7nz8qg

Browse Source 
wolf: fix ti99sim-sdl build failing on missing sdl-config
This commit is contained in:
Outis
2026-09-02 14:36:20 -04:00
committed by GitHub
parent 3b0689dfd9 a55f6c430a
commit ad5440a58b
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/wolf.sh
+21 -1
View File
@@ -1003,12 +1003,32 @@ XMLEOF
# it (copies to /opt/ti99sim/bin, symlinks into # it (copies to /opt/ti99sim/bin, symlinks into
# /usr/local/bin), so use that instead of guessing the exact # /usr/local/bin), so use that instead of guessing the exact
# build subpath. # build subpath.
# ti99sim's own Makefile.linux calls the old SDL 1.x `sdl-config`
# tool, which no longer exists — modern libsdl2-dev ships only
# pkg-config .pc files (and sometimes sdl2-config, itself already
# a thin wrapper over pkg-config). Confirmed live: without this,
# every sdl-config call silently returns nothing, so the compile
# gets no -I/-L flags at all and fails on "SDL.h: No such file or
# directory" — not a real incompatibility, just a stale tool
# name. A tiny shim mapping the handful of flags this build
# actually uses (--cflags/--libs/--version) onto pkg-config sdl2
# fixes it without patching the project's own Makefiles.
if docker run --rm -u root --entrypoint /bin/bash \ if docker run --rm -u root --entrypoint /bin/bash \
-v "$GAME_STORAGE_DIR/emulators:/output" \ -v "$GAME_STORAGE_DIR/emulators:/output" \
ghcr.io/games-on-whales/es-de:edge -c ' ghcr.io/games-on-whales/es-de:edge -c '
set -e set -e
apt-get update -qq apt-get update -qq
apt-get install -y -qq git build-essential libsdl2-dev ca-certificates apt-get install -y -qq git build-essential libsdl2-dev pkgconf ca-certificates
cat > /usr/local/bin/sdl-config << "SDLCFG"
#!/bin/sh
case "$1" in
--cflags) exec pkg-config sdl2 --cflags ;;
--libs) exec pkg-config sdl2 --libs ;;
--version) exec pkg-config sdl2 --modversion ;;
*) exec pkg-config sdl2 --cflags --libs ;;
esac
SDLCFG
chmod +x /usr/local/bin/sdl-config
git clone -q https://github.com/billzajac/ti99sim.git /tmp/ti99sim git clone -q https://github.com/billzajac/ti99sim.git /tmp/ti99sim
cd /tmp/ti99sim cd /tmp/ti99sim
make make