lsteamclient: Synthesize SDK version 1.59x

.gitmodules

@@ -59,3 +59,13 @@
 	path = piper
 	url = https://github.com/shaunren/piper.git
 	branch = library
+[submodule "openfst"]
+	path = openfst
+	url = https://github.com/alphacep/openfst
+[submodule "kaldi"]
+	path = kaldi
+	url = https://github.com/alphacep/kaldi
+	branch = vosk
+[submodule "vosk-api"]
+	path = vosk-api
+	url = https://github.com/alphacep/vosk-api

Makefile.in

@@ -24,7 +24,7 @@ SHELL := /bin/bash
 #   BUILD_NAME      - Name of the build for manifests etc.
 #   STEAMRT_IMAGE   - Name of the docker image to use for building
 
-STEAMRT_IMAGE ?= registry.gitlab.steamos.cloud/proton/sniper/sdk:3.0.20250210.116596-0
+STEAMRT_IMAGE ?= registry.gitlab.steamos.cloud/proton/sniper/sdk:3.0.20250519.130773-0
 ifeq ($(SRCDIR),)
 	foo := $(error SRCDIR not set, do not include Makefile.in directly, run ./configure.sh to generate Makefile)
 endif
@@ -59,6 +59,7 @@ x86_64_CFLAGS  := -mcmodel=small -march=nocona -mtune=core-avx2 -mfpmath=sse
 CFLAGS  = -O2 -fwrapv -fno-strict-aliasing
 CFLAGS += -ggdb -ffunction-sections -fdata-sections -fno-omit-frame-pointer
 CFLAGS += -ffile-prefix-map=$(CCACHE_BASEDIR)=.
+CFLAGS += -Wl,--exclude-libs=libstdc++.a
 
 ifneq ($(SUPPRESS_WARNINGS),)
 	CFLAGS += -w
@@ -201,6 +202,7 @@ GST_GOOD_MESON_ARGS := \
 	-Davi=enabled \
 	-Ddebugutils=enabled \
 	-Ddeinterlace=enabled \
+	-Dicydemux=enabled \
 	-Disomp4=enabled \
 	-Dmatroska=enabled \
 	-Dmpg123=enabled \
@@ -400,10 +402,91 @@ $(OBJ)/.piper-x86_64-post-build:
 	cp -a $(PIPER_x86_64_DST)/{espeak-ng-data,libtashkeel_model.ort} $(DST_DIR)/share/
 	touch $@
 
+##
+## openfst
+##
+
+OPENFST_SOURCE_ARGS = \
+  --include src/include/fst/config.h.in \
+  --exclude aclocal.m4 \
+  --exclude ar-lib \
+  --exclude autom4te.cache \
+  --exclude compile \
+  --exclude config.guess \
+  --exclude config.h.in \
+  --exclude config.sub \
+  --exclude configure \
+  --exclude depcomp \
+  --exclude install-sh \
+  --exclude ltmain.sh \
+  --exclude m4/libtool.m4 \
+  --exclude m4/ltoptions.m4 \
+  --exclude m4/ltsugar.m4 \
+  --exclude m4/ltversion.m4 \
+  --exclude m4/lt~obsolete.m4 \
+  --exclude Makefile.in \
+  --exclude missing \
+  --exclude test-driver \
+
+OPENFST_CONFIGURE_ARGS = \
+  --enable-silent-rules \
+  --enable-static \
+  --disable-shared \
+  --enable-far \
+  --enable-ngram-fsts \
+  --enable-lookahead-fsts \
+  --with-pic \
+  --disable-bin \
+
+$(eval $(call rules-source,openfst,$(SRCDIR)/openfst))
+$(eval $(call rules-configure,openfst,i386,unix))
+$(eval $(call rules-configure,openfst,x86_64,unix))
+
+
+##
+## kaldi
+##
+
+KALDI_SOURCE_ARGS = \
+  --exclude src/**/CMakeLists.txt \
+
+KALDI_CMAKE_ARGS = \
+  -DKALDI_VERSION=5.5-proton \
+  -DBLAS_LIBRARIES=-lblas \
+  -DLAPACK_LIBRARIES=-llapack \
+  -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+  -DBUILD_SHARED_LIBS=OFF \
+  -DKALDI_BUILD_TEST=OFF \
+  -DKALDI_BUILD_EXE=OFF \
+
+KALDI_DEPENDS = openfst
+
+$(eval $(call rules-source,kaldi,$(SRCDIR)/kaldi))
+$(eval $(call rules-cmake,kaldi,i386,unix))
+$(eval $(call rules-cmake,kaldi,x86_64,unix))
+
+
+##
+## vosk
+##
+
+VOSK_CMAKE_ARGS = \
+  -DBUILD_SHARED_LIBS=ON \
+
+VOSK_DEPENDS = openfst kaldi
+
+$(eval $(call rules-source,vosk,$(SRCDIR)/vosk-api))
+$(eval $(call rules-cmake,vosk,i386,unix))
+$(eval $(call rules-cmake,vosk,x86_64,unix))
+
+
 ##
 ## wine
 ##
 
+# HACK: glib 2.0 in the runtime is old and causes a lot of errors with a newer GCC
+WINE_CFLAGS += -Wno-discarded-qualifiers
+
 WINE_SOURCE_ARGS = \
   --exclude configure \
   --exclude autom4te.cache \
@@ -440,7 +523,7 @@ WINE_x86_64_AUTOCONF_ARGS += \
   VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_x86_64_DST)/include -I$(VKD3D_x86_64_DST)/include/vkd3d" \
   VKD3D_PE_LIBS="-L$(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll"
 
-WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d ffmpeg
+WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d ffmpeg openfst kaldi vosk
 WINE_x86_64_DEPENDS = piper
 
 WINE_i386_LIBDIR = $(WINE_i386_DST)/lib
@@ -591,6 +674,12 @@ $(eval $(call rules-source,vkd3d,$(SRCDIR)/vkd3d))
 $(eval $(call rules-autoconf,vkd3d,i386,windows))
 $(eval $(call rules-autoconf,vkd3d,x86_64,windows))
 
+$(OBJ)/.vkd3d-post-source:
+	mkdir -p $(DST_LIBDIR)/vkd3d
+	rm -rf $(DST_LIBDIR)/vkd3d/version
+	echo "$(shell git -C $(SRCDIR) submodule status -- vkd3d)" > $(DST_LIBDIR)/vkd3d/version
+	touch $@
+
 $(OBJ)/.vkd3d-x86_64-post-build: $(OBJ)/.wine-$(HOST_ARCH)-tools
 	mkdir -p $(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows
 	$(call make-builtin,$(VKD3D_x86_64_DST)/bin/libvkd3d-1.dll)
@@ -646,32 +735,14 @@ $(OBJ)/.vkd3d-proton-post-source:
 ## BattlEye Bridge
 ##
 
-ifneq ($(wildcard $(SRCDIR)/battleye-bridge/.*),)
 
-BATTLEYE_LDFLAGS = -static-libgcc -static-libstdc++ -ldl
+ifneq ($(wildcard $(SRCDIR)/battleye-bridge/.*),)
 
 BATTLEYE_DEPENDS = wine
 
 $(eval $(call rules-source,battleye,$(SRCDIR)/battleye-bridge))
-$(eval $(call rules-winemaker,battleye,i386,beclient.dll))
-$(eval $(call rules-winemaker,battleye,x86_64,beclient_x64.dll))
-
-$(OBJ)/.battleye-post-source:
-	mkdir -p $(BATTLEYE_i386_OBJ) && cp -a $(BATTLEYE_SRC)/beclient.spec $(BATTLEYE_i386_OBJ)/beclient.spec
-	mkdir -p $(BATTLEYE_x86_64_OBJ) && cp -a $(BATTLEYE_SRC)/beclient.spec $(BATTLEYE_x86_64_OBJ)/beclient_x64.spec
-	touch $@
-
-$(OBJ)/.battleye-x86_64-post-build:
-	mkdir -p $(OBJ)/dist-battleye/v1
-	cp -r $(BATTLEYE_x86_64_DST)/* $(OBJ)/dist-battleye/v1/
-	rm -rf $(BATTLEYE_x86_64_DST)/*
-	touch $@
-
-$(OBJ)/.battleye-i386-post-build:
-	mkdir -p $(OBJ)/dist-battleye/v1
-	cp -r $(BATTLEYE_i386_DST)/* $(OBJ)/dist-battleye/v1/
-	rm -rf $(BATTLEYE_i386_DST)/*
-	touch $@
+$(eval $(call rules-makedep,battleye,i386))
+$(eval $(call rules-makedep,battleye,x86_64))
 
 endif
 
@@ -859,8 +930,8 @@ georgia_NAMES := "Georgia" "Georgia" "Georgia"
 georgia_ORIG := LiberationSerif-Regular
 #The use of "Courier New" here is for compatibility with programs that require that exact string. This font is not Courier New.
 cour_NAMES := "CourierNew" "Courier New" "Courier New"
-cour_PATCH := $(FONTS)/patches/LiberationMono-Regular.patch
 cour_ORIG := LiberationMono-Regular
+LiberationMono-Regular_PATCH := $(FONTS)/patches/LiberationMono-Regular.patch
 #The use of "Courier New" here is for compatibility with programs that require that exact string. This font is not Courier New.
 courbd_NAMES := "CourierNewPS-BoldMT" "Courier New" "Courier New Bold"
 courbd_ORIG := LiberationMono-Bold
@@ -897,6 +968,7 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
 	# to run it in a dedicated temporary directory to prevent concurrent instances
 	# to step onto each other's feet
 	(TEMP_DIR=`mktemp -d` && cd $$TEMP_DIR && afdko sfntedit -a CFF=$(abspath $($(notdir $@)).cff) $(abspath $@.tmp) && rm -fr $$TEMP_DIR)
+	if [ "$(notdir $@)" = "msyh.ttf" ]; then afdko otf2ttf -o $@.tmp.ttf $@.tmp; mv -f $@.tmp.ttf $@.tmp; fi
 	mv $@.tmp $@
 
 $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
@@ -994,7 +1066,7 @@ all-dist: $(OBJ)/.gecko-i386-dist $(OBJ)/.gecko-x86_64-dist
 ## wine-mono
 ##
 
-WINEMONO_VER := 10.0.0
+WINEMONO_VER := 10.2.0
 WINEMONO_TARBALL := wine-mono-$(WINEMONO_VER)-x86.tar.xz
 DIST_WINEMONO_DIR := $(DST_DIR)/share/wine/mono
 DIST_WINEMONO := $(OBJ)/.wine-mono-dist

README.md

@@ -150,6 +150,28 @@ is only useful after building Proton.
 `make dxvk` / `make vkd3d-proton` - rebuild DXVK / vkd3d-proton.
 
 
+### Figuring Out What Failed To Build
+
+Proton build system invokes builds of many subprojects in parallel. If one
+subprojects fails there can be thousands of lines printed by other sub-builds
+before the top level exits. This can make the real reason of the build failing
+hard to find.
+
+Appending `2>&1 | tee build.log` will log the full build output to a `build.log`
+file. Searching that file from the bottom up for occurrences of `Error` should
+point to the right area. E.g.:
+
+```
+make 2>&1 | tee build.log
+grep -n '] Error [0-9]' build.log
+```
+
+```
+11220:make: *** [../Makefile.in:465: /builds/proton/proton/build-dir/.kaldi-i386-configure] Error 1
+12427:make: *** [../Makefile.in:1323: deploy] Error 2
+```
+
+
 ### Debug Builds
 
 To prevent symbol stripping add `UNSTRIPPED_BUILD=1` to the `make`
@@ -311,6 +333,7 @@ the Wine prefix. Removing the option will revert to the previous behavior.
 |                       | `WINE_FULLSCREEN_INTEGER_SCALING`  | Enable integer scaling mode, to give sharp pixels when upscaling. |
 | `cmdlineappend:`      |                                    | Append the string after the colon as an argument to the game command. May be specified more than once. Escape commas and backslashes with a backslash. |
 | `xalia` or `noxalia`  | `PROTON_USE_XALIA`                 | Enable Xalia, a program that can add a gamepad UI for some keyboard/mouse interfaces, or set to 0 to disable. The default is to enable it dynamically based on window contents. |
+| `fnad3d11`            | `FNA3D_FORCE_DRIVER=D3D11`         | Force FNA to use D3D11 for rendering. |
 | `seccomp`             | `PROTON_USE_SECCOMP`               | **Note: Obsoleted in Proton 5.13.** In older versions, enable seccomp-bpf filter to emulate native syscalls, required for some DRM protections to work. |
 | `d9vk`                | `PROTON_USE_D9VK`                  | **Note: Obsoleted in Proton 5.0.** In older versions, use Vulkan-based DXVK instead of OpenGL-based wined3d for d3d9. |
 

docker/Makefile

@@ -1,4 +1,4 @@
-STEAMRT_VERSION = 3.0.20250210.116596
+STEAMRT_VERSION = 3.0.20250519.130773
 STEAMRT_URLBASE = registry.gitlab.steamos.cloud
 
 PROTONSDK_URLBASE = $(STEAMRT_URLBASE)/proton/sniper/sdk
@@ -10,8 +10,8 @@ PROTONSDK_VERSION = $(STEAMRT_VERSION)-0-dev
 BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/sniper/sdk:0.20221017.1
 
 BINUTILS_VERSION = 2.42
-GCC_VERSION = 10.3.0
-MINGW_VERSION = 9.0.0
+GCC_VERSION = 14.2.0
+MINGW_VERSION = 11.0.0
 RUST_VERSION = 1.68.0
 NINJA_VERSION = 1.11.1
 
@@ -30,8 +30,8 @@ RUST_SOURCE_i686 = rust-$(RUST_VERSION)-i686-unknown-linux-gnu.tar.gz
 NINJA_SOURCE = ninja-build_$(NINJA_VERSION).orig.tar.gz
 
 BINUTILS_SHA256 = f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800
-GCC_SHA256 = 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
-MINGW_SHA256 = 1929b94b402f5ff4d7d37a9fe88daa9cc55515a6134805c104d1794ae22a4181
+GCC_SHA256 = a7b39bc69cbf9e25826c5a60ab26477001f7c08d85cec04bc0e29cabed6f3cc9
+MINGW_SHA256 = bd0ea1633bd830204cc23a696889335e9d4a32b8619439ee17f22188695fcc5f
 RUST_SHA256_x86_64 = 7be1acdac656d0b0b7e909e5c0d4ddf61c755c203ec26ebafbd306322335b361
 RUST_SHA256_i686 = dc931adeb2943dcadfbd29546481f0296fcb97a511421053ecae6586a85869b1
 NINJA_SHA256 = 31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea
@@ -183,8 +183,6 @@ push::
 	$(DOCKER) push $(PROTONSDK_URLBASE)/gcc-$(1)-$(2):latest
 endef
 
-$(eval $(call create-gcc-rules,i686,linux-gnu))
-$(eval $(call create-gcc-rules,x86_64,linux-gnu))
 $(eval $(call create-gcc-rules,i686,w64-mingw32))
 $(eval $(call create-gcc-rules,x86_64,w64-mingw32))
 

docker/proton.Dockerfile.in

@@ -10,8 +10,6 @@ FROM @PROTONSDK_URLBASE@/mingw-pthreads-i686:@MINGW_VERSION@ AS mingw-pthreads-i
 FROM @PROTONSDK_URLBASE@/mingw-pthreads-x86_64:@MINGW_VERSION@ AS mingw-pthreads-x86_64
 FROM @PROTONSDK_URLBASE@/mingw-widl-i686:@MINGW_VERSION@ AS mingw-widl-i686
 FROM @PROTONSDK_URLBASE@/mingw-widl-x86_64:@MINGW_VERSION@ AS mingw-widl-x86_64
-FROM @PROTONSDK_URLBASE@/gcc-i686-linux-gnu:@GCC_VERSION@ AS gcc-linux-i686
-FROM @PROTONSDK_URLBASE@/gcc-x86_64-linux-gnu:@GCC_VERSION@ AS gcc-linux-x86_64
 FROM @PROTONSDK_URLBASE@/gcc-i686-w64-mingw32:@GCC_VERSION@ AS gcc-mingw-i686
 FROM @PROTONSDK_URLBASE@/gcc-x86_64-w64-mingw32:@GCC_VERSION@ AS gcc-mingw-x86_64
 
@@ -28,8 +26,6 @@ COPY --from=mingw-pthreads-i686   /opt/usr /usr
 COPY --from=mingw-pthreads-x86_64 /opt/usr /usr
 COPY --from=mingw-widl-i686       /opt/usr /usr
 COPY --from=mingw-widl-x86_64     /opt/usr /usr
-COPY --from=gcc-linux-i686        /opt/usr /usr
-COPY --from=gcc-linux-x86_64      /opt/usr /usr
 COPY --from=gcc-mingw-i686        /opt/usr /usr
 COPY --from=gcc-mingw-x86_64      /opt/usr /usr
 
@@ -49,7 +45,7 @@ RUN wget -q @RUST_URLBASE@/@RUST_SOURCE_i686@ \
 RUN bash -c 'ls /opt/rust/bin/* | xargs -n1 -I{} ln -sf {} /usr/bin/'
 
 RUN bash -c 'mkdir -p /usr/lib/ccache && ls /usr/bin/{,*-}{cc,c++,gcc,g++}{,-[0-9]*} | sed -re s:/bin:/lib/ccache: | xargs -n1 ln -sf ../../bin/ccache'
-ENV PATH=/usr/lib/ccache:$PATH
+ENV PATH=/usr/lib/ccache:/usr/lib/gcc-14/bin:$PATH
 
 RUN apt-get install -y \
   autoconf-archive \