steam runtime 4

Author: Pentarctagon

utils/dockerbuilds/CI/Dockerfile-base-steamrt

@@ -1,17 +1,12 @@
-FROM steamrt_sniper_amd64
+FROM registry.gitlab.steamos.cloud/steamrt/steamrt4/sdk
 ENV DEBIAN_FRONTEND=noninteractive
 ARG BOOST_VERSION=1.87.0
 ARG BOOST_VERSION_=1_87_0
-ARG PANGO_VERSION=1.50
-ARG PANGO_VERSION_FULL=1.50.14
 
 RUN apt-get update
-RUN apt-get install -y scons meson libreadline-dev expect-dev
+RUN apt-get install -y scons libreadline-dev expect-dev
 
 RUN wget --max-redirect 3 https://archives.boost.io/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_}.tar.gz
 RUN mkdir -p /src/boost && tar zxf boost_${BOOST_VERSION_}.tar.gz -C /src/boost --strip-components=1
-RUN cd /src/boost && ./bootstrap.sh --with-libraries=charconv,iostreams,regex,system,filesystem,process,program_options,random,locale,context,coroutine,graph && ./b2 toolset=gcc-10 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install
+RUN cd /src/boost && ./bootstrap.sh --with-libraries=charconv,iostreams,regex,system,filesystem,process,program_options,random,locale,context,coroutine,graph && ./b2 toolset=gcc-14 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install
 
-RUN wget --max-redirect 3 https://download.gnome.org/sources/pango/${PANGO_VERSION}/pango-${PANGO_VERSION_FULL}.tar.xz
-RUN mkdir -p /src/pango && tar xf pango-${PANGO_VERSION_FULL}.tar.xz -C /src/pango --strip-components=1
-RUN cd /src/pango && mkdir build && meson setup . build --prefix=/usr/local && ninja -C build && ninja -C build install

utils/dockerbuilds/make_steam_build

@@ -10,9 +10,8 @@ if [ -d "$PWD"/../../../build ]; then
     echo "Existing scons 'build' directory found, this may cause the build to fail!"
 fi
 
-docker run -v "$PWD"/../../..:/wesnoth -v "$PWD"/../steambuild:/output --tmpfs /build:exec,mode=1777 -u "$(id -u)" wesnoth/wesnoth:steamrt-sniper sh -c 'mkdir -p /build && cd /build &&
- scons -j `nproc` ctool=gcc-10 cxxtool=g++-10 enable_lto=true boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt -Y /wesnoth &&
- cp /build/wesnoth /build/wesnothd /output/ &&
- mkdir -p /output/lib && cp /usr/local/lib/x86_64-linux-gnu/libpango* /output/lib/'
+docker run -v "$PWD"/../../..:/wesnoth -v "$PWD"/../steambuild:/output --tmpfs /build:exec,mode=1777 -u "$(id -u)" wesnoth/wesnoth:steamrt-4 sh -c 'mkdir -p /build && cd /build &&
+ scons -j `nproc` ctool=gcc-14 cxxtool=g++-14 enable_lto=true boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt -Y /wesnoth &&
+ cp /build/wesnoth /build/wesnothd /output/'
 
 cp start.sh ../steambuild