From d1a090d469b30d92cace996f18f418be948f91d7 Mon Sep 17 00:00:00 2001 From: Justin Blanchard Date: Sat, 10 Jul 2021 11:46:42 -0400 Subject: [PATCH] Give up on libwebp in steamruntime. --- CHANGELOG.md | 2 +- naev-steamruntime/Dockerfile | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7571a9..eb58c8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ `naev-macos` (Used to cross compile macOS releases, and CI) ### v1.4.9 -Added more SuiteSparse libraries to `naev-macos`. +Added more SuiteSparse libraries to `naev-macos`. Added additional website build dependencies. Give up on libwebp in steamruntime. ### v1.4.8 Fixed website builds on the `naev-linux-latest` image. diff --git a/naev-steamruntime/Dockerfile b/naev-steamruntime/Dockerfile index 880f23f..6949ecc 100644 --- a/naev-steamruntime/Dockerfile +++ b/naev-steamruntime/Dockerfile @@ -4,9 +4,6 @@ LABEL org.opencontainers.image.authors "Jack Greiner " LABEL org.opencontainers.image.source "https://github.com/ProjectSynchro/synchros-sexy-docker-containers" LABEL org.opencontainers.image.description "Steam runtime (Soldier) development environment for Naev, various dependencies for testing meson and autotools as well as additional Naev functionality." -# Update APT repositories -RUN apt-get update - # Install pip from steam/debian repositories. RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip RUN python3 -m pip install --upgrade pip && \ @@ -25,9 +22,6 @@ RUN python3 -m pip install meson --upgrade && \ which meson && \ meson --version -# Naughty: we need libwebp, not in the SDK... though only at runtime, dynamically loaded by SDL2_mixer. -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libwebp-dev - # Cleanup apt cache and remove lists. RUN apt-get clean && \ rm -rf /var/lib/apt/lists/*