build: import upstream changes

Makefile

@@ -26,11 +26,16 @@ else
 endif
 
 ifneq ($(module),)
-    ifneq ($(findstring .,$(module)),)
-		MODULE_SFX :=
-	else
-		MODULE_SFX := .dll
-	endif
+    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
 endif
 
 ifneq ($(unstripped),)
@@ -153,11 +158,15 @@ module: | $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-windows
 module: | $(BUILD_ROOT)/$(module)/lib64/wine/x86_64-unix
 module: downloads
 	$(MAKE) $(MFLAGS) $(MAKEOVERRIDES) -C $(BUILD_DIR)/ $(UNSTRIPPED) module=$(module) module && \
-	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/; \
+	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/; \
+	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
 
 dxvk: | $(BUILD_ROOT)/dxvk/lib/wine/dxvk

fonts/ume/PROTON_NOTE.md

@@ -1,15 +1,19 @@
 # UmeFont (version 670)
 
-https://ja.osdn.net/projects/ume-font/
+https://osdn.net/projects/ume-font/
 
 ## Fonts
 
-https://ja.osdn.net/projects/ume-font/downloads/22212/umefont_670.tar.xz/
+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.

proton

@@ -31,7 +31,7 @@ from random import randrange
 #To enable debug logging, copy "user_settings.sample.py" to "user_settings.py"
 #and edit it if needed.
 
-CURRENT_PREFIX_VERSION="GE-Proton7-14"
+CURRENT_PREFIX_VERSION="GE-Proton7-15"
 
 PFX="Proton: "
 ld_path_var = "LD_LIBRARY_PATH"
@@ -1115,15 +1115,20 @@ def default_compat_config():
         appid = os.environ["SteamAppId"]
         if appid in [
                 #affected by CW bug 19126
+                "252490", #Rust
                 "305620", #The Long Dark
                 "585420", #Trailmakers
                 "684450", #Surviving the Aftermath
+                "780290", #Gloomhaven
+                "844260", #Rustler
+                "960170", #DJMAX RESPECT V
+                "983970", #Haven
                 "1075200", #TOHU
+                "1102190", #Monster Train
+                "1107790", #The Complex
                 "1331440", #FUSER
+                "1523720", #Cook-Out
                 "1110100", # Power Rangers: Battle for the Grid
-                "983970", # Haven
-                "844260", # Rustler
-                "252490", # Rust
                 "700580", # Rust Staging
                 "1452500", # The Good Life
                 "1741410", # The Good Life Demo