Properly detect whether podman or docker should be used.

.gitmodules

@@ -27,7 +27,7 @@
 	url = https://github.com/jp7677/dxvk-nvapi
 [submodule "vkd3d"]
 	path = vkd3d
-	url = https://github.com/ValveSoftware/vkd3d
+	url = https://gitlab.winehq.org/wine/vkd3d
 [submodule "Vulkan-Headers"]
 	path = Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers
@@ -55,3 +55,17 @@
 [submodule "glslang"]
 	path = glslang
 	url = https://github.com/KhronosGroup/glslang
+[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
+[submodule "piper"]
+	path = piper
+	url = https://github.com/shaunren/piper.git
+	branch = library

Makefile.in

@@ -96,6 +96,7 @@ include $(SRC)/make/rules-cmake.mk
 include $(SRC)/make/rules-autoconf.mk
 include $(SRC)/make/rules-configure.mk
 include $(SRC)/make/rules-winemaker.mk
+include $(SRC)/make/rules-wine-requests.mk
 include $(SRC)/make/rules-cargo.mk
 
 
@@ -187,6 +188,7 @@ $(eval $(call rules-meson,gst_base,64))
 ##
 
 GST_GOOD_MESON_ARGS := \
+	-Dapetag=enabled \
 	-Dauto_features=disabled \
 	-Daudioparsers=enabled \
 	-Dautodetect=enabled \
@@ -211,6 +213,22 @@ $(eval $(call rules-source,gst_good,$(SRCDIR)/gstreamer/subprojects/gst-plugins-
 $(eval $(call rules-meson,gst_good,32))
 $(eval $(call rules-meson,gst_good,64))
 
+##
+## gst-plugins-bad
+##
+
+GST_BAD_MESON_ARGS := \
+	-Dauto_features=disabled \
+	-Dvideoparsers=enabled \
+	-Dhls=enabled \
+	-Dmpegtsdemux=enabled
+
+GST_BAD_DEPENDS = gst_orc gstreamer gst_base
+
+$(eval $(call rules-source,gst_bad,$(SRCDIR)/gstreamer/subprojects/gst-plugins-bad/))
+$(eval $(call rules-meson,gst_bad,32))
+$(eval $(call rules-meson,gst_bad,64))
+
 ##
 ## FFmpeg
 ##
@@ -286,21 +304,6 @@ $(eval $(call rules-cmake,spirv-headers,32,CROSS))
 $(eval $(call rules-cmake,spirv-headers,64,CROSS))
 
 
-##
-## Vulkan-Loader
-##
-
-VULKAN_LOADER_CMAKE_ARGS = -DUSE_MASM=OFF
-VULKAN_LOADER_CMAKE_ARGS64 = -DVULKAN_HEADERS_INSTALL_DIR=$(VULKAN_HEADERS_DST64)
-VULKAN_LOADER_CMAKE_ARGS32 = -DVULKAN_HEADERS_INSTALL_DIR=$(VULKAN_HEADERS_DST32)
-VULKAN_LOADER_CFLAGS = -DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00 # 0x0A00 is _WIN32_WINNT_WIN10
-VULKAN_LOADER_DEPENDS = vulkan-headers spirv-headers
-
-$(eval $(call rules-source,vulkan-loader,$(SRCDIR)/Vulkan-Loader))
-$(eval $(call rules-cmake,vulkan-loader,32,CROSS))
-$(eval $(call rules-cmake,vulkan-loader,64,CROSS))
-
-
 ##
 ## glslang
 ##
@@ -381,6 +384,96 @@ $(OBJ)/.steamexe-post-build64:
 	cp $(SRC)/steam_helper/64/libsteam_api.so $(DST_LIBDIR64)/
 	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-autoconf,openfst,32))
+$(eval $(call rules-autoconf,openfst,64))
+
+
+##
+## 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,32))
+$(eval $(call rules-cmake,kaldi,64))
+
+
+##
+## 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,32))
+$(eval $(call rules-cmake,vosk,64))
+
+##
+## piper
+##
+
+$(eval $(call rules-source,piper,$(SRCDIR)/piper))
+$(eval $(call rules-cmake,piper,64))
+
+$(OBJ)/.piper-post-build64:
+	mkdir -p $(PIPER_DST64)/lib64
+	mkdir -p $(DST_DIR)/share
+	mv $(PIPER_DST64)/*.so* $(PIPER_DST64)/lib64/
+	cp -a $(PIPER_DST64)/{espeak-ng-data,libtashkeel_model.ort} $(DST_DIR)/share/
+	touch $@
 
 ##
 ## wine
@@ -399,7 +492,12 @@ WINE_SOURCE_ARGS = \
   --exclude dlls/winevulkan/vulkan_thunks.c \
   --exclude dlls/winevulkan/vulkan_thunks.h \
   --exclude dlls/winevulkan/winevulkan.json \
-  --exclude dlls/winevulkan/winevulkan.spec
+  --exclude dlls/winevulkan/winevulkan.spec \
+  --exclude dlls/ntdll/ntsyscalls.h \
+  --exclude dlls/win32u/win32syscalls.h \
+  --exclude include/wine/server_protocol.h \
+  --exclude server/request.h \
+  --exclude server/trace.c \
 
 WINE_CONFIGURE_ARGS = \
   --enable-werror \
@@ -414,16 +512,17 @@ WINE_CONFIGURE_ARGS64 = --enable-win64 \
   VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_DST64)/include -I$(VKD3D_DST64)/include/vkd3d" \
   VKD3D_PE_LIBS="-L$(VKD3D_DST64)/bin -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll"
 
-WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d
+WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d openfst kaldi vosk
+WINE_DEPENDS64 = piper
 
 $(eval $(call rules-source,wine,$(SRCDIR)/wine))
 $(eval $(call rules-autoconf,wine,32))
 $(eval $(call rules-autoconf,wine,64))
+$(eval $(call rules-wine-requests,wine))
 
 $(OBJ)/.wine-post-source:
-	-cd $(WINE_SRC) && tools/make_specfiles
-	cd $(WINE_SRC) && tools/make_requests
 	cd $(WINE_SRC) && dlls/winevulkan/make_vulkan -x vk.xml
+	-cd $(WINE_SRC) && tools/make_specfiles
 	touch $@
 
 $(OBJ)/.wine-post-build64:
@@ -462,6 +561,9 @@ $(eval $(call rules-makedep,vrclient,64))
 DXVK_SOURCE_DATE_EPOCH32 := $(shell expr $(BASE_SOURCE_DATE_EPOCH32) - 1)
 DXVK_SOURCE_DATE_EPOCH64 := $(shell expr $(BASE_SOURCE_DATE_EPOCH64) - 1)
 
+DXVK_SOURCE_ARGS = \
+  --exclude version.h.in \
+
 DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
 DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
 DXVK_DEPENDS = glslang
@@ -533,8 +635,11 @@ VKD3D_CONFIGURE_ARGS = \
   --without-ncurses \
   SONAME_LIBVULKAN=vulkan-1 \
 
+# LTO is enabled by default, but causes the build to fail. I havent't
+# investigated this yet.
+VKD3D_CFLAGS = -fno-lto
 VKD3D_LDFLAGS = -static-libgcc $(CROSSLDFLAGS)
-VKD3D_DEPENDS = vulkan-loader vulkan-headers spirv-headers
+VKD3D_DEPENDS = vulkan-headers spirv-headers
 
 $(eval $(call rules-source,vkd3d,$(SRCDIR)/vkd3d))
 $(eval $(call rules-autoconf,vkd3d,32,CROSS))
@@ -924,11 +1029,11 @@ DIST_GECKO64 := $(OBJ)/.gecko-dist64
 
 $(SRC)/contrib/$(GECKO64_TARBALL):
 	mkdir -p $(dir $@)
-	wget --no-use-server-timestamps -O $@ $(GECKO64_TARBALL_URL)
+	wget --no-use-server-timestamps -O $@ $(GECKO64_TARBALL_URL) || (rm $@; false)
 
 $(SRC)/contrib/$(GECKO32_TARBALL):
 	mkdir -p $(dir $@)
-	wget --no-use-server-timestamps -O $@ $(GECKO32_TARBALL_URL)
+	wget --no-use-server-timestamps -O $@ $(GECKO32_TARBALL_URL) || (rm $@; false)
 
 $(DIST_GECKO32): $(SRC)/contrib/$(GECKO32_TARBALL)
 	mkdir -p $(DIST_GECKO_DIR)
@@ -949,15 +1054,15 @@ all-dist: $(DIST_GECKO32) $(DIST_GECKO64)
 ## wine-mono
 ##
 
-WINEMONO_VER := 9.1.0
+WINEMONO_VER := 9.3.1
 WINEMONO_TARBALL := wine-mono-$(WINEMONO_VER)-x86.tar.xz
 DIST_WINEMONO_DIR := $(DST_DIR)/share/wine/mono
 DIST_WINEMONO := $(OBJ)/.wine-mono-dist
 MONO_TARBALL_URL := https://github.com/madewokherd/wine-mono/releases/download/wine-mono-$(WINEMONO_VER)/$(WINEMONO_TARBALL)
 
 $(SRC)/contrib/$(WINEMONO_TARBALL):
 	mkdir -p $(dir $@)
-	wget --no-use-server-timestamps -O $@ $(MONO_TARBALL_URL)
+	wget --no-use-server-timestamps -O $@ $(MONO_TARBALL_URL) || (rm $@; false)
 
 $(DIST_WINEMONO): $(SRC)/contrib/$(WINEMONO_TARBALL)
 	mkdir -p $(DIST_WINEMONO_DIR)
@@ -972,7 +1077,7 @@ all-dist: $(DIST_WINEMONO)
 ## xalia
 ##
 
-XALIA_VER := 0.4.2
+XALIA_VER := 0.4.5
 XALIA_ZIP := xalia-$(XALIA_VER)-net48-mono.zip
 DIST_XALIA_DIR := $(DST_DIR)/share/xalia
 DIST_XALIA := $(OBJ)/.xalia-dist
@@ -991,19 +1096,46 @@ $(DIST_XALIA): $(SRC)/contrib/$(XALIA_ZIP)
 all-dist: $(DIST_XALIA)
 
 
+##
+## ICU
+##
+
+ICU_VER := 6.8.2
+DIST_ICU64_DIR := $(DST_DIR)/lib64/icu
+DIST_ICU64 := $(OBJ)/.icu-dist64
+ICU64_TARBALL := icu-$(ICU_VER)-x86_64.tar.xz
+DIST_ICU32_DIR := $(DST_DIR)/lib/icu
+DIST_ICU32 := $(OBJ)/.icu-dist32
+ICU32_TARBALL := icu-$(ICU_VER)-x86.tar.xz
+
+$(DIST_ICU64): $(SRC)/icu/$(ICU64_TARBALL)
+	mkdir -p $(DIST_ICU64_DIR)
+	rm -rf $(DIST_ICU64_DIR)/*.dll
+	tar --no-same-owner -xf $< -C $(DIST_ICU64_DIR)
+	touch $@
+
+$(DIST_ICU32): $(SRC)/icu/$(ICU32_TARBALL)
+	mkdir -p $(DIST_ICU32_DIR)
+	rm -rf $(DIST_ICU32_DIR)/*.dll
+	tar --no-same-owner -xf $< -C $(DIST_ICU32_DIR)
+	touch $@
+
+all-dist: $(DIST_ICU64) $(DIST_ICU32)
+
+
 ##
 ## openvr
 ##
 
 DIST_OVR32 := $(DST_LIBDIR32)/wine/dxvk/openvr_api_dxvk.dll
 $(DIST_OVR32): $(SRCDIR)/openvr/bin/win32/openvr_api.dll | $(DST_DIR)
 	mkdir -p $(DST_LIBDIR32)/wine/dxvk
-	cp -a $< $@
+	cp -af $< $@
 
 DIST_OVR64 := $(DST_LIBDIR64)/wine/dxvk/openvr_api_dxvk.dll
 $(DIST_OVR64): $(SRCDIR)/openvr/bin/win64/openvr_api.dll | $(DST_DIR)
 	mkdir -p $(DST_LIBDIR64)/wine/dxvk
-	cp -a $< $@
+	cp -af $< $@
 
 all-dist: $(DIST_OVR32) $(DIST_OVR64)
 
@@ -1012,7 +1144,7 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
 ## default_pfx
 ##
 
-default_pfx: wine gst_good gst_libav gst_plugins_rs lsteamclient steamexe vrclient wineopenxr dxvk dxvk-nvapi vkd3d-proton
+default_pfx: wine gst_good gst_bad gst_libav gst_plugins_rs lsteamclient steamexe vrclient wineopenxr dxvk dxvk-nvapi vkd3d-proton
 	find $(DST_LIBDIR32)/wine -type f -execdir chmod a-w '{}' '+'
 	find $(DST_LIBDIR64)/wine -type f -execdir chmod a-w '{}' '+'
 	rm -rf $(abspath $(DIST_PREFIX))
@@ -1039,8 +1171,9 @@ all-dist: $(DIST_TOOLMANIFEST)
 
 COMPAT_MANIFEST_TEMPLATE := $(SRCDIR)/compatibilitytool.vdf.template
 DIST_COMPAT_MANIFEST := $(DST_BASE)/compatibilitytool.vdf
+INTERNAL_TOOL_NAME ?= $(BUILD_NAME)-proton
 $(DIST_COMPAT_MANIFEST): $(COMPAT_MANIFEST_TEMPLATE) | $(DST_DIR)
-	sed -r 's|##BUILD_NAME##|$(BUILD_NAME)|' $< > $@
+	sed -r -e 's|##BUILD_NAME##|$(BUILD_NAME)|' -e 's|##INTERNAL_TOOL_NAME##|$(INTERNAL_TOOL_NAME)|' $< > $@
 
 all-dist: $(DIST_COMPAT_MANIFEST)
 

README.md

@@ -218,7 +218,8 @@ need to be explicitly loaded by the debugging tools. For GDB there's a helper
 script `wine/tools/gdbinit.py` (source it) that provides `load-symbol-files`
 (or `lsf` for short) command which loads the symbols for all the mapped files.
 
-For tips on debugging see [docs/DEBUGGING.md](docs/DEBUGGING.md).
+For tips on debugging see [docs/DEBUGGING-LINUX.md](docs/DEBUGGING-LINUX.md)
+and [docs/DEBUGGING-WINDOWS.md](docs/DEBUGGING-WINDOWS.md).
 
 
 `compile_commands.json`
@@ -291,6 +292,7 @@ the Wine prefix. Removing the option will revert to the previous behavior.
 | `wined3d`             | `PROTON_USE_WINED3D`               | Use OpenGL-based wined3d instead of Vulkan-based DXVK for d3d11, d3d10, and d3d9. |
 | `nod3d11`             | `PROTON_NO_D3D11`                  | Disable `d3d11.dll`, for d3d11 games which can fall back to and run better with d3d9. |
 | `nod3d10`             | `PROTON_NO_D3D10`                  | Disable `d3d10.dll` and `dxgi.dll`, for d3d10 games which can fall back to and run better with d3d9. |
+| `dxvkd3d8`            | `PROTON_DXVK_D3D8`                 | Use DXVK's `d3d8.dll`. |
 | `noesync`             | `PROTON_NO_ESYNC`                  | Do not use eventfd-based in-process synchronization primitives. |
 | `nofsync`             | `PROTON_NO_FSYNC`                  | Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no `FUTEX_WAIT_MULTIPLE` support.) |
 | `noxim`               | `PROTON_NO_XIM`                    | Enabled by default. Do not attempt to use XIM (X Input Methods) support. XIM support is known to cause crashes with libx11 older than version 1.7. |
@@ -308,7 +310,6 @@ the Wine prefix. Removing the option will revert to the previous behavior.
 | `hidenvgpu`           | `PROTON_HIDE_NVIDIA_GPU`           | Force Nvidia GPUs to always be reported as AMD GPUs. Some games require this if they depend on Windows-only Nvidia driver functionality. See also DXVK's nvapiHack config, which only affects reporting from Direct3D. |
 |                       | `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. |
-| `nosteamffmpeg`       | `PROTON_NO_STEAM_FFMPEG`           | Ignore ffmpeg that ships with Steam. Some videos may not play. |
 | `xalia`               | `PROTON_USE_XALIA`                 | Enable Xalia, a program that can add a gamepad UI for some keyboard/mouse interfaces. |
 | `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. |

compatibilitytool.vdf.template

@@ -2,7 +2,7 @@
 {
   "compat_tools"
   {
-    "##BUILD_NAME##" // Internal name of this tool
+    "##INTERNAL_TOOL_NAME##" // Internal name of this tool
     {
       // Can register this tool with Steam in two ways:
       //