REVERT_ME: Disable mediaconv and use github gstreamer mirrors.

To mitigate the Freedesktop outage:
https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/407

.github/ISSUE_TEMPLATE/compatibility-report.md

@@ -10,7 +10,7 @@ about: Game compatibility issues.
 
 ## System Information
 - GPU: <!-- e.g. RX 580 or GTX 970 -->
-- Video driver version: <!-- e.g. Mesa 18.2 or nvidia 396.54 -->
+- Driver/LLVM version: <!-- e.g. Mesa 18.2/7.0.0 or nvidia 396.54 -->
 - Kernel version: <!-- e.g. 4.17 -->
 - Link to full system information report as [Gist](https://gist.github.com/):
 - Proton version:
@@ -39,8 +39,6 @@ attach the generated $HOME/steam-$APPID.log to this issue report as a file.
 4. Please copy it to your clipboard by pressing `Ctrl+A` and then `Ctrl+C`.
    Then paste it in a [Gist](https://gist.github.com/) and post the link in
    this issue.
-5. Also, please copy the contents of `Help` > `Steam Runtime Information` to
-   the gist.
-6. Please search for open issues and pull requests by the name of the game and
+5. Please search for open issues and pull requests by the name of the game and
    find out whether they are relevant and should be referenced above.
 -->

.github/ISSUE_TEMPLATE/whitelist-request.md

@@ -10,7 +10,7 @@ about: Games tested and found to have no issues.
 
 ## System Information
 - GPU: <!-- e.g. RX 580 or GTX 970 -->
-- Video driver version: <!-- e.g. Mesa 18.2 or nvidia 396.54 -->
+- Driver/LLVM version: <!-- e.g. Mesa 18.2/7.0.0 or nvidia 396.54 -->
 - Distro version: <!-- e.g. Ubuntu 18.04 -->
 - Link to full system information report as [Gist](https://gist.github.com/):
 - Proton version:

.gitmodules

@@ -13,6 +13,15 @@
 [submodule "gstreamer"]
 	path = gstreamer
 	url = https://github.com/GStreamer/gstreamer.git
+[submodule "gst-plugins-base"]
+	path = gst-plugins-base
+	url = https://github.com/GStreamer/gst-plugins-base.git
+[submodule "gst-plugins-good"]
+	path = gst-plugins-good
+	url = https://github.com/GStreamer/gst-plugins-good.git
+[submodule "gst-plugins-bad"]
+	path = gst-plugins-bad
+	url = https://github.com/GStreamer/gst-plugins-bad.git
 [submodule "gst-orc"]
 	path = gst-orc
 	url = https://github.com/GStreamer/orc.git
@@ -27,7 +36,7 @@
 	url = https://github.com/jp7677/dxvk-nvapi
 [submodule "vkd3d"]
 	path = vkd3d
-	url = https://github.com/ValveSoftware/vkd3d
+	url = git://repo.or.cz/vkd3d/zf.git
 [submodule "Vulkan-Headers"]
 	path = Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers
@@ -37,21 +46,6 @@
 [submodule "Vulkan-Loader"]
 	path = Vulkan-Loader
 	url = https://github.com/KhronosGroup/Vulkan-Loader
-[submodule "gst-libav"]
-	path = gst-libav
-	url = https://github.com/GStreamer/gst-libav
-[submodule "ffmpeg"]
-	path = ffmpeg
-	url = https://github.com/FFmpeg/FFmpeg
-[submodule "dav1d"]
-	path = dav1d
-	url = https://github.com/videolan/dav1d.git
-[submodule "gst-plugins-rs"]
-	path = gst-plugins-rs
-	url = https://github.com/sdroege/gst-plugin-rs
-[submodule "graphene"]
-	path = graphene
-	url = https://github.com/ebassi/graphene
-[submodule "glslang"]
-	path = glslang
-	url = https://github.com/KhronosGroup/glslang
+[submodule "aom"]
+	path = aom
+	url = https://aomedia.googlesource.com/aom

LICENSE

@@ -4,7 +4,7 @@ All rights reserved.
 Redistribution and use of Proton in source and binary forms is governed
 by a variety of licenses.
 
-Refer to the contents of LICENSE.proton for the license for the top
+Refer to the contents of LICENCE.proton for the license for the top
 level contents of the Proton project.
 
 Proton uses a variety of other software, each of which is governed

Makefile

@@ -26,16 +26,11 @@ else
 endif
 
 ifneq ($(module),)
-    ifneq ($(findstring .drv,$(module)),)
-        MODULE_PEFILE := $(module)
-        MODULE_SOFILE := $(subst .drv,.so,$(module))
-    else ifneq ($(findstring .sys,$(module)),)
-        MODULE_PEFILE := $(module)
-        MODULE_SOFILE := $(subst .sys,.so,$(module))
-    else
-        MODULE_PEFILE := $(module).dll
-        MODULE_SOFILE := $(module).so
-    endif
+    ifneq ($(findstring .,$(module)),)
+		MODULE_SFX :=
+	else
+		MODULE_SFX := .dll
+	endif
 endif
 
 ifneq ($(unstripped),)
@@ -57,12 +52,9 @@ ifneq ($(enable_ccache),0)
     CONFIGURE_CMD += --enable-ccache
 endif
 
-TOPLEVELGOALS := all any clean configure deploy downloads help install module proton protonsdk redist
-CONTAINERGOALS := $(filter-out $(TOPLEVELGOALS),$(MAKECMDGOALS))
-CONTAINERGOALS := $(filter-out $(BUILD_ROOT)/%,$(CONTAINERGOALS))
-
 all: help
-.PHONY: $(TOPLEVELGOALS)
+
+.PHONY: help clean configure proton install deploy module protonsdk
 
 help:
 	@echo "Proton Makefile instructions"
@@ -113,7 +105,7 @@ clean:
 	rm -rf $(BUILD_DIR)
 
 protonsdk:
-	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C docker $(UNSTRIPPED) PROTONSDK_VERSION=$(protonsdk_version) proton
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C proton/docker $(UNSTRIPPED) PROTONSDK_VERSION=$(protonsdk_version) proton
 
 configure: | $(BUILD_DIR)
 	if [ ! -e $(BUILD_DIR)/Makefile ]; then \
@@ -124,23 +116,31 @@ ifeq ($(protonsdk_version),local)
 configure: protonsdk
 endif
 
-proton: configure
-	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) dist && \
-	echo "Proton built locally. Use 'install', 'deploy' or 'redist' targets."
+downloads: configure
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR) downloads
 
-install: configure
+proton: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) dist && \
+	echo "Proton built in VM. Use 'install' or 'deploy' targets to retrieve the build."
+
+install-internal: | $(BUILD_ROOT)/compatibilitytools.d/$(_build_name)
+install-internal: downloads
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) install
+
+install: install-internal
+	mkdir -p $(STEAM_DIR)/compatibilitytools.d/
+	cp -Rf --no-dereference --preserve=mode,links $(BUILD_ROOT)/compatibilitytools.d/$(_build_name) $(STEAM_DIR)/compatibilitytools.d/
 	echo "Proton installed to your local Steam installation"
 
 redist: | $(BUILD_ROOT)/$(DEPLOY_DIR)
-redist: configure
+redist: downloads
 	rm -rf $(BUILD_ROOT)/$(DEPLOY_DIR)/* && \
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) redist && \
 	cp -Rf $(BUILD_DIR)/redist/* $(BUILD_ROOT)/$(DEPLOY_DIR) && \
 	echo "Proton build available at $(BUILD_ROOT)/$(DEPLOY_DIR)"
 
 deploy: | $(BUILD_ROOT)/$(DEPLOY_DIR)-deploy
-deploy: configure
+deploy: downloads
 	rm -rf $(BUILD_ROOT)/$(DEPLOY_DIR)-deploy/* && \
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) deploy && \
 	cp -Rf $(BUILD_DIR)/deploy/* $(BUILD_ROOT)/$(DEPLOY_DIR)-deploy && \
@@ -150,37 +150,33 @@ module: | $(BUILD_ROOT)/$(module)/lib/wine/i386-windows
 module: | $(BUILD_ROOT)/$(module)/lib/wine/i386-unix
 module: | $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-windows
 module: | $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-unix
-module: configure
+module: downloads
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) module=$(module) module && \
-	cp -f $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(MODULE_PEFILE) $(BUILD_ROOT)/$(module)/lib/wine/i386-windows/ && \
-	cp -f $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(MODULE_PEFILE) $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-windows/ && \
-	if [ -e $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(MODULE_PEFILE).so ]; then \
-		cp -f $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(MODULE_PEFILE).so $(BUILD_ROOT)/$(module)/lib/wine/i386-unix/ && \
-		cp -f $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(MODULE_PEFILE).so $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-unix/; \
+	cp -f $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(module)$(MODULE_SFX)* $(BUILD_ROOT)/$(module)/lib/wine/i386-windows/ && \
+	cp -f $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(module)$(MODULE_SFX)* $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-windows/ && \
+	if [ -e $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(module).so ]; then \
+		cp -f $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(module).so $(BUILD_ROOT)/$(module)/lib/wine/i386-unix/ && \
+		cp -f $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(module).so $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-unix/; \
 	fi
-	if [ -e $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(MODULE_SOFILE) ]; then \
-		cp -f $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(MODULE_SOFILE) $(BUILD_ROOT)/$(module)/lib/wine/i386-unix/ && \
-		cp -f $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(MODULE_SOFILE) $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-unix/; \
-	fi
-
-any $(CONTAINERGOALS): configure
-	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) $(CONTAINERGOALS)
 
 dxvk: | $(BUILD_ROOT)/dxvk/lib/wine/dxvk
 dxvk: | $(BUILD_ROOT)/dxvk/lib64/wine/dxvk
-dxvk: any
+dxvk: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) dxvk && \
 	cp -f $(BUILD_DIR)/dist/dist/lib/wine/dxvk/*.dll $(BUILD_ROOT)/dxvk/lib/wine/dxvk/ && \
 	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/dxvk/*.dll $(BUILD_ROOT)/dxvk/lib64/wine/dxvk/
 
 dxvk-nvapi: | $(BUILD_ROOT)/dxvk-nvapi/lib/wine/nvapi
 dxvk-nvapi: | $(BUILD_ROOT)/dxvk-nvapi/lib64/wine/nvapi
-dxvk-nvapi: any
+dxvk-nvapi: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) dxvk-nvapi && \
 	cp -f $(BUILD_DIR)/dist/files/lib/wine/nvapi/*.dll $(BUILD_ROOT)/dxvk-nvapi/lib/wine/nvapi/ && \
 	cp -f $(BUILD_DIR)/dist/files/lib64/wine/nvapi/*.dll $(BUILD_ROOT)/dxvk-nvapi/lib64/wine/nvapi/
 
 vkd3d-proton: | $(BUILD_ROOT)/vkd3d-proton/lib/wine/vkd3d-proton
 vkd3d-proton: | $(BUILD_ROOT)/vkd3d-proton/lib64/wine/vkd3d-proton
-vkd3d-proton: any
+vkd3d-proton: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) vkd3d-proton && \
 	cp -f $(BUILD_DIR)/dist/dist/lib/wine/vkd3d-proton/*.dll $(BUILD_ROOT)/vkd3d-proton/lib/wine/vkd3d-proton/ && \
 	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/vkd3d-proton/*.dll $(BUILD_ROOT)/vkd3d-proton/lib64/wine/vkd3d-proton/
 
@@ -188,7 +184,8 @@ lsteamclient: | $(BUILD_ROOT)/lsteamclient/lib/wine/i386-windows
 lsteamclient: | $(BUILD_ROOT)/lsteamclient/lib/wine/i386-unix
 lsteamclient: | $(BUILD_ROOT)/lsteamclient/lib64/wine/x86_64-windows
 lsteamclient: | $(BUILD_ROOT)/lsteamclient/lib64/wine/x86_64-unix
-lsteamclient: any
+lsteamclient: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) lsteamclient && \
 	cp -f $(BUILD_DIR)/dist/dist/lib/wine/i386-windows/lsteamclient.dll $(BUILD_ROOT)/lsteamclient/lib/wine/i386-windows/ && \
 	cp -f $(BUILD_DIR)/dist/dist/lib/wine/i386-unix/lsteamclient.dll.so $(BUILD_ROOT)/lsteamclient/lib/wine/i386-unix/ && \
 	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/x86_64-windows/lsteamclient.dll $(BUILD_ROOT)/lsteamclient/lib64/wine/x86_64-windows/ && \
@@ -198,7 +195,8 @@ vrclient: | $(BUILD_ROOT)/vrclient/lib/wine/i386-windows
 vrclient: | $(BUILD_ROOT)/vrclient/lib/wine/i386-unix
 vrclient: | $(BUILD_ROOT)/vrclient/lib64/wine/x86_64-windows
 vrclient: | $(BUILD_ROOT)/vrclient/lib64/wine/x86_64-unix
-vrclient: any
+vrclient: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) vrclient && \
 	cp -f $(BUILD_DIR)/dist/dist/lib/wine/i386-windows/vrclient.dll $(BUILD_ROOT)/vrclient/lib/wine/i386-windows/ && \
 	cp -f $(BUILD_DIR)/dist/dist/lib/wine/i386-unix/vrclient.dll.so $(BUILD_ROOT)/vrclient/lib/wine/i386-unix/ && \
 	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/x86_64-windows/vrclient_x64.dll $(BUILD_ROOT)/vrclient/lib64/wine/x86_64-windows/ && \
@@ -206,7 +204,8 @@ vrclient: any
 
 wineopenxr: | $(BUILD_ROOT)/wineopenxr/lib64/wine/x86_64-windows
 wineopenxr: | $(BUILD_ROOT)/wineopenxr/lib64/wine/x86_64-unix
-wineopenxr: any
+wineopenxr: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) wineopenxr && \
 	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/x86_64-windows/wineopenxr.dll $(BUILD_ROOT)/wineopenxr/lib64/wine/x86_64-windows/ && \
 	cp -f $(BUILD_DIR)/dist/dist/lib64/wine/x86_64-unix/wineopenxr.dll.so $(BUILD_ROOT)/wineopenxr/lib64/wine/x86_64-unix/
 
@@ -214,7 +213,8 @@ battleye: | $(BUILD_ROOT)/battleye/v1/lib/wine/i386-windows
 battleye: | $(BUILD_ROOT)/battleye/v1/lib/wine/i386-unix
 battleye: | $(BUILD_ROOT)/battleye/v1/lib64/wine/x86_64-windows
 battleye: | $(BUILD_ROOT)/battleye/v1/lib64/wine/x86_64-unix
-battleye: any
+battleye: downloads
+	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) battleye && \
 	cp -f $(BUILD_DIR)/dist-battleye/v1/lib/wine/i386-windows/beclient.dll $(BUILD_ROOT)/battleye/v1/lib/wine/i386-windows/ && \
 	cp -f $(BUILD_DIR)/dist-battleye/v1/lib/wine/i386-unix/beclient.dll.so $(BUILD_ROOT)/battleye/v1/lib/wine/i386-unix/ && \
 	cp -f $(BUILD_DIR)/dist-battleye/v1/lib64/wine/x86_64-windows/beclient_x64.dll $(BUILD_ROOT)/battleye/v1/lib64/wine/x86_64-windows/ && \

OpenXR-SDK

@@ -1 +1 @@
-Subproject commit 58a00cf85c39ad5ec4dc43a769624e420c06179a
+Subproject commit 960c4a6aa8cc9f47e357c696b5377d817550bf88

README.md

@@ -150,20 +150,6 @@ is only useful after building Proton.
 `make dxvk` / `make vkd3d-proton` - rebuild DXVK / vkd3d-proton.
 
 
-### Debug Builds
-
-To prevent symbol stripping add `UNSTRIPPED_BUILD=1` to the `make`
-invocation. This should be used only with a clean build directory.
-
-E.g.:
-
-```
-mkdir ../debug-proton-build && cd ../debug-proton-build
-../proton/configure.sh --enable-ccache --build-name=debug_build
-make UNSTRIPPED_BUILD=1 install
-```
-
-
 Install Proton locally
 ----------------------
 
@@ -205,56 +191,6 @@ version of Proton to other users, you must adhere to the terms of these
 licenses.
 
 
-Debugging
----------
-
-Proton builds have their symbols stripped by default. You can switch to
-"debug" beta branch in Steam (search for Proton in your library,
-Properties... -> BETAS -> select "debug") or build without stripping (see
-[Debug Builds section](#debug-builds)).
-
-The symbols are provided through the accompanying `.debug` files which may
-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.
-
-
-`compile_commands.json`
------------------------
-
-For use with [clangd](https://clangd.llvm.org/) LSP server and similar tooling.
-
-Projects built using cmake or meson (e.g. vkd3d-proton) automatically come with
-`compile_commands.json`. For autotools (e.g. wine) you have to [configure the
-build](#configuring-the-build) with `--enable-bear` that uses
-[bear](https://github.com/rizsotto/Bear) to create the compilation database.
-It's not on by default as it make the build slightly slower.
-
-The build system collects all the created compile_commands.json files in a
-build subdirectory named `compile_commands/`.
-
-The paths are translated to point to the real source (i.e. not the rsynced
-copy). It still may depend on build directory for things like auto-generated
-`config.h` though and for wine it may be beneficial to run `tools/make_requests`
-in you source directories as those changes are not committed.
-
-You can then configure your editor to use that file for clangd in a few ways:
-
-1) directly - some editors/plugins allow you to specify the path to `compile_commands.json`
-2) via `.clangd` file, e.g.
-```bash
-cd src/proton/wine/
-cat > .clangd <<EOF
-CompileFlags:
-  CompilationDatabase: ../build/current-dev/compile_commands/wine64/
-EOF
-```
-3) by symlinking:
-```bash
-ln -s ../build/current-dev/compile_commands/wine64/compile_commands.json .
-```
-
-
 Runtime Config Options
 ----------------------
 
@@ -282,7 +218,7 @@ the Wine prefix. Removing the option will revert to the previous behavior.
 
 | Compat config string  | Environment Variable               | Description  |
 | :-------------------- | :--------------------------------- | :----------- |
-|                       | `PROTON_LOG`                       | Convenience method for dumping a useful debug log to `$PROTON_LOG_DIR/steam-$APPID.log`. Set to `1` to enable default logging, or set to a string to be appended to the default `WINEDEBUG` channels. |
+|                       | `PROTON_LOG`                       | Convenience method for dumping a useful debug log to `$PROTON_LOG_DIR/steam-$APPID.log` For more thorough logging, use `user_settings.py`. |
 |                       | `PROTON_LOG_DIR`                   | Output log files into the directory specified. Defaults to your home directory. |
 |                       | `PROTON_DUMP_DEBUG_COMMANDS`       | When running a game, Proton will write some useful debug scripts for that game into `$PROTON_DEBUG_DIR/proton_$USER/`. |
 |                       | `PROTON_DEBUG_DIR`                 | Root directory for the Proton debug scripts, `/tmp` by default. |
@@ -303,13 +239,10 @@ the Wine prefix. Removing the option will revert to the previous behavior.
 | `oldglstr`            | `PROTON_OLD_GL_STRING`             | Set some driver overrides to limit the length of the GL extension string, for old games that crash on very long extension strings. |
 | `vkd3dfl12`           |                                    | Force the Direct3D 12 feature level to 12, regardless of driver support. |
 | `vkd3dbindlesstb`     |                                    | Put `force_bindless_texel_buffer` into `VKD3D_CONFIG`. |
-| `nomfdxgiman`         | `WINE_DO_NOT_CREATE_DXGI_DEVICE_MANAGER` | Enable hack to work around video issues in some games due to incomplete IMFDXGIDeviceManager support. |
-| `noopwr`              | `WINE_DISABLE_VULKAN_OPWR`               | Enable hack to disable Vulkan other process window rendering which sometimes causes issues on Wayland due to blit being one frame behind. |
 | `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. |
 | `nowritewatch`        | `PROTON_NO_WRITE_WATCH`            | Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). |
-| `nosteamffmpeg`       | `PROTON_NO_STEAM_FFMPEG`           | Ignore ffmpeg that ships with Steam. Some videos may not play. |
 | `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. |
 

aom

@@ -0,0 +1 @@
+Subproject commit 287164de79516c25c8c84fd544f67752c170082a

configure.sh

@@ -19,9 +19,9 @@ if [[ $(tput colors 2>/dev/null || echo 0) -gt 0 ]]; then
   COLOR_CLEAR=$'\e[0m'
 fi
 
-sh_quote() {
+sh_quote() { 
         local quoted
-        quoted="$(printf '%q ' "$@")"; [[ $# -eq 0 ]] || echo "${quoted:0:-1}";
+        quoted="$(printf '%q ' "$@")"; [[ $# -eq 0 ]] || echo "${quoted:0:-1}"; 
 }
 err()      { echo >&2 "${COLOR_ERR}!!${COLOR_CLEAR} $*"; }
 stat()     { echo >&2 "${COLOR_STAT}::${COLOR_CLEAR} $*"; }
@@ -46,18 +46,30 @@ dependency_command() {
     fi
 }
 
+dependency_afdko() {
+    if command -v makeotf &> /dev/null; then
+        AFDKO_VERB=
+    elif command -v afdko &> /dev/null; then
+        AFDKO_VERB=afdko
+    else
+        err "Couldn't find 'afdko'. Install it and make sure that 'makeotf' is in your PATH or 'afdko makeotf' works."
+        err "Some distributions don't package afdko correctly, you may need to 'pip install afdko'."
+        MISSING_DEPENDENCIES=1
+    fi
+}
+
 CONTAINER_MOUNT_OPTS=""
 
 check_container_engine() {
     stat "Trying $1."
-    if ! cmd $1 run --rm $2; then
+    if ! cmd $1 run --rm $arg_protonsdk_image; then
         info "$1 is unable to run the container."
         return 1
     fi
 
     touch permission_check
     local inner_uid="$($1 run -v "$(pwd):/test$CONTAINER_MOUNT_OPTS" \
-                                            --rm $2 \
+                                            --rm $arg_protonsdk_image \
                                             stat --format "%u" /test/permission_check 2>&1)"
     rm permission_check
 
@@ -94,21 +106,11 @@ function escape_for_make() {
 }
 
 function configure() {
-  local steamrt_image="$arg_protonsdk_image"
+  local steamrt_image="$1"
+  local steamrt_name="$2"
   local srcdir
   srcdir="$(dirname "$0")"
 
-  if [[ "$srcdir" = "." ]]; then
-    err "Cannot do a top level in-tree build."
-    die "Create a subdirectory in build/ or outside of the tree and run configure.sh from there."
-  fi
-
-  # nothing specified, getting the default value from the Makefile to test the
-  # container engine
-  if [[ -z $steamrt_image ]]; then
-    steamrt_image="$(sed -n 's/STEAMRT_IMAGE ?= //p' $SRCDIR/Makefile.in)"
-  fi
-
   # Build name
   local build_name="$arg_build_name"
   if [[ -n $build_name ]]; then
@@ -118,7 +120,18 @@ function configure() {
     info "No build name specified, using default: $build_name"
   fi
 
+  dependency_command fontforge
+  dependency_command find "findutils"
   dependency_command make "GNU Make"
+  dependency_command rsync
+  dependency_command wget
+  dependency_command xz
+  dependency_command patch
+  dependency_command autoconf
+  dependency_command git
+  dependency_command python3
+
+  dependency_afdko
 
   if [ "$MISSING_DEPENDENCIES" -ne 0 ]; then
       die "Missing dependencies, cannot continue."
@@ -129,12 +142,12 @@ function configure() {
   fi
 
   if [[ -n "$arg_container_engine" ]]; then
-    check_container_engine "$arg_container_engine" "$steamrt_image" || die "Specified container engine \"$arg_container_engine\" doesn't work"
+    check_container_engine "$arg_container_engine" || die "Specified container engine \"$arg_container_engine\" doesn't work"
   else
     stat "Trying to find usable container engine."
-    if check_container_engine docker "$steamrt_image"; then
+    if check_container_engine docker; then
       arg_container_engine="docker"
-    elif check_container_engine podman "$steamrt_image"; then
+    elif check_container_engine podman; then
       arg_container_engine="podman"
     else
         die "${arg_container_engine:-Container engine discovery} has failed. Please fix your setup."
@@ -154,10 +167,9 @@ function configure() {
     echo "SRCDIR     := $(escape_for_make "$srcdir")"
     echo "BUILD_NAME := $(escape_for_make "$build_name")"
 
-    # SteamRT was specified, baking it into the Makefile
-    if [[ -n $arg_protonsdk_image ]]; then
-      echo "STEAMRT_IMAGE := $(escape_for_make "$arg_protonsdk_image")"
-    fi
+    # SteamRT
+    echo "STEAMRT_NAME  := $(escape_for_make "$steamrt_name")"
+    echo "STEAMRT_IMAGE := $(escape_for_make "$steamrt_image")"
 
     echo "ROOTLESS_CONTAINER := $ROOTLESS_CONTAINER"
     echo "CONTAINER_ENGINE := $arg_container_engine"
@@ -170,9 +182,8 @@ function configure() {
     if [[ -n "$arg_enable_ccache" ]]; then
       echo "ENABLE_CCACHE := 1"
     fi
-    if [[ -n "$arg_enable_bear" ]]; then
-      echo "ENABLE_BEAR := 1"
-    fi
+
+    echo "AFDKO_VERB := $AFDKO_VERB"
 
     # Include base
     echo ""
@@ -187,13 +198,14 @@ function configure() {
 # Parse arguments
 #
 
-arg_protonsdk_image=""
+arg_steamrt="soldier"
+arg_protonsdk_image="registry.gitlab.steamos.cloud/proton/soldier/sdk:0.20211207.0-0"
+arg_no_protonsdk=""
 arg_build_name=""
 arg_container_engine=""
 arg_docker_opts=""
 arg_relabel_volumes=""
 arg_enable_ccache=""
-arg_enable_bear=""
 arg_help=""
 invalid_args=""
 function parse_args() {
@@ -240,11 +252,14 @@ function parse_args() {
       arg_relabel_volumes="1"
     elif [[ $arg = --enable-ccache ]]; then
       arg_enable_ccache="1"
-    elif [[ $arg = --enable-bear ]]; then
-      arg_enable_bear="1"
     elif [[ $arg = --proton-sdk-image ]]; then
       val_used=1
       arg_protonsdk_image="$val"
+    elif [[ $arg = --steam-runtime ]]; then
+      val_used=1
+      arg_steamrt="$val"
+    elif [[ $arg = --no-proton-sdk ]]; then
+      arg_no_protonsdk=1
     else
       err "Unrecognized option $arg"
       return 1
@@ -279,7 +294,7 @@ function parse_args() {
 }
 
 usage() {
-  "$1" "Usage: $0 { --proton-sdk-image=<image> }"
+  "$1" "Usage: $0 { --no-proton-sdk | --proton-sdk-image=<image> --steam-runtime=<name> }"
   "$1" "  Generate a Makefile for building Proton.  May be run from another directory to create"
   "$1" "  out-of-tree build directories (e.g. mkdir mybuild && cd mybuild && ../configure.sh)"
   "$1" ""
@@ -297,8 +312,6 @@ usage() {
   "$1" ""
   "$1" "    --enable-ccache Mount \$CCACHE_DIR or \$HOME/.ccache inside of the container and use ccache for the build."
   "$1" ""
-  "$1" "    --enable-bear Invokes make via bear creating compile_commands.json."
-  "$1" ""
   "$1" "  Steam Runtime"
   "$1" "    Proton builds that are to be installed & run under the steam client must be built with"
   "$1" "    the Steam Runtime SDK to ensure compatibility.  See README.md for more information."
@@ -307,10 +320,21 @@ usage() {
   "$1" "                                for build steps that must be run in an SDK"
   "$1" "                                environment.  See README.md for instructions to"
   "$1" "                                create this image."
+  "$1" "    --steam-runtime=soldier  Name of the steam runtime release to build for (soldier, scout)."
+  "$1" ""
+  "$1" "    --no-proton-sdk  Do not automatically invoke any runtime SDK as part of the build."
+  "$1" "                     Build steps may still be manually run in a runtime environment."
   exit 1;
 }
 
 parse_args "$@" || usage err
 [[ -z $arg_help ]] || usage info
 
-configure
+# Sanity check arguments
+if [[ -n $arg_no_protonsdk && -n $arg_protonsdk_image ]]; then
+    die "Cannot specify --proton-sdk-image as well as --no-proton-sdk"
+elif [[ -z $arg_no_protonsdk && -z $arg_protonsdk_image ]]; then
+    die "Must specify either --no-proton-sdk or --proton-sdk-image"
+fi
+
+configure "$arg_protonsdk_image" "$arg_steamrt"

dav1d

@@ -1 +0,0 @@
-Subproject commit 8a6f054ef1e0f7886bc6e53e6be97c427154fe85

default_pfx.py

@@ -6,7 +6,6 @@
 
 import os
 import subprocess
-import re
 
 def file_is_wine_builtin_dll(path):
     if not os.path.exists(path):
@@ -72,60 +71,22 @@ def setup_dll_symlinks(default_pfx_dir, dist_dir):
                 os.unlink(filename)
                 make_relative_symlink(target, filename)
 
-KEY_RE = re.compile(r'\[(.+)\] ([0-9]+)')
-VALUE_RE = re.compile(r'"(.*)"="(.+)"')
-
-def filter_registry(filename):
-    """Remove registry values that contain a fully qualified path
-    inside some well-known registry keys. These paths are devised on
-    the build machine and it makes no sense to distribute them. Plus,
-    they are known to cause bugs."""
-
-    FILTER_KEYS = [
-        r'Software\\Microsoft\\Windows\\CurrentVersion\\Fonts',
-        r'Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts',
-        r'Software\\Wine\\Fonts\\External Fonts',
-    ]
-
-    filtering = False
-    with open(filename) as fin:
-        with open(filename + '.tmp', 'w') as fout:
-            for line in fin:
-                line = line.strip()
-
-                match = KEY_RE.match(line)
-                if match is not None:
-                    fout.write(line + '\n')
-                    filtering = match.group(1) in FILTER_KEYS
-                    continue
-
-                match = VALUE_RE.match(line)
-                if match is not None:
-                    if not filtering or match.group(2)[1:2] != ':':
-                        fout.write(line + '\n')
-                    continue
-
-                fout.write(line + '\n')
-
-    os.rename(filename + '.tmp', filename)
-
-#steampipe can't handle filenames with colons, so we remove them here
-#and restore them in the proton script
-def fixup_drive_links(default_pfx_dir):
-    for walk_dir, dirs, files in os.walk(os.path.join(default_pfx_dir, "dosdevices")):
-        for dir_ in dirs:
-            if ":" in dir_:
-                os.remove(os.path.join(walk_dir, dir_))
-
-def make_default_pfx(default_pfx_dir, dist_dir):
+def make_default_pfx(default_pfx_dir, dist_dir, runtime):
     local_env = dict(os.environ)
 
     ld_path = dist_dir + "/lib64:" + dist_dir + "/lib"
 
-    local_env["LD_LIBRARY_PATH"] = ld_path
-    local_env["WINEPREFIX"] = default_pfx_dir
-    local_env["WINEDEBUG"] = "-all"
-    runtime_args = []
+    if runtime is None:
+        local_env["LD_LIBRARY_PATH"] = ld_path
+        local_env["WINEPREFIX"] = default_pfx_dir
+        local_env["WINEDEBUG"] = "-all"
+        runtime_args = []
+    else:
+        #the runtime clears the environment, so we pass it in on the CL via env
+        runtime_args = runtime + ["env",
+                "LD_LIBRARY_PATH=" + ld_path,
+                "WINEPREFIX=" + default_pfx_dir,
+                "WINEDEBUG=-all"]
 
     subprocess.run(runtime_args + ["/bin/bash", "-c",
         os.path.join(dist_dir, 'bin', 'wine') + " wineboot && " +
@@ -133,11 +94,10 @@ def make_default_pfx(default_pfx_dir, dist_dir):
 
         env=local_env, check=True)
     setup_dll_symlinks(default_pfx_dir, dist_dir)
-    fixup_drive_links(default_pfx_dir)
-
-    filter_registry(os.path.join(default_pfx_dir, 'user.reg'))
-    filter_registry(os.path.join(default_pfx_dir, 'system.reg'))
 
 if __name__ == '__main__':
     import sys
-    make_default_pfx(sys.argv[1], sys.argv[2])
+    if len(sys.argv) > 3:
+        make_default_pfx(sys.argv[1], sys.argv[2], sys.argv[3:])
+    else:
+        make_default_pfx(sys.argv[1], sys.argv[2], None)

dist.LICENSE

@@ -81,7 +81,7 @@ Visit FAudio at
 
 ---- ---- ---- ----
 
-This software contains gstreamer, gst-plugins-base, and gst-plugins-good licensed under the LGPL 2.
+This software contains gstreamer, gst-plugins-base, gst-plugins-good, and gst-plugins-bad licensed under the LGPL 2.
 
 Visit gstreamer at
 
@@ -110,19 +110,6 @@ Visit Source Han Sans at
 
 ---- ---- ---- ----
 
-This software contains Ume fonts distributed under the following license:
-
-    These fonts are free software.  Unlimited permission is granted to
-    use, copy, and distribute it, with or without modification, either
-    commercially and noncommercially.  THESE FONTS ARE PROVIDED "AS
-    IS" WITHOUT WARRANTY.
-
-Visit Ume fonts home page at
-
-    https://osdn.net/projects/ume-font/
-
----- ---- ---- ----
-
 This software contains some fonts from the Google Noto collection, licensed under the SIL Open Font License, available at LICENSE.OFL. They are
 
     Copyright 2015 Google Inc.
@@ -257,7 +244,6 @@ Visit orc at
 This software contains the following Rust libraries under the MIT license:
 
     gstreamer-rs <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs>
-    gst-plugins-rs <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs>
 
     array-init <https://github.com/Manishearth/array-init/>
     Copyright (c) 2017-2020 The array-init developers
@@ -276,9 +262,6 @@ This software contains the following Rust libraries under the MIT license:
     crc32fast <https://github.com/srijs/rust-crc32fast>
     Copyright (c) 2018 Sam Rijs, Alex Crichton and contributors
 
-    dav1d-rs <https://github.com/rust-av/dav1d-rs>
-    Copyright (c) 2018 Luca Barbato
-
     futures-channel <https://github.com/rust-lang/futures-rs>
     futures-core <https://github.com/rust-lang/futures-rs>
     futures-executor <https://github.com/rust-lang/futures-rs>
@@ -438,30 +421,33 @@ This software contains the jxrlib library, which is
 
 ---- ---- ---- ----
 
-This software contains the dav1d library, which is
+This software contains libaom, which is
 
-    Copyright © 2018-2019, VideoLAN and dav1d authors
-    All rights reserved.
+    Copyright (c) 2016, Alliance for Open Media. All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+    modification, are permitted provided that the following conditions
+    are met:
 
-    1. Redistributions of source code must retain the above copyright notice, this
-       list of conditions and the following disclaimer.
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
 
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+       the documentation and/or other materials provided with the
+       distribution.
 
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+    FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
 
-Distribution of dav1d is also covered by the Alliance for Open Media Patent License 1.0, available at PATENTS.AV1.
+Distribution of libaom is also covered by the Alliance for Open Media Patent License 1.0, available at PATENTS.AOM.

docker/Makefile

@@ -1,44 +1,41 @@
-STEAMRT_VERSION = 0.20230905.59202
+STEAMRT_VERSION = 0.20211207.0
 STEAMRT_URLBASE = registry.gitlab.steamos.cloud
 
-PROTONSDK_URLBASE = $(STEAMRT_URLBASE)/proton/sniper/sdk
+PROTONSDK_URLBASE = $(STEAMRT_URLBASE)/proton/soldier/sdk
 PROTONSDK_VERSION = $(STEAMRT_VERSION)-0-dev
 
 # this is just for building toolchain, as we do static builds it should
 # not have any impact on the end result, but changing it will invalidate
 # docker caches, so we need something that don't change much
-BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/sniper/sdk:0.20221017.1
+BASE_IMAGE_i686 = i386/ubuntu:18.04
+BASE_IMAGE_x86_64 = ubuntu:18.04
 
-BINUTILS_VERSION = 2.40
+BINUTILS_VERSION = 2.37
 GCC_VERSION = 10.3.0
 MINGW_VERSION = 9.0.0
-RUST_VERSION = 1.68.0
-NINJA_VERSION = 1.11.1
+RUST_VERSION = 1.57.0
 
 SOURCES_URLBASE = https://repo.steampowered.com/proton-sdk
 BINUTILS_URLBASE = $(SOURCES_URLBASE)
 GCC_URLBASE = $(SOURCES_URLBASE)
 MINGW_URLBASE = $(SOURCES_URLBASE)
 RUST_URLBASE = $(SOURCES_URLBASE)
-NINJA_URLBASE = $(SOURCES_URLBASE)
 
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.xz
 GCC_SOURCE = gcc-$(GCC_VERSION).tar.xz
 MINGW_SOURCE = mingw-w64-v$(MINGW_VERSION).tar.bz2
 RUST_SOURCE_x86_64 = rust-$(RUST_VERSION)-x86_64-unknown-linux-gnu.tar.gz
 RUST_SOURCE_i686 = rust-$(RUST_VERSION)-i686-unknown-linux-gnu.tar.gz
-NINJA_SOURCE = ninja-build_$(NINJA_VERSION).orig.tar.gz
 
-BINUTILS_SHA256 = 0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1
+BINUTILS_SHA256 = 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c
 GCC_SHA256 = 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
 MINGW_SHA256 = 1929b94b402f5ff4d7d37a9fe88daa9cc55515a6134805c104d1794ae22a4181
-RUST_SHA256_x86_64 = 7be1acdac656d0b0b7e909e5c0d4ddf61c755c203ec26ebafbd306322335b361
-RUST_SHA256_i686 = dc931adeb2943dcadfbd29546481f0296fcb97a511421053ecae6586a85869b1
-NINJA_SHA256 = 31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea
+RUST_SHA256_x86_64 = ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda
+RUST_SHA256_i686 = 7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa
 
 DOCKER = docker
 
-%.Dockerfile: %.Dockerfile.in Makefile
+%.Dockerfile: %.Dockerfile.in
 	sed -re 's!@PROTONSDK_URLBASE@!$(PROTONSDK_URLBASE)!g' \
 	    -re 's!@BASE_IMAGE@!$(BASE_IMAGE)!g' \
 	    -re 's!@BINUTILS_VERSION@!$(BINUTILS_VERSION)!g' \
@@ -59,43 +56,37 @@ DOCKER = docker
 	    -re 's!@RUST_SOURCE_i686@!$(RUST_SOURCE_i686)!g' \
 	    -re 's!@RUST_SHA256_x86_64@!$(RUST_SHA256_x86_64)!g' \
 	    -re 's!@RUST_SHA256_i686@!$(RUST_SHA256_i686)!g' \
-	    -re 's!@NINJA_VERSION@!$(NINJA_VERSION)!g' \
-	    -re 's!@NINJA_URLBASE@!$(NINJA_URLBASE)!g' \
-	    -re 's!@NINJA_SOURCE@!$(NINJA_SOURCE)!g' \
-	    -re 's!@NINJA_SHA256@!$(NINJA_SHA256)!g' \
 	    -re 's!@J@!$(shell nproc)!g' \
 	    $< >$@
 
 %-i686.Dockerfile.in: %.Dockerfile.in
 	sed -re 's!@ARCH@!i686!g' \
-	    -re 's!@ARCH_FLAGS@!$(ARCH_FLAGS)!g' \
 	    $< >$@
 
 %-x86_64.Dockerfile.in: %.Dockerfile.in
 	sed -re 's!@ARCH@!x86_64!g' \
-	    -re 's!@ARCH_FLAGS@!$(ARCH_FLAGS)!g' \
 	    $< >$@
 
 %-linux-gnu.Dockerfile.in: %.Dockerfile.in
 	sed -re 's!@TARGET@!linux-gnu!g' \
-	    -re 's!@ARCH_FLAGS@!$(ARCH_FLAGS)!g' \
 	    -re 's!@TARGET_FLAGS@!$(TARGET_FLAGS)!g' \
 	    $< >$@
 
 %-w64-mingw32.Dockerfile.in: %.Dockerfile.in
 	sed -re 's!@TARGET@!w64-mingw32!g' \
-	    -re 's!@ARCH_FLAGS@!$(ARCH_FLAGS)!g' \
 	    -re 's!@TARGET_FLAGS@!$(TARGET_FLAGS)!g' \
 	    $< >$@
 
 define create-build-base-rules
 .PHONY: build-base-$(1)
 all build-base: build-base-$(1)
+build-base-$(1): BASE_IMAGE = $(BASE_IMAGE_$(1))
 build-base-$(1): build-base-$(1).Dockerfile
+	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
-	  --cache-from=$(PROTONSDK_URLBASE)/build-base-$(1) \
+	  --cache-from=$(PROTONSDK_URLBASE)/build-base-$(1):latest \
 	  -t $(PROTONSDK_URLBASE)/build-base-$(1):latest \
-	  context
+	  build
 pull::
 	-$(DOCKER) pull $(PROTONSDK_URLBASE)/build-base-$(1):latest
 push::
@@ -109,11 +100,12 @@ define create-binutils-rules
 .PHONY: binutils-$(1)-$(2)
 all binutils: binutils-$(1)-$(2)
 binutils-$(1)-$(2): binutils-$(1)-$(2).Dockerfile | build-base
+	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
-	  --cache-from=$(PROTONSDK_URLBASE)/binutils-$(1)-$(2) \
+	  --cache-from=$(PROTONSDK_URLBASE)/binutils-$(1)-$(2):$(BINUTILS_VERSION) \
 	  -t $(PROTONSDK_URLBASE)/binutils-$(1)-$(2):$(BINUTILS_VERSION) \
 	  -t $(PROTONSDK_URLBASE)/binutils-$(1)-$(2):latest \
-	  context
+	  build
 pull::
 	-$(DOCKER) pull $(PROTONSDK_URLBASE)/binutils-$(1)-$(2):$(BINUTILS_VERSION)
 push::
@@ -126,21 +118,16 @@ $(eval $(call create-binutils-rules,i686,linux-gnu))
 $(eval $(call create-binutils-rules,x86_64,w64-mingw32))
 $(eval $(call create-binutils-rules,x86_64,linux-gnu))
 
-MINGW_ARCH_FLAGS_crt-x86_64 = --disable-lib32 CFLAGS="-mcmodel=small"
-MINGW_ARCH_FLAGS_crt-i686 = --disable-lib64
-MINGW_ARCH_FLAGS_pthread-x86_64 = CFLAGS="-mcmodel=small"
-MINGW_ARCH_FLAGS_pthread-i686 =
-
 define create-mingw-rules
 .PHONY: mingw-$(2)-$(1)
 all mingw: mingw-$(2)-$(1)
-mingw-$(2)-$(1): ARCH_FLAGS = $(MINGW_ARCH_FLAGS_$(2)-$(1))
 mingw-$(2)-$(1): mingw-$(2)-$(1).Dockerfile | binutils
+	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
-	  --cache-from=$(PROTONSDK_URLBASE)/mingw-$(2)-$(1) \
+	  --cache-from=$(PROTONSDK_URLBASE)/mingw-$(2)-$(1):$(MINGW_VERSION) \
 	  -t $(PROTONSDK_URLBASE)/mingw-$(2)-$(1):$(MINGW_VERSION) \
 	  -t $(PROTONSDK_URLBASE)/mingw-$(2)-$(1):latest \
-	  context
+	  build
 pull::
 	-$(DOCKER) pull $(PROTONSDK_URLBASE)/mingw-$(2)-$(1):$(MINGW_VERSION)
 push::
@@ -159,23 +146,20 @@ $(eval $(call create-mingw-rules,x86_64,crt))
 $(eval $(call create-mingw-rules,x86_64,pthreads))
 $(eval $(call create-mingw-rules,x86_64,widl))
 
-GCC_ARCH_FLAGS_x86_64 = CFLAGS_FOR_TARGET="-mcmodel=small" CXXFLAGS_FOR_TARGET="-mcmodel=small"
-GCC_ARCH_FLAGS_i686 =
-
 GCC_TARGET_FLAGS_w64-mingw32 = --disable-shared
 GCC_TARGET_FLAGS_linux-gnu =
 
 define create-gcc-rules
 .PHONY: gcc-$(1)-$(2)
 all gcc: gcc-$(1)-$(2)
-gcc-$(1)-$(2): ARCH_FLAGS = $(GCC_ARCH_FLAGS_$(1))
 gcc-$(1)-$(2): TARGET_FLAGS = $(GCC_TARGET_FLAGS_$(2))
 gcc-$(1)-$(2): gcc-$(1)-$(2).Dockerfile | mingw
+	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
-	  --cache-from=$(PROTONSDK_URLBASE)/gcc-$(1)-$(2) \
+	  --cache-from=$(PROTONSDK_URLBASE)/gcc-$(1)-$(2):$(GCC_VERSION) \
 	  -t $(PROTONSDK_URLBASE)/gcc-$(1)-$(2):$(GCC_VERSION) \
 	  -t $(PROTONSDK_URLBASE)/gcc-$(1)-$(2):latest \
-	  context
+	  build
 pull::
 	-$(DOCKER) pull $(PROTONSDK_URLBASE)/gcc-$(1)-$(2):$(GCC_VERSION)
 push::
@@ -191,13 +175,14 @@ $(eval $(call create-gcc-rules,x86_64,w64-mingw32))
 define create-proton-rules
 .PHONY: proton
 all: proton
-proton: BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/sniper/sdk:$(STEAMRT_VERSION)
+proton: BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/soldier/sdk:$(STEAMRT_VERSION)
 proton: proton.Dockerfile | gcc
+	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
-	  --cache-from=$(PROTONSDK_URLBASE) \
+	  --cache-from=$(PROTONSDK_URLBASE):$(PROTONSDK_VERSION) \
 	  -t $(PROTONSDK_URLBASE):$(PROTONSDK_VERSION) \
 	  -t $(PROTONSDK_URLBASE):latest \
-	  context
+	  build
 pull::
 	-$(DOCKER) pull $(PROTONSDK_URLBASE):$(PROTONSDK_VERSION)
 push::
@@ -213,16 +198,13 @@ sources::
 	rm -f $(GCC_SOURCE)
 	rm -f $(RUST_SOURCE_x86_64)
 	rm -f $(RUST_SOURCE_i686)
-	rm -f $(NINJA_SOURCE)
 	wget $(BINUTILS_URLBASE)/$(BINUTILS_SOURCE)
 	wget $(MINGW_URLBASE)/$(MINGW_SOURCE)
 	wget $(GCC_URLBASE)/$(GCC_SOURCE)
 	wget $(RUST_URLBASE)/$(RUST_SOURCE_x86_64)
 	wget $(RUST_URLBASE)/$(RUST_SOURCE_i686)
-	wget $(NINJA_URLBASE)/$(NINJA_SOURCE)
 	echo $(BINUTILS_SHA256) $(BINUTILS_SOURCE) | sha256sum -c -
 	echo $(MINGW_SHA256) $(MINGW_SOURCE) | sha256sum -c -
 	echo $(GCC_SHA256) $(GCC_SOURCE) | sha256sum -c -
 	echo $(RUST_SHA256_x86_64) $(RUST_SOURCE_x86_64) | sha256sum -c -
 	echo $(RUST_SHA256_i686) $(RUST_SOURCE_i686) | sha256sum -c -
-	echo $(NINJA_SHA256) $(NINJA_SOURCE) | sha256sum -c -

docker/README.md

@@ -1,9 +1,9 @@
-Proton (sniper) SDK
+Proton (soldier) SDK
 ====================
 
 These are the build rules that are used to create docker images to build
 Proton. The automated creation of the official images lives in
-<https://gitlab.steamos.cloud/proton/sniper/sdk>, but this can be
+<https://gitlab.steamos.cloud/proton/soldier/sdk>, but this can be
 used to create local images too.
 
 Local usage
@@ -31,11 +31,11 @@ To update the official Proton SDK images:
    commit and push the changes.
 
 2) Update `.gitlab-ci.yml` in the
-   [Proton SDK](https://gitlab.steamos.cloud/proton/sniper/sdk)
+   [Proton SDK](https://gitlab.steamos.cloud/proton/soldier/sdk)
    repository to point to the new commit, commit and push to trigger a
    new build of "-dev" images.
 
-3) Once the images are satisfying, tag the version in Proton SDK
+3) Once the images are satifying, tag the version in Proton SDK
    repository and push the tag, this will trigger a new build of the
    images and version them with the same tag as the Git tag.
 
@@ -72,7 +72,7 @@ replacements done using `sed`.
 The <https://gitlab.steamos.cloud> CI uses Kaniko instead of Docker,
 with a bit of script conversion to generate commands usable there. More
 details are available in
-[Proton SDK](https://gitlab.steamos.cloud/proton/sniper/sdk).
+[Proton SDK](https://gitlab.steamos.cloud/proton/soldier/sdk).
 
 The `build-base` images are there to create a common ground to build the
 other elements of the toolchain. They are based on fairly recent (more

docker/gcc.Dockerfile.in

@@ -40,7 +40,6 @@ RUN wget -q @GCC_URLBASE@/@GCC_SOURCE@ \
   --with-system-mpfr \
   --with-system-zlib \
   --with-tune=core-avx2 \
-  @ARCH_FLAGS@ \
   MAKEINFO=true \
 && make --quiet -j@J@ MAKEINFO=true CFLAGS="-static --static" LDFLAGS="-s -static --static" \
 && make --quiet -j@J@ MAKEINFO=true CFLAGS="-static --static" LDFLAGS="-s -static --static" install-strip DESTDIR=/opt \

docker/mingw-crt.Dockerfile.in

@@ -13,8 +13,7 @@ RUN wget -q @MINGW_URLBASE@/@MINGW_SOURCE@ \
   --prefix=/usr/@ARCH@-w64-mingw32/ \
   --host=@ARCH@-w64-mingw32 \
   --enable-wildcard \
-  @ARCH_FLAGS@ \
-  MAKEINFO=true \
+  MAKEINFO=true || cat config.log \
 && make --quiet -j@J@ MAKEINFO=true \
 && make --quiet -j@J@ MAKEINFO=true install-strip DESTDIR=/opt \
 && rm -rf /opt/usr/share/doc /opt/usr/share/info /opt/usr/share/man \

docker/mingw-pthreads.Dockerfile.in

@@ -15,7 +15,6 @@ RUN wget -q @MINGW_URLBASE@/@MINGW_SOURCE@ \
   --prefix=/usr/@ARCH@-w64-mingw32/ \
   --host=@ARCH@-w64-mingw32 \
   --disable-shared \
-  @ARCH_FLAGS@ \
   MAKEINFO=true \
 && make --quiet -j@J@ MAKEINFO=true \
 && make --quiet -j@J@ MAKEINFO=true install-strip DESTDIR=/opt \

docker/proton.Dockerfile.in

@@ -52,40 +52,15 @@ RUN bash -c 'mkdir -p /usr/lib/ccache && ls /usr/bin/{,*-}{cc,c++,gcc,g++}{,-[0-
 ENV PATH=/usr/lib/ccache:$PATH
 
 RUN apt-get install -y \
-  autoconf-archive \
-  fontforge \
-  fonttools \
   libxpresent-dev \
   libxpresent-dev:i386 \
-  libopenblas-dev \
-  libopenblas-dev:i386 \
-  python3-mako \
   python3-pefile \
   libcapstone-dev \
   libcapstone-dev:i386 \
-  libutfcpp-dev \
   yasm \
-  nasm \
 && rm -rf /opt/usr/share/doc /opt/usr/share/info /opt/usr/share/man \
 && rm -rf /var/lib/apt/lists/*
 
-COPY ninja-jobserver-client.patch /tmp
-
-RUN wget -q @NINJA_URLBASE@/@NINJA_SOURCE@ \
-&& echo '@NINJA_SHA256@ @NINJA_SOURCE@' \
-&& echo '@NINJA_SHA256@ @NINJA_SOURCE@' | sha256sum -c - \
-&& tar xf @NINJA_SOURCE@ -C /tmp && rm @NINJA_SOURCE@ \
-&& cd /tmp/ninja-@NINJA_VERSION@ \
-&& patch -p1 < /tmp/ninja-jobserver-client.patch \
-&& mkdir build \
-&& cd build \
-&& cmake .. \
-&& make \
-&& cp ninja $(which ninja) \
-&& cd / \
-&& rm -rf /tmp/ninja-@NINJA_VERSION@ \
-&& rm -rf /tmp/ninja-jobserver-client.patch
-
 ENTRYPOINT ["/usr/bin/tini-static", "-s", "-g", "--"]
 
 CMD ["/bin/bash"]

docs/CONTROLLERS.md

@@ -14,7 +14,7 @@ hid is a layer above rawinput, where Windows will talk HID to the controller on
 the game's behalf. This turns the raw HID protocol data into usable things like
 buttons and joysticks.
 
-dinput is a "legacy" API that allows applications to talk to any type of
+dinput is a "legacy" API that allows applictions to talk to any type of
 joystick. On Windows, it is implemented on top of HID. Notably, dinput allows
 easy access to controllers that no other API does, so it is still used by
 modern games despite being "legacy."

docs/ICMP_ECHO.md

@@ -4,7 +4,7 @@ Some games rely on ICMP ECHO requests to detect network connectivity,
 or to measure connection ping.
 
 Proton supports sending ICMP ECHO requests using RAW sockets or DGRAM
-ICMP sockets, but the former requires elevated privileges, and the
+ICMP sockets, but the former requires elevated priviledges, and the
 latter may also be disabled by default.
 
 DGRAM ICMP sockets can be enabled for a given set of user groups by

docs/THREAD_PRIORITY.md

@@ -6,7 +6,7 @@ priority levels. However, most default Linux configurations don't allow
 individual threads to raise their priority, so some system configuration is
 likely required.
 
-It can be configured as a privileged user by editing the
+It can be configured as a priviledged user by editing the
 `/etc/security/limits.conf` file, or using the `/etc/security/limits.d/` conf
 directory, and adding the following line at the end:
 

dxvk

@@ -1 +1 @@
-Subproject commit 1b31aa5dbca0749d0737cff02043acb061332fb6
+Subproject commit 78ef4cfd92cb7f448292aaca83091914ab271257

dxvk-nvapi

@@ -1 +1 @@
-Subproject commit 0a7c48b256cafe6b3fa1db8183f089712c72e9ad
+Subproject commit acbcf35e327f2d189e1a9322bc1359a22d36cf6a

ffmpeg

@@ -1 +0,0 @@
-Subproject commit a77521cd5d27e955b16e8097eecefc779ffdcb6d

fonts/liberation-fonts

@@ -1 +1 @@
-Subproject commit 4b0192046158094654e865245832c66d2104219e
+Subproject commit 9510ebd130bcb4dfc76b053b438d8a97a3ed4600

fonts/patches/LiberationMono-Regular.patch

@@ -1,6 +1,8 @@
+diff --git a/LiberationMono-Regular.sfd b/LiberationMono-Regular.sfd
+index 0cedbd4..13b9a63 100644
 --- a/LiberationMono-Regular.sfd
 +++ b/LiberationMono-Regular.sfd
-@@ -3935,6 +3935,10 @@
+@@ -3931,6 +3931,10 @@ ShortTable: maxp 16
    3
    1
  EndShort
@@ -8,6 +10,6 @@
 +!!!!"!!**$!<E0/!"B2J!!iQ/s8E!)!"&](!"&]4s8;p*!"8i*!"8i9s8;p,!"Ao*!"Ju<s82j-
 +!"Ju+!"],?s82j/!"],,!"o8Bs8)d0!"f2-!#,DFs8)cr
 +EndTtf
- LangName: 1033 "" "" "Regular" "Ascender - Liberation Mono" "" "Version 2.1.5" "" "Liberation is a trademark of Red Hat, Inc. registered in U.S. Patent and Trademark Office and certain other jurisdictions." "Ascender Corporation" "Steve Matteson" "Based on Cousine, which was designed by Steve Matteson as an innovative, refreshing sans serif design that is metrically compatible with Courier New+ISIA. Cousine offers improved on-screen readability characteristics and the pan-European WGL character set and solves the needs of developers looking for width-compatible fonts to address document portability across platforms." "http://www.ascendercorp.com/" "http://www.ascendercorp.com/typedesigners.html" "Licensed under the SIL Open Font License, Version 1.1" "http://scripts.sil.org/OFL"
+ LangName: 1033 "" "" "Regular" "Ascender - Liberation Mono" "" "Version 2.00.3" "" "Liberation is a trademark of Red Hat, Inc. registered in U.S. Patent and Trademark Office and certain other jurisdictions." "Ascender Corporation" "Steve Matteson" "Based on Cousine, which was designed by Steve Matteson as an innovative, refreshing sans serif design that is metrically compatible with Courier New+ISIA. Cousine offers improved on-screen readability characteristics and the pan-European WGL character set and solves the needs of developers looking for width-compatible fonts to address document portability across platforms." "http://www.ascendercorp.com/" "http://www.ascendercorp.com/typedesigners.html" "Licensed under the SIL Open Font License, Version 1.1" "http://scripts.sil.org/OFL" 
  GaspTable: 3 8 2 17 1 65535 3 0
  Encoding: UnicodeBmp

fonts/patches/MSGothic-FontMenuNameDB

@@ -0,0 +1,5 @@
+[SourceHanSans-Regular]
+	f=3,1,0x411,\FF2D\FF33 \30B4\30B7\30C3\30AF
+	s=3,1,0x411,\6A19\6E96
+	f=MS Gothic
+	s=Regular

fonts/patches/MSPGothic-FontMenuNameDB

@@ -0,0 +1,5 @@
+[SourceHanSans-Regular]
+	f=3,1,0x411,\FF2D\FF33 \FF30\30B4\30B7\30C3\30AF
+	s=3,1,0x411,\6A19\6E96
+	f=MS PGothic
+	s=Regular

fonts/patches/MSUIGothic-FontMenuNameDB

@@ -0,0 +1,5 @@
+[SourceHanSans-Regular]
+	f=3,1,0x411,MS UI Gothic
+	s=3,1,0x411,\6A19\6E96
+	f=MS UI Gothic
+	s=Regular

fonts/patches/UmeGothic-nametable.patch

@@ -1,86 +0,0 @@
---- a/UmeGothic-nametable.ttx	2021-11-14 02:41:52.823198735 +0900
-+++ b/UmeGothic-nametable.ttx	2021-11-14 02:44:50.269352384 +0900
-@@ -5,8 +5,12 @@
-     <namerecord nameID="0" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Author: HORAI Wataru. License: This font is a free software. Unlimited permission is granted to use, copy, and distribute it, with or without modification, either commercially and noncommercially. THIS FONT IS PROVIDED "AS IS" WITHOUT WARRANTY.
-     </namerecord>
-+    <!--
-+      NameID=1 (Family)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="1" platformID="1" platEncID="0" langID="0x411" unicode="True">
--      Ume Gothic
-+      MS Gothic
-     </namerecord>
-     <namerecord nameID="2" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Regular
-@@ -14,8 +18,12 @@
-     <namerecord nameID="3" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Ume Gothic
-     </namerecord>
-+    <!--
-+      NameID=4 (Full)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="4" platformID="1" platEncID="0" langID="0x411" unicode="True">
--      Ume Gothic
-+      MS Gothic
-     </namerecord>
-     <namerecord nameID="5" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Look update time of this file.
-@@ -29,8 +37,12 @@
-     <namerecord nameID="0" platformID="3" platEncID="1" langID="0x409">
-       Author: HORAI Wataru. License: This font is a free software. Unlimited permission is granted to use, copy, and distribute it, with or without modification, either commercially and noncommercially. THIS FONT IS PROVIDED "AS IS" WITHOUT WARRANTY.
-     </namerecord>
-+    <!--
-+      NameID=1 (Family)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
--      Ume Gothic
-+      MS Gothic
-     </namerecord>
-     <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-       Regular
-@@ -38,8 +50,12 @@
-     <namerecord nameID="3" platformID="3" platEncID="1" langID="0x409">
-       Ume Gothic
-     </namerecord>
-+    <!--
-+      NameID=4 (Full)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
--      Ume Gothic
-+      MS Gothic
-     </namerecord>
-     <namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
-       Look update time of this file.
-@@ -53,8 +69,12 @@
-     <namerecord nameID="0" platformID="3" platEncID="1" langID="0x411">
-       作者: 蓬莱和多流. ライセンス: このフォントはフリー（自由な）ソフトウエアです。あらゆる改変の有無に関わらず、また商業的な利用であっても、自由に利用、複製、再配布することができますが、全て無保証とさせていただきます。
-     </namerecord>
-+    <!--
-+      NameID=1 (Family)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="1" platformID="3" platEncID="1" langID="0x411">
--      梅ゴシック
-+      ＭＳ ゴシック
-     </namerecord>
-     <namerecord nameID="2" platformID="3" platEncID="1" langID="0x411">
-       Regular
-@@ -62,8 +82,12 @@
-     <namerecord nameID="3" platformID="3" platEncID="1" langID="0x411">
-       梅ゴシック
-     </namerecord>
-+    <!--
-+      NameID=4 (Full)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="4" platformID="3" platEncID="1" langID="0x411">
--      梅ゴシック
-+      ＭＳ ゴシック
-     </namerecord>
-     <namerecord nameID="5" platformID="3" platEncID="1" langID="0x411">
-       Look update time of this file.

fonts/patches/UmePGothic-nametable.patch

@@ -1,86 +0,0 @@
---- a/UmePGothic-nametable.ttx	2021-11-14 02:41:46.983127001 +0900
-+++ b/UmePGothic-nametable.ttx	2021-11-14 02:44:42.413257975 +0900
-@@ -5,8 +5,12 @@
-     <namerecord nameID="0" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Author: HORAI Wataru. License: This font is a free software. Unlimited permission is granted to use, copy, and distribute it, with or without modification, either commercially and noncommercially. THIS FONT IS PROVIDED "AS IS" WITHOUT WARRANTY.
-     </namerecord>
-+    <!--
-+      NameID=1 (Family)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="1" platformID="1" platEncID="0" langID="0x411" unicode="True">
--      Ume P Gothic
-+      MS PGothic
-     </namerecord>
-     <namerecord nameID="2" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Regular
-@@ -14,8 +18,12 @@
-     <namerecord nameID="3" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Ume P Gothic
-     </namerecord>
-+    <!--
-+      NameID=4 (Full)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="4" platformID="1" platEncID="0" langID="0x411" unicode="True">
--      Ume P Gothic
-+      MS PGothic
-     </namerecord>
-     <namerecord nameID="5" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Look update time of this file.
-@@ -29,8 +37,12 @@
-     <namerecord nameID="0" platformID="3" platEncID="1" langID="0x409">
-       Author: HORAI Wataru. License: This font is a free software. Unlimited permission is granted to use, copy, and distribute it, with or without modification, either commercially and noncommercially. THIS FONT IS PROVIDED "AS IS" WITHOUT WARRANTY.
-     </namerecord>
-+    <!--
-+      NameID=1 (Family)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
--      Ume P Gothic
-+      MS PGothic
-     </namerecord>
-     <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-       Regular
-@@ -38,8 +50,12 @@
-     <namerecord nameID="3" platformID="3" platEncID="1" langID="0x409">
-       Ume P Gothic
-     </namerecord>
-+    <!--
-+      NameID=4 (Full)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
--      Ume P Gothic
-+      MS PGothic
-     </namerecord>
-     <namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
-       Look update time of this file.
-@@ -53,8 +69,12 @@
-     <namerecord nameID="0" platformID="3" platEncID="1" langID="0x411">
-       作者: 蓬莱和多流. ライセンス: このフォントはフリー（自由な）ソフトウエアです。あらゆる改変の有無に関わらず、また商業的な利用であっても、自由に利用、複製、再配布することができますが、全て無保証とさせていただきます。
-     </namerecord>
-+    <!--
-+      NameID=1 (Family)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="1" platformID="3" platEncID="1" langID="0x411">
--      梅Pゴシック
-+      ＭＳ Ｐゴシック
-     </namerecord>
-     <namerecord nameID="2" platformID="3" platEncID="1" langID="0x411">
-       Regular
-@@ -62,8 +82,12 @@
-     <namerecord nameID="3" platformID="3" platEncID="1" langID="0x411">
-       梅Pゴシック
-     </namerecord>
-+    <!--
-+      NameID=4 (Full)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="4" platformID="3" platEncID="1" langID="0x411">
--      梅Pゴシック
-+      ＭＳ Ｐゴシック
-     </namerecord>
-     <namerecord nameID="5" platformID="3" platEncID="1" langID="0x411">
-       Look update time of this file.

fonts/patches/UmeUIGothic-nametable.patch

@@ -1,86 +0,0 @@
---- a/UmeUIGothic-nametable.ttx	2021-11-14 02:41:57.955261726 +0900
-+++ b/UmeUIGothic-nametable.ttx	2021-11-14 02:44:57.653441054 +0900
-@@ -5,8 +5,12 @@
-     <namerecord nameID="0" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Author: HORAI Wataru. License: This font is a free software. Unlimited permission is granted to use, copy, and distribute it, with or without modification, either commercially and noncommercially. THIS FONT IS PROVIDED "AS IS" WITHOUT WARRANTY.
-     </namerecord>
-+    <!--
-+      NameID=1 (Family)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="1" platformID="1" platEncID="0" langID="0x411" unicode="True">
--      Ume UI Gothic
-+      MS UI Gothic
-     </namerecord>
-     <namerecord nameID="2" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Regular
-@@ -14,8 +18,12 @@
-     <namerecord nameID="3" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Ume UI Gothic
-     </namerecord>
-++    <!--
-++      NameID=4 (Full)
-++      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-++    -->
-     <namerecord nameID="4" platformID="1" platEncID="0" langID="0x411" unicode="True">
--      Ume UI Gothic
-+      MS UI Gothic
-     </namerecord>
-     <namerecord nameID="5" platformID="1" platEncID="0" langID="0x411" unicode="True">
-       Look update time of this file.
-@@ -29,8 +37,12 @@
-     <namerecord nameID="0" platformID="3" platEncID="1" langID="0x409">
-       Author: HORAI Wataru. License: This font is a free software. Unlimited permission is granted to use, copy, and distribute it, with or without modification, either commercially and noncommercially. THIS FONT IS PROVIDED "AS IS" WITHOUT WARRANTY.
-     </namerecord>
-+    <!--
-+      NameID=1 (Family)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
--      Ume UI Gothic
-+      MS UI Gothic
-     </namerecord>
-     <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-       Regular
-@@ -38,8 +50,12 @@
-     <namerecord nameID="3" platformID="3" platEncID="1" langID="0x409">
-       Ume UI Gothic
-     </namerecord>
-+    <!--
-+      NameID=4 (Full)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
--      Ume UI Gothic
-+      MS UI Gothic
-     </namerecord>
-     <namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
-       Look update time of this file.
-@@ -53,8 +69,12 @@
-     <namerecord nameID="0" platformID="3" platEncID="1" langID="0x411">
-       作者: 蓬莱和多流. ライセンス: このフォントはフリー（自由な）ソフトウエアです。あらゆる改変の有無に関わらず、また商業的な利用であっても、自由に利用、複製、再配布することができますが、全て無保証とさせていただきます。
-     </namerecord>
-+    <!--
-+      NameID=1 (Family)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="1" platformID="3" platEncID="1" langID="0x411">
--      梅UIゴシック
-+      MS UI Gothic
-     </namerecord>
-     <namerecord nameID="2" platformID="3" platEncID="1" langID="0x411">
-       Regular
-@@ -62,8 +82,12 @@
-     <namerecord nameID="3" platformID="3" platEncID="1" langID="0x411">
-       梅UIゴシック
-     </namerecord>
-+    <!--
-+      NameID=4 (Full)
-+      https://adobe-type-tools.github.io/font-tech-notes/pdfs/5149.OTFname_Tutorial.pdf
-+    -->
-     <namerecord nameID="4" platformID="3" platEncID="1" langID="0x411">
--      梅UIゴシック
-+      MS UI Gothic
-     </namerecord>
-     <namerecord nameID="5" platformID="3" platEncID="1" langID="0x411">
-       Look update time of this file.

fonts/ranges/arial

@@ -1,140 +0,0 @@
-0020-007E
-00A0-0377
-037A-037F
-0384-038A
-038C
-038E-03A1
-03A3-052F
-0531-0556
-0559-055F
-0561-0587
-0589-058A
-058D-058F
-0591-05C7
-05D0-05EA
-05F0-05F4
-0600-061C
-061E-06FF
-0750-077F
-08A0-08B4
-08B6-08BD
-08D4-08FF
-1D00-1DCA
-1DFE-1F15
-1F18-1F1D
-1F20-1F45
-1F48-1F4D
-1F50-1F57
-1F59
-1F5B
-1F5D
-1F5F-1F7D
-1F80-1FB4
-1FB6-1FC4
-1FC6-1FD3
-1FD6-1FDB
-1FDD-1FEF
-1FF2-1FF4
-1FF6-1FFE
-2000-200F
-2012-2022
-2026
-202A-2030
-2032-2034
-2039-203A
-203C-203E
-2044
-205E
-206A-2070
-2074-2079
-207F
-2090-2094
-20A0-20BF
-20F0
-2105
-2113
-2116-2117
-2122
-2126
-212E
-214D-214E
-2153-2154
-215B-215E
-2184
-2190-2195
-21A8
-2202
-2206
-220F
-2211-2212
-2215
-2219-221A
-221E-221F
-2229
-222B
-2248
-2260-2261
-2264-2265
-2302
-2310
-2320-2321
-2500
-2502
-250C
-2510
-2514
-2518
-251C
-2524
-252C
-2534
-253C
-2550-256C
-2580
-2584
-2588
-258C
-2590-2593
-25A0-25A1
-25AA-25AC
-25B2
-25BA
-25BC
-25C4
-25CA-25CC
-25CF
-25D8-25D9
-25E6
-263A-263C
-2640
-2642
-2660
-2663
-2665-2666
-266A-266B
-266F
-2C60-2C7F
-2E17
-A717-A7AE
-A7B0-A7B7
-A7F7-A7FF
-AB30-AB65
-FB00-FB06
-FB13-FB17
-FB1D-FB36
-FB38-FB3C
-FB3E
-FB40-FB41
-FB43-FB44
-FB46-FBC1
-FBD3-FBFF
-FC5E-FC63
-FCF2-FCF4
-FD3C-FD3F
-FDF2
-FDF4
-FDFA-FDFD
-FE20-FE23
-FE70-FE74
-FE76-FEFC
-FFFC

fonts/ranges/micross

@@ -1,123 +0,0 @@
-0020-007E
-00A0-0377
-037A-037F
-0384-038A
-038C
-038E-03A1
-03A3-052F
-0531-0556
-0559-055F
-0561-0587
-0589-058A
-058D-058F
-0591-05C7
-05D0-05EA
-05F0-05F4
-0600-061C
-061E-06FF
-0750-077F
-0783
-08A0-08B4
-08B6-08BD
-08D4-08FF
-09F2-09F3
-0AF1
-0BF9
-0E01-0E3A
-0E3F-0E5B
-10A0-10C5
-10C7
-10CD
-10D0-10FF
-17DB
-1D00-1DCA
-1DFE-1F15
-1F18-1F1D
-1F20-1F45
-1F48-1F4D
-1F50-1F57
-1F59
-1F5B
-1F5D
-1F5F-1F7D
-1F80-1FB4
-1FB6-1FC4
-1FC6-1FD3
-1FD6-1FDB
-1FDD-1FEF
-1FF2-1FF4
-1FF6-1FFE
-2000-2064
-2066-2071
-2074-208E
-2090-209C
-20A0-20BF
-20E3
-20F0
-2105
-2113
-2116-2117
-2122
-2126
-212E
-2133
-214D-214E
-2150-218B
-2190-2195
-21A8
-2202
-2206
-220F
-2211-2212
-2215
-2219-221A
-221E-221F
-2229
-222B
-2248
-2260-2261
-2264-2265
-2302
-2310
-2320-2321
-2500
-2502
-250C
-25A1
-25AA-25AB
-25CA
-25CC
-25CF
-25E6
-266F
-2C60-2C7F
-2D00-2D25
-2D27
-2D2D
-2DE0-2DFF
-2E17
-A640-A69F
-A717-A7AD
-A7B0-A7B7
-A7F7-A7FF
-AB30-AB65
-FB00-FB06
-FB13-FB17
-FB1D-FB36
-FB38-FB3C
-FB3E
-FB40-FB41
-FB43-FB44
-FB46-FBC1
-FBD3-FBFF
-FC5E-FC63
-FCF2-FCF4
-FD3C-FD3F
-FDF2
-FDF4
-FDFA-FDFD
-FE20-FE23
-FE70-FE74
-FE76-FEFC
-FEFF
-FFFC-FFFD

fonts/ranges/nirmala

@@ -1,166 +0,0 @@
-000D
-0020-007E
-00A0-00FF
-0131
-0152-0153
-0160-0161
-0178
-017D-017E
-0192
-02BC
-02C6-02C7
-02D8
-02DA
-02DC
-03BC
-0900-0983
-0985-098C
-098F-0990
-0993-09A8
-09AA-09B0
-09B2
-09B6-09B9
-09BC-09C4
-09C7-09C8
-09CB-09CE
-09D7
-09DC-09DD
-09DF-09E3
-09E6-09FE
-0A01-0A03
-0A05-0A0A
-0A0F-0A10
-0A13-0A28
-0A2A-0A30
-0A32-0A33
-0A35-0A36
-0A38-0A39
-0A3C
-0A3E-0A42
-0A47-0A48
-0A4B-0A4D
-0A51
-0A59-0A5C
-0A5E
-0A66-0A76
-0A81-0A83
-0A85-0A8D
-0A8F-0A91
-0A93-0AA8
-0AAA-0AB0
-0AB2-0AB3
-0AB5-0AB9
-0ABC-0AC5
-0AC7-0AC9
-0ACB-0ACD
-0AD0
-0AE0-0AE3
-0AE6-0AF1
-0AF9-0AFF
-0B01-0B03
-0B05-0B0C
-0B0F-0B10
-0B13-0B28
-0B2A-0B30
-0B32-0B33
-0B35-0B39
-0B3C-0B44
-0B47-0B48
-0B4B-0B4D
-0B56-0B57
-0B5C-0B5D
-0B5F-0B63
-0B66-0B77
-0B82-0B83
-0B85-0B8A
-0B8E-0B90
-0B92-0B95
-0B99-0B9A
-0B9C
-0B9E-0B9F
-0BA3-0BA4
-0BA8-0BAA
-0BAE-0BB9
-0BBE-0BC2
-0BC6-0BC8
-0BCA-0BCD
-0BD0
-0BD7
-0BE6-0BFA
-0C00-0C0C
-0C0E-0C10
-0C12-0C28
-0C2A-0C39
-0C3D-0C44
-0C46-0C48
-0C4A-0C4D
-0C55-0C56
-0C58-0C5A
-0C60-0C63
-0C66-0C6F
-0C78-0C8C
-0C8E-0C90
-0C92-0CA8
-0CAA-0CB3
-0CB5-0CB9
-0CBC-0CC4
-0CC6-0CC8
-0CCA-0CCD
-0CD5-0CD6
-0CDE
-0CE0-0CE3
-0CE6-0CEF
-0CF1-0CF2
-0D00-0D03
-0D05-0D0C
-0D0E-0D10
-0D12-0D44
-0D46-0D48
-0D4A-0D4F
-0D54-0D63
-0D66-0D7F
-0D82-0D83
-0D85-0D96
-0D9A-0DB1
-0DB3-0DBB
-0DBD
-0DC0-0DC6
-0DCA
-0DCF-0DD4
-0DD6
-0DD8-0DDF
-0DE6-0DEF
-0DF2-0DF4
-0FD5-0FD8
-1C50-1C7F
-1CD0-1CF9
-200B-200D
-2010
-2013-2014
-2018-201A
-201C-201E
-2020-2022
-2026
-2030
-2039-203A
-2044
-20A8
-20AC
-20B9
-2122
-2212
-2215
-2219
-2236
-25CC
-25CF
-262C
-A830-A839
-A8E0-A8FF
-ABC0-ABED
-ABF0-ABF9
-110D0-110E8
-110F0-110F9
-11100-11134
-11136-11146
-111E1-111F4

fonts/scripts/generatefont.pe

@@ -1,7 +1,7 @@
-if ($argc != 6)
-    Error ("Expected arguments - FileName, PSName, FamilyName, FaceName, OutFileName")
+if ($argc != 5)
+    Error ("Expected arguments - FileName, PSName, FamilyName, FaceName")
 endif
 
 Open($1)
 SetFontNames($argv[2], $argv[3], $argv[4])
-Generate($5)
+Generate($1:r + ".ttf")

fonts/scripts/merge.py

@@ -1,290 +0,0 @@
-#!/usr/bin/env python3
-
-# This script was created by Giovanni Mascellani for CodeWeavers
-
-# Based on merge_noto.py and merge_fonts.py from the nototools
-# (https://github.com/googlefonts/nototools), with the following
-# copyright notice:
-
-# Copyright 2014-2017 Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# The font name changing logic is taken from
-# https://github.com/chrissimpkins/fontname.py/blob/master/fontname.py,
-# with the following copyright notice:
-
-# Copyright 2019 Christopher Simpkins
-# MIT License
-
-# The font subsetting logic is taken from
-# https://github.com/fonttools/fonttools/blob/main/Lib/fontTools/subset/__init__.py
-# with the following copyright notice:
-
-# Copyright 2013 Google, Inc. All Rights Reserved.
-# Google Author(s): Behdad Esfahbod
-
-# The whole fonttools repository is distributed under the MIT license.
-
-"""Merges a number of Noto fonts and then sets a given name to the
-result.
-
-"""
-
-import sys
-import tempfile
-import os
-
-from fontTools import merge
-from fontTools import ttLib
-from fontTools import subset
-from fontTools.ttLib.tables import otTables
-
-def read_line_metrics(font):
-    metrics = {
-        "ascent": font["hhea"].ascent,
-        "descent": font["hhea"].descent,
-        "usWinAscent": font["OS/2"].usWinAscent,
-        "usWinDescent": font["OS/2"].usWinDescent,
-        "sTypoAscender": font["OS/2"].sTypoAscender,
-        "sTypoDescender": font["OS/2"].sTypoDescender,
-        "sxHeight": font["OS/2"].sxHeight,
-        "sCapHeight": font["OS/2"].sCapHeight,
-        "sTypoLineGap": font["OS/2"].sTypoLineGap,
-    }
-    return metrics
-
-
-def set_line_metrics(font, metrics):
-    font["hhea"].ascent = metrics["ascent"]
-    font["hhea"].descent = metrics["descent"]
-    font["OS/2"].usWinAscent = metrics["usWinAscent"]
-    font["OS/2"].usWinDescent = metrics["usWinDescent"]
-    font["OS/2"].sTypoAscender = metrics["sTypoAscender"]
-    font["OS/2"].sTypoDescender = metrics["sTypoDescender"]
-    font["OS/2"].sxHeight = metrics["sxHeight"]
-    font["OS/2"].sCapHeight = metrics["sCapHeight"]
-    font["OS/2"].sTypoLineGap = metrics["sTypoLineGap"]
-
-def has_gsub_table(fontfile):
-    font = ttLib.TTFont(fontfile)
-    return "GSUB" in font
-
-SCRIPT_TO_OPENTYPE_SCRIPT_TAG = {
-    # Retrieved from Opentype 1.9 delta specs. Prerelease scripttags used out of necessity. https://docs.microsoft.com/en-us/typography/opentype/spec/scripttags
-    "Carian": "cari",
-    "CypriotSyllabary": "cprt",
-    "CyproMinoan": "cpmn",
-    "Deseret": "dsrt",
-    "Glagolitic": "glag",
-    "EgyptianHieroglyphs": "egyp",
-    "ImperialAramaic": "armi",
-    "LinearA": "lina",
-    "LinearB": "linb",
-    "Lisu": "lisu",
-    "Lycian": "lyci",
-    "Lydian": "lydi",
-    "Ogham": "ogam",
-    "OldItalic": "ital",
-    "OldPersian": "xpeo",
-    "OldSouthArabian": "sarb",
-    "OldTurkic": "orkh",
-    "OldSogdian": "sogo",
-    "OldNorthArabian": "narb",
-    "OldHungarian": "hung",
-    "Osmanya": "osma",
-    "Phoenician": "phnx",
-    "SumeroAkkadianCuneiform": "xsux",
-    "Ugaritic": "ugar",
-    "OlChiki": "olck",
-    "TaiLe": "tale",
-    "Cuneiform": "xsux",
-    "Cypriot": "cprt",
-    "Runic": "runr",
-    "Shavian": "shaw",
-    "Vai": "vai ",
-    "Yi": "yi  ",
-    "AnatolianHieroglyphs": "hluw",
-    "Bamum": "bamu",
-    "ByzantineMusic": "byzm",
-    "Gothic": "goth",
-    "ImperialAramaic": "armi",
-    "InscriptionalPahlavi": "phli",
-    "InscriptionalParthian": "prti",
-    "Khojki": "khoj",
-    "MathematicalAlphanumericSymbols": "math",
-    "MeroiticCursive": "merc",
-    "MeroiticHieroglyphs": "mero",
-    "MusicalSymbols": "musc",
-    "Palmyrene": "palm",
-    "Rejang": "rjng",
-    "Samaritan": "samr",
-    "Carian": "cari",
-    "Ahom": "ahom",
-    "Adlam": "adlm",
-    "Dogra": "dogr",
-    "Lisu": "lisu",
-    "Mandaean": "mand",
-    "Manichaean": "mani",
-    "Tifinagh": "tfng",
-    "Wancho": "wcho",
-    "Yezidi": "yezi",
-    "Cherokee": "cher",
-    "Chorasmian": "chrs",
-    "PahawhHmong": "hmng",
-    "Phagspa": "phag",
-    "Sundanese": "sund",
-    "WarangCiti": "wara",
-    "SylotiNagri": "sylo",
-    "PsalterPahlavi": "phlp",
-    "CaucasianAlbanian": "aghb",
-    "Medefaidrin": "medf",
-    "MeiteiMayek": "mtei",
-    "MendeKikakui": "mend",
-    "Mro": "mroo",
-    "Multani": "mult",
-    "Nabataean": "nbat",
-    "Nandinagari": "nand",
-    "Newa": "newa",
-    "NewTaiLue": "talu",
-    "Nushu": "nshu",
-    "NyiakengPuachueHmong": "hmnp",
-    "OldPermic": "perm",
-    "SoraSompeng": "sora",
-    "Soyombo": "soyo",
-    "SylotiNagri": "sylo",
-    "Tagbanwa": "tagb",
-    "Tagalog": "tglg",
-    "Takri": "takr",
-    "TaiTham": "lana",
-    "TaiViet": "tavt",
-    "Tangut": "tang",
-    "Thaana": "thaa",
-    "UgariticCuneiform": "ugar",
-    "ZanabazarSquare": "zanb",
-    "SignWriting": "sgnw",
-    "OldUyghur": "ougr",
-    "Tangsa": "tnsa",
-    "Toto": "toto",
-    "Vithkuqi": "vith",
-    "Duployan": "dupl",
-    "Hatran": "hatr",
-    # These last two would only merge using the long script name including the 'NotoSerif' part
-    "NotoSerifYezidi": "yezi",
-    "NotoSerifNyiakengPuachueHmong": "hmnp",
-}
-
-def get_opentype_script_tag(fontfile):
-    fontfile = os.path.basename(fontfile)
-    if fontfile.startswith("NotoSans"):
-        fontfile = fontfile[8:]
-    fontfile = fontfile[: fontfile.index("-")]
-    return SCRIPT_TO_OPENTYPE_SCRIPT_TAG[fontfile]
-
-def add_gsub_to_font(fontfile):
-    """Adds an empty GSUB table to a font."""
-    font = ttLib.TTFont(fontfile)
-    gsub_table = ttLib.getTableClass("GSUB")("GSUB")
-    gsub_table.table = otTables.GSUB()
-    gsub_table.table.Version = 1.0
-    gsub_table.table.ScriptList = otTables.ScriptList()
-    gsub_table.table.ScriptCount = 1
-    gsub_table.table.LookupList = otTables.LookupList()
-    gsub_table.table.LookupList.LookupCount = 0
-    gsub_table.table.LookupList.Lookup = []
-    gsub_table.table.FeatureList = otTables.FeatureList()
-    gsub_table.table.FeatureList.FeatureCount = 0
-    gsub_table.table.LookupList.FeatureRecord = []
-
-    script_record = otTables.ScriptRecord()
-    script_record.ScriptTag = get_opentype_script_tag(fontfile)
-    script_record.Script = otTables.Script()
-    script_record.Script.LangSysCount = 0
-    script_record.Script.LangSysRecord = []
-
-    default_lang_sys = otTables.DefaultLangSys()
-    default_lang_sys.FeatureIndex = []
-    default_lang_sys.FeatureCount = 0
-    default_lang_sys.LookupOrder = None
-    default_lang_sys.ReqFeatureIndex = 65535
-    script_record.Script.DefaultLangSys = default_lang_sys
-
-    gsub_table.table.ScriptList.ScriptRecord = [script_record]
-
-    font["GSUB"] = gsub_table
-
-    target_file = tempfile.gettempdir() + "/" + os.path.basename(fontfile)
-    font.save(target_file)
-    return target_file
-
-def parse_unicodes(s):
-    import re
-
-    s = re.sub(r"0[xX]", " ", s)
-    s = re.sub(r"[<+>,;&#\\xXuU\n	]", " ", s)
-    l = []
-    for item in s.split():
-        fields = item.split("-")
-        if len(fields) == 1:
-            l.append(int(item, 16))
-        else:
-            start, end = fields
-            l.extend(range(int(start, 16), int(end, 16) + 1))
-    return l
-
-def main():
-    output_filename = sys.argv[-1]
-    ranges_filename = sys.argv[-2]
-    weight = sys.argv[-3]
-    font_name = sys.argv[-4]
-    ps_name = sys.argv[-5]
-    input_filenames = sys.argv[1:-5]
-
-    # Add a GSUB table to the fonts that do not have one, otherwise
-    # the merger will complain
-    for index, filename in enumerate(input_filenames):
-        if not has_gsub_table(filename):
-            input_filenames[index] = add_gsub_to_font(filename)
-
-    merger = merge.Merger()
-    font = merger.merge(input_filenames)
-
-    # Use the line metrics defined by the first font, which is
-    # supposed to be the basic NotoSans
-    metrics = read_line_metrics(ttLib.TTFont(input_filenames[0]))
-    set_line_metrics(font, metrics)
-
-    # Select the subset we care about
-    options = subset.Options(ignore_missing_unicodes=False)
-    subsetter = subset.Subsetter(options)
-    unicodes = []
-    with open(ranges_filename) as ranges:
-        for line in ranges:
-            unicodes.extend(parse_unicodes(line.split("#")[0]))
-    if len(unicodes) != 0:
-        subsetter.populate(unicodes=unicodes)
-        subsetter.subset(font)
-
-    # Rename the result
-    for record in font['name'].names:
-        if record.nameID == 1:
-            record.string = font_name
-        elif record.nameID == 4:
-            record.string = "{} {}".format(font_name, weight)
-        elif record.nameID == 6:
-            record.string = "{}-{}".format(ps_name, weight.replace(' ', ''))
-
-    font.save(output_filename)
-
-if __name__ == '__main__':
-    main()

fonts/scripts/mergefonts.pe

@@ -0,0 +1,29 @@
+if ($argc < 6)
+    Error ("Expected arguments - Font1, Font2, Font3, ..., FontName, FullName, FontWeight, OutputFilename")
+endif
+
+FONTNAME = ToString($argv[$argc - 4])
+FULLNAME = ToString($argv[$argc - 3])
+FONTWEIGHT = ToString($argv[$argc - 2])
+SRCFONTNAME = ToString($argv[1])
+DESTFONTNAME = ToString($argv[$argc - 1])
+
+Open(SRCFONTNAME)
+
+i = 2
+while (i < $argc - 4)
+  MergeFonts($argv[i])
+  i = i + 1
+endloop
+
+SetFontNames(FONTNAME, FULLNAME, FULLNAME, FONTWEIGHT, "", "1.0.0")
+Generate(DESTFONTNAME)
+Close()
+
+Open(DESTFONTNAME)
+Reencode("unicode")
+SelectWorthOutputting()
+SelectInvert()
+BuildAccented()
+Generate(DESTFONTNAME)
+Close()

fonts/source-han-sans/SourceHanSans_KR_sequences.txt

@@ -29,8 +29,8 @@
 8941 E0105; KRName; CID+62775
 8AA0 E0104; KRName; CID+37864
 8AA0 E0105; KRName; CID+62792
-8ACB E0104; KRName; CID+62795
-8ACB E0105; KRName; CID+37953
+8ACB E0104; KRName; CID+62792
+8ACB E0105; KRName; CID+37864
 927C E0103; KRName; CID+41543
 927C E0104; KRName; CID+41542
 9F9C E0107; KRName; CID+47476

fonts/source-han-sans/UniSourceHanSansCN-UTF32-H

@@ -3,9 +3,9 @@
 %%IncludeResource: ProcSet (CIDInit)
 %%BeginResource: CMap (UniSourceHanSansCN-UTF32-H)
 %%Title: (UniSourceHanSansCN-UTF32-H Adobe Identity 0)
-%%Version: 2.004
+%%Version: 2.001
 %%Copyright: -----------------------------------------------------------
-%%Copyright: Copyright 1990-2021 Adobe. All rights reserved.
+%%Copyright: Copyright 1990-2019 Adobe. All rights reserved.
 %%Copyright:
 %%Copyright: Redistribution and use in source and binary forms, with or
 %%Copyright: without modification, are permitted provided that the
@@ -53,7 +53,7 @@ begincmap
 end def
 
 /CMapName /UniSourceHanSansCN-UTF32-H def
-/CMapVersion 2.004 def
+/CMapVersion 2.001 def
 /CMapType 1 def
 
 /WMode 0 def
@@ -11804,7 +11804,7 @@ endcidchar
 <0002f91a> 61840
 endcidchar
 
-12 begincidchar
+8 begincidchar
 <0002f945> 61843
 <0002f947> 61844
 <0002f96c> 61845
@@ -11813,10 +11813,6 @@ endcidchar
 <0002f9d0> 61849
 <0002f9d4> 61850
 <0002f9f4> 61853
-<00030729> 61858
-<00030edd> 61859
-<00030ede> 61856
-<0003106c> 61861
 endcidchar
 
 100 begincidrange

fonts/source-han-sans/cidfontinfo.OTC.J

@@ -0,0 +1,22 @@
+FontName                   (SourceHanSans-Regular)
+FullName                   (Source Han Sans Regular)
+FamilyName                 (Source Han Sans)
+Weight                     (Regular)
+version                    (2.001)
+Registry                   (Adobe)
+Ordering                   (Identity)
+Supplement                 0
+Layout                     (AI0-SourceHanSans)
+FSType                     0
+isFixedPitch               false
+UnderlinePosition          -150
+AdobeCopyright             (Copyright 2014-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.)
+Trademark                  (Source is a trademark of Adobe in the United States and/or other countries.)
+Serif                      false
+IsBoldStyle                false
+IsItalicStyle              false
+PreferOS/2TypoMetrics      false
+IsOS/2WidthWeigthSlopeOnly false
+IsOS/2OBLIQUE              false
+UseOldNameID4              false
+LicenseCode                ADOBE

fonts/source-han-sans/cidfontinfo.OTC.K

@@ -2,7 +2,7 @@ FontName                   (SourceHanSansK-Regular)
 FullName                   (Source Han Sans Korean Regular)
 FamilyName                 (Source Han Sans Korean)
 Weight                     (Regular)
-version                    (2.004)
+version                    (2.001)
 Registry                   (Adobe)
 Ordering                   (Identity)
 Supplement                 0
@@ -10,7 +10,7 @@ Layout                     (AI0-SourceHanSans)
 FSType                     0
 isFixedPitch               false
 UnderlinePosition          -150
-AdobeCopyright             (Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.)
+AdobeCopyright             (Copyright 2014-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.)
 Trademark                  (Source is a trademark of Adobe in the United States and/or other countries.)
 Serif                      false
 IsBoldStyle                false

fonts/source-han-sans/cidfontinfo.OTC.SC

@@ -2,7 +2,7 @@ FontName                   (SourceHanSansSC-Regular)
 FullName                   (Source Han Sans Simplified Chinese Regular)
 FamilyName                 (Source Han Sans Simplified Chinese)
 Weight                     (Regular)
-version                    (2.004)
+version                    (2.001)
 Registry                   (Adobe)
 Ordering                   (Identity)
 Supplement                 0
@@ -10,7 +10,7 @@ Layout                     (AI0-SourceHanSans)
 FSType                     0
 isFixedPitch               false
 UnderlinePosition          -150
-AdobeCopyright             (Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.)
+AdobeCopyright             (Copyright 2014-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.)
 Trademark                  (Source is a trademark of Adobe in the United States and/or other countries.)
 Serif                      false
 IsBoldStyle                false

fonts/source-han-sans/features.OTC.K

@@ -37,7 +37,7 @@ languagesystem hani ZHT;
 languagesystem hani ZHH;
 
 table head {
-  FontRevision 2.004;
+  FontRevision 2.001;
 } head;
 
 table hhea {
@@ -47,7 +47,7 @@ table hhea {
 } hhea;
 
 table name {
-  nameid 0 "\00A9 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.";
+  nameid 0 "\00A9 2014-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.";
   nameid 7 "Source is a trademark of Adobe in the United States and/or other countries.";
   nameid 8 "Adobe";
   nameid 9 "Ryoko NISHIZUKA \897F\585A\6DBC\5B50 (kana, bopomofo & ideographs); Paul D. Hunt (Latin, Greek & Cyrillic); Sandoll Communications \C0B0\B3CC\CEE4\BBA4\B2C8\CF00\C774\C158, Soo-young JANG \C7A5\C218\C601 & Joo-yeon KANG \AC15\C8FC\C5F0 (hangul elements, letters & syllables)";
@@ -364,6 +364,47 @@ lookup std_ccmp {
   substitute \63128 \63128 by \63143;
   substitute \723 \723 \723 by \63144;
   substitute \723 \723 by \63143;
+  # UTC-00791 (Extension G)
+  # JP
+  substitute \1394 \40029 \1387 \29388 \1384 \20694 \1384 \1386 \1385 \16866 \42830 \1385 \37543 \44746 \1385 \16866 \42830 \11137 \17487 by \61854;
+  # KR
+  substitute \1394 \40029 \1387 \62576 \1384 \20694 \1384 \1386 \1385 \16866 \42830 \1385 \37543 \44746 \1385 \16866 \42830 \11137 \17487 by \61855;
+  # CN
+  substitute \1394 \40030 \1387 \29389 \1384 \20694 \1384 \1386 \1385 \16867 \42831 \1385 \37544 \44746 \1385 \16867 \42831 \11137 \17488 by \61856;
+  # TW
+  substitute \1394 \40031 \1387 \29390 \1384 \20694 \1384 \1386 \1385 \16867 \42831 \1385 \37544 \44746 \1385 \16867 \42831 \11137 \17488 by \61857;
+  # HK
+  substitute \1394 \40031 \1387 \29389 \1384 \20694 \1384 \1386 \1385 \16867 \42831 \1385 \37544 \44746 \1385 \16867 \42831 \11137 \17488 by \61857;
+  # UTC-01200 (Extension G)
+  # JP/KR
+  substitute \1384 \23011 \17745 by \61858;
+  # CN/TW/HK
+  substitute \1384 \23011 \17746 by \61858;
+  # UTC-01312 (Extension G)
+  # JP
+  substitute \1394 \40029 \1387 \29388 \1384 \20694 \1384 \1386 \1385 \16866 \42842 \1385 \37543 \45072 \1385 \16866 \42842 \11137 \17487 by \61859;
+  # KR
+  substitute \1394 \40029 \1387 \62576 \1384 \20694 \1384 \1386 \1385 \16866 \42842 \1385 \37543 \45072 \1385 \16866 \42842 \11137 \17487 by \61859;
+  # CN
+  substitute \1394 \40030 \1387 \29389 \1384 \20694 \1384 \1386 \1385 \16867 \42842 \1385 \37544 \45072 \1385 \16867 \42842 \11137 \17488 by \61859;
+  # TW
+  substitute \1394 \40031 \1387 \29390 \1384 \20694 \1384 \1386 \1385 \16867 \42842 \1385 \37544 \45072 \1385 \16867 \42842 \11137 \17488 by \61859;
+  # HK
+  substitute \1394 \40031 \1387 \29389 \1384 \20694 \1384 \1386 \1385 \16867 \42842 \1385 \37544 \45072 \1385 \16867 \42842 \11137 \17488 by \61859;
+  # UK-02960 (Extension G): Long IDS
+  # JP/KR
+  substitute \1387 \43442 \1386 \43442 \47443 \43442 \1384 \47443 \47443 by \61860;
+  # CN
+  substitute \1387 \43443 \1386 \43443 \47444 \43443 \1384 \47444 \47444 by \61861;
+  # TW
+  substitute \1387 \43444 \1386 \43444 \47445 \43444 \1384 \47445 \47445 by \61862;
+  # HK
+  substitute \1387 \43444 \1386 \43444 \47444 \43444 \1384 \47444 \47444 by \61863;
+  # UK-02960 (Extension G): Short IDS
+  # JP/KR/CN/HK
+  # substitute \1389 \8547 \47471 by \61860;
+  # TW
+  # substitute \1389 \8547 \47472 by \61862;
   substitute \1447 \1449 by \1445;
   substitute \1448 \1449 by \1446;
   substitute \1461 \1546 by \61872;
@@ -3864,7 +3905,6 @@ lookup kr2jp useExtension {
   substitute \13215 by \13214;
   substitute \13690 by \13689;
   substitute \13787 by \13786;
-  substitute \13900 by \13899;
   substitute \14020 by \14019;
   substitute \14036 by \14035;
   substitute \14065 by \14064;
@@ -4145,6 +4185,7 @@ lookup kr2jp useExtension {
   substitute \61852 by \39830;
   substitute \61855 by \61854;
   substitute \61899 by \10855;
+  substitute \61900 by \10989;
   substitute \61905 by \11892;
   substitute \61909 by \12827;
   substitute \61920 by \17069;
@@ -5024,7 +5065,6 @@ lookup kr2cn useExtension {
   substitute \10973 by \10974;
   substitute \10983 by \10984;
   substitute \10985 by \10986;
-  substitute \10989 by \61900;
   substitute \10990 by \10991;
   substitute \11005 by \11006;
   substitute \11010 by \11011;
@@ -5626,6 +5666,7 @@ lookup kr2cn useExtension {
   substitute \13890 by \13891;
   substitute \13894 by \13895;
   substitute \13896 by \13897;
+  substitute \13899 by \13900;
   substitute \13901 by \13902;
   substitute \13904 by \13905;
   substitute \13906 by \13907;
@@ -14202,7 +14243,6 @@ lookup kr2tw useExtension {
   substitute \10979 by \10980;
   substitute \10983 by \10984;
   substitute \10985 by \10987;
-  substitute \10989 by \61900;
   substitute \10990 by \10991;
   substitute \10996 by \10997;
   substitute \11005 by \11006;
@@ -14950,6 +14990,7 @@ lookup kr2tw useExtension {
   substitute \13890 by \13891;
   substitute \13894 by \13895;
   substitute \13896 by \13897;
+  substitute \13899 by \13900;
   substitute \13901 by \13902;
   substitute \13904 by \13905;
   substitute \13906 by \13908;
@@ -26179,7 +26220,6 @@ lookup kr2hk useExtension {
   substitute \10973 by \10974;
   substitute \10983 by \10984;
   substitute \10985 by \10987;
-  substitute \10989 by \61900;
   substitute \10990 by \10991;
   substitute \10996 by \10997;
   substitute \11005 by \11006;
@@ -26894,6 +26934,7 @@ lookup kr2hk useExtension {
   substitute \13890 by \13891;
   substitute \13894 by \13895;
   substitute \13896 by \13897;
+  substitute \13899 by \13900;
   substitute \13901 by \13902;
   substitute \13904 by \13905;
   substitute \13906 by \13907;
@@ -27503,6 +27544,7 @@ lookup kr2hk useExtension {
   substitute \15731 by \15732;
   substitute \15737 by \15739;
   substitute \15742 by \15743;
+  substitute \15744 by \15745;
   substitute \15755 by \15756;
   substitute \15761 by \15763;
   substitute \15769 by \15770;
@@ -27542,7 +27584,6 @@ lookup kr2hk useExtension {
   substitute \15912 by \15914;
   substitute \15915 by \15916;
   substitute \15917 by \15918;
-  substitute \15923 by \65530;
   substitute \15925 by \15926;
   substitute \15927 by \15928;
   substitute \15929 by \15930;

fonts/source-han-sans/features.OTC.SC

@@ -37,7 +37,7 @@ languagesystem hani ZHT;
 languagesystem hani ZHH;
 
 table head {
-  FontRevision 2.004;
+  FontRevision 2.001;
 } head;
 
 table hhea {
@@ -47,7 +47,7 @@ table hhea {
 } hhea;
 
 table name {
-  nameid 0 "\00A9 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.";
+  nameid 0 "\00A9 2014-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.";
   nameid 7 "Source is a trademark of Adobe in the United States and/or other countries.";
   nameid 8 "Adobe";
   nameid 9 "Ryoko NISHIZUKA \897F\585A\6DBC\5B50 (kana, bopomofo & ideographs); Paul D. Hunt (Latin, Greek & Cyrillic); Sandoll Communications \C0B0\B3CC\CEE4\BBA4\B2C8\CF00\C774\C158, Soo-young JANG \C7A5\C218\C601 & Joo-yeon KANG \AC15\C8FC\C5F0 (hangul elements, letters & syllables)";
@@ -363,6 +363,47 @@ lookup std_ccmp {
   substitute \63128 \63128 by \63143;
   substitute \723 \723 \723 by \63144;
   substitute \723 \723 by \63143;
+  # UTC-00791 (Extension G)
+  # JP
+  substitute \1394 \40029 \1387 \29388 \1384 \20694 \1384 \1386 \1385 \16866 \42830 \1385 \37543 \44746 \1385 \16866 \42830 \11137 \17487 by \61854;
+  # KR
+  substitute \1394 \40029 \1387 \62576 \1384 \20694 \1384 \1386 \1385 \16866 \42830 \1385 \37543 \44746 \1385 \16866 \42830 \11137 \17487 by \61855;
+  # CN
+  substitute \1394 \40030 \1387 \29389 \1384 \20694 \1384 \1386 \1385 \16867 \42831 \1385 \37544 \44746 \1385 \16867 \42831 \11137 \17488 by \61856;
+  # TW
+  substitute \1394 \40031 \1387 \29390 \1384 \20694 \1384 \1386 \1385 \16867 \42831 \1385 \37544 \44746 \1385 \16867 \42831 \11137 \17488 by \61857;
+  # HK
+  substitute \1394 \40031 \1387 \29389 \1384 \20694 \1384 \1386 \1385 \16867 \42831 \1385 \37544 \44746 \1385 \16867 \42831 \11137 \17488 by \61857;
+  # UTC-01200 (Extension G)
+  # JP/KR
+  substitute \1384 \23011 \17745 by \61858;
+  # CN/TW/HK
+  substitute \1384 \23011 \17746 by \61858;
+  # UTC-01312 (Extension G)
+  # JP
+  substitute \1394 \40029 \1387 \29388 \1384 \20694 \1384 \1386 \1385 \16866 \42842 \1385 \37543 \45072 \1385 \16866 \42842 \11137 \17487 by \61859;
+  # KR
+  substitute \1394 \40029 \1387 \62576 \1384 \20694 \1384 \1386 \1385 \16866 \42842 \1385 \37543 \45072 \1385 \16866 \42842 \11137 \17487 by \61859;
+  # CN
+  substitute \1394 \40030 \1387 \29389 \1384 \20694 \1384 \1386 \1385 \16867 \42842 \1385 \37544 \45072 \1385 \16867 \42842 \11137 \17488 by \61859;
+  # TW
+  substitute \1394 \40031 \1387 \29390 \1384 \20694 \1384 \1386 \1385 \16867 \42842 \1385 \37544 \45072 \1385 \16867 \42842 \11137 \17488 by \61859;
+  # HK
+  substitute \1394 \40031 \1387 \29389 \1384 \20694 \1384 \1386 \1385 \16867 \42842 \1385 \37544 \45072 \1385 \16867 \42842 \11137 \17488 by \61859;
+  # UK-02960 (Extension G): Long IDS
+  # JP/KR
+  substitute \1387 \43442 \1386 \43442 \47443 \43442 \1384 \47443 \47443 by \61860;
+  # CN
+  substitute \1387 \43443 \1386 \43443 \47444 \43443 \1384 \47444 \47444 by \61861;
+  # TW
+  substitute \1387 \43444 \1386 \43444 \47445 \43444 \1384 \47445 \47445 by \61862;
+  # HK
+  substitute \1387 \43444 \1386 \43444 \47444 \43444 \1384 \47444 \47444 by \61863;
+  # UK-02960 (Extension G): Short IDS
+  # JP/KR/CN/HK
+  # substitute \1389 \8547 \47471 by \61860;
+  # TW
+  # substitute \1389 \8547 \47472 by \61862;
   substitute \1447 \1449 by \1445;
   substitute \1448 \1449 by \1446;
   substitute \1461 \1546 by \61872;
@@ -13890,6 +13931,7 @@ lookup cn2kr useExtension {
   substitute \13891 by \13890;
   substitute \13895 by \13894;
   substitute \13897 by \13896;
+  substitute \13900 by \13899;
   substitute \13902 by \13901;
   substitute \13905 by \13904;
   substitute \13907 by \13906;
@@ -21537,7 +21579,6 @@ lookup cn2kr useExtension {
   substitute \61830 by \18829;
   substitute \61856 by \61855;
   substitute \61861 by \61860;
-  substitute \61900 by \10989;
   substitute \61907 by \12272;
   substitute \61910 by \12850;
   substitute \61913 by \13658;
@@ -31104,7 +31145,6 @@ lookup cn2hk useExtension {
   substitute \15734 by \15735;
   substitute \15737 by \15739;
   substitute \15741 by \15740;
-  substitute \15745 by \15744;
   substitute \15749 by \15748;
   substitute \15755 by \15756;
   substitute \15760 by \15759;
@@ -31128,7 +31168,6 @@ lookup cn2hk useExtension {
   substitute \15910 by \15911;
   substitute \15913 by \15914;
   substitute \15917 by \15918;
-  substitute \15923 by \65530;
   substitute \15925 by \15926;
   substitute \15927 by \15928;
   substitute \15933 by \15934;

fonts/ume/PROTON_NOTE.md

@@ -1,21 +0,0 @@
-# UmeFont (version 670)
-
-https://osdn.net/projects/ume-font/
-
-## Fonts
-
-https://osdn.net/projects/ume-font/downloads/22212/umefont_670.tar.xz/
-
-- ume-tgo4.ttf: Ume Gothic
-- ume-pgo4.ttf: Ume P Gothic
-- ume-ugo4.ttf: Ume UI Gothic
-
-## License
-
-See license.html for details.
-
-## Why UmeFont?
-
-UmeFont is metric-compatible fonts with MS Japanese fonts.
-
-https://wiki.archlinux.org/title/Metric-compatible_fonts#Ume

fonts/ume/license.html

@@ -1,79 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html" charset="utf-8">
-</head>
-<body>
-
-<pre>
--------------------------------------------------------------------------------
-梅フォントのライセンス (日本語 UTF-8)  (UmeFont license (In Japanese UTF-8))
--------------------------------------------------------------------------------
-
-本ライセンスは以下の梅フォントに共通のライセンスです。
-
-    * 梅ゴシック
-    * 梅ゴシックC4
-    * 梅ゴシックS4
-    * 梅ゴシックO5
-    * 梅ゴシックC5
-    * 梅ゴシックS5
-    * 梅Pゴシック
-    * 梅PゴシックC4
-    * 梅PゴシックS4
-    * 梅PゴシックO5
-    * 梅PゴシックC5
-    * 梅PゴシックS5
-    * 梅UIゴシック
-    * 梅UIゴシックO5
-    * 梅Hyゴシック
-    * 梅HyゴシックO5    
-    * 梅明朝
-    * 梅明朝S3
-    * 梅P明朝
-    * 梅P明朝S3
-
-
-これらのフォントはフリー（自由な）ソフトウエアです。
-あらゆる改変の有無に関わらず、また商業的な利用であっても、自由にご利用、複製、
-再配布することができますが、全て無保証とさせていただきます。 
-
-
-
--------------------------------------------------------------------------------
-UmeFont license (In English)
--------------------------------------------------------------------------------
-
-This is common license of the UmeFont family. UmeFont family provides the
-following fonts:
-
-    * Ume Gothic
-    * Ume Gothic C4
-    * Ume Gothic S4
-    * Ume Gothic O5
-    * Ume Gothic C5
-    * Ume Gothic S5
-    * Ume P Gothic
-    * Ume P Gothic C4
-    * Ume P Gothic S4
-    * Ume P Gothic O5
-    * Ume P Gothic C5
-    * Ume P Gothic S5
-    * Ume UI Gothic
-    * Ume UI Gothic O5
-    * Ume Hy Gothic
-    * Ume Hy Gothic O5    
-    * Ume Mincho
-    * Ume Mincho S3
-    * Ume P Mincho
-    * Ume P Mincho S3
-
-
-These fonts are free software.
-Unlimited permission is granted to use, copy, and distribute it,
-with or without modification, either commercially and noncommercially.
-THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
-
-</pre>
-</body>
-</html>

glslang

@@ -1 +0,0 @@
-Subproject commit df7fec2cfa966919172ee83bfcae6c9c9b3f91b8

graphene

@@ -1 +0,0 @@
-Subproject commit 4e2578450809c2099400cf85caf18eafcd7100aa

gst-orc

@@ -1 +1 @@
-Subproject commit 7d5bbada3f1c6cf34182abccf47a34d79b83fa97
+Subproject commit 629864f073ae003e63c026c1de2407fec713cb53

gst-plugins-bad

@@ -0,0 +1 @@
+Subproject commit d3af58d5b31941caa26c3ded85d7a7b84a91f0cc

gst-plugins-base

@@ -0,0 +1 @@
+Subproject commit 57fb883b3f8c6d7a397afc0dfc4a7c2e5af05579

gst-plugins-good

@@ -0,0 +1 @@
+Subproject commit 56dec037a80266add6853e4b06e2dc379de757d1

gst-plugins-rs

@@ -1 +0,0 @@
-Subproject commit 0205aa43d6d8c5d0c9d4e4f83e0a3aaa94acef89

gstreamer

@@ -1 +1 @@
-Subproject commit bf6ce1d64a0697e7910826147b48f8f658366a5a
+Subproject commit 71c213f99ad5c8fc8f36a26238483f2bdf7d846a

lsteamclient/cb_converters.dat

@@ -32,7 +32,6 @@ case 0x00180835: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetPr
 case 0x000c0836: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestHeadersReceived_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
 case 0x00140837: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestDataReceived_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
 case 0x00200af3: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamInputConfigurationLoaded_t_40((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
-case 0x00180af4: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamInputGamepadSlotChange_t_32((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
 case 0x26280d4a: win_msg->m_cubParam = 9784; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamUGCRequestUGCDetailsResult_t_9784((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
 case 0x00100d4b: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_CreateItemResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
 case 0x000c0d4d: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_ItemInstalled_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;