protonfixes: add protonfixes

Author: GloriousEggroll

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "wine"]
 	path = wine
-	url = ../wine
+	url = https://github.com/ValveSoftware/wine
 [submodule "dxvk"]
 	path = dxvk
-	url = ../dxvk
+	url = https://github.com/ValveSoftware/dxvk
 [submodule "openvr"]
 	path = openvr
 	url = https://github.com/ValveSoftware/openvr
@@ -55,3 +55,6 @@
 [submodule "glslang"]
 	path = glslang
 	url = https://github.com/KhronosGroup/glslang
+[submodule "protonfixes"]
+        path = protonfixes
+	url = https://github.com/Open-Wine-Components/ULWGL-protonfixes

Makefile.in

@@ -1090,8 +1090,12 @@ $(PROTON37_TRACKED_FILES_TARGET): $(addprefix $(SRCDIR)/,proton_3.7_tracked_file
 USER_SETTINGS_PY_TARGET := $(addprefix $(DST_BASE)/,user_settings.sample.py)
 $(USER_SETTINGS_PY_TARGET): $(addprefix $(SRCDIR)/,user_settings.sample.py)
 
+PROTONFIXES_TARGET := $(addprefix $(DST_BASE)/,protonfixes)
+$(PROTONFIXES_TARGET): $(addprefix $(SRCDIR)/,protonfixes)
+
 DIST_COPY_TARGETS := $(FILELOCK_TARGET) $(PROTON_PY_TARGET) \
-                     $(PROTON37_TRACKED_FILES_TARGET) $(USER_SETTINGS_PY_TARGET)
+                     $(PROTON37_TRACKED_FILES_TARGET) $(USER_SETTINGS_PY_TARGET) \
+                     $(PROTONFIXES_TARGET)
 
 $(DIST_COPY_TARGETS): | $(DST_DIR)
 	cp -a $(SRCDIR)/$(notdir $@) $@
@@ -1121,10 +1125,14 @@ deploy: all
 .PHONY: redist
 redist: all
 	mkdir -p $(REDIST_DIR)
-	rsync --delete --exclude dist -arx $(DST_BASE)/ $(REDIST_DIR)
-	tar -C $(DST_DIR) -c . | gzip -c -1 > $(REDIST_DIR)/proton_dist.tar.gz
-	@echo "Created redistribution tarball at "$(REDIST_DIR)"/proton_dist.tar.gz"
-
+	rsync --delete -arx $(DST_BASE)/ $(REDIST_DIR)
+	cp $(PROTONFIXES_TARGET)/cabextract $(REDIST_DIR)/dist/bin/
+	cp $(PROTONFIXES_TARGET)/libmspack.so.0 $(REDIST_DIR)/dist/lib64/
+	cp $(PROTONFIXES_TARGET)/libmspack.so.0.1.0 $(REDIST_DIR)/dist/lib64/
+	mv $(REDIST_DIR) $(BUILD_NAME)
+	tar -cvzf $(BUILD_NAME).tar.gz $(BUILD_NAME)
+	sha512sum $(BUILD_NAME).tar.gz > $(BUILD_NAME).sha512sum
+	@echo "Proton build available at $(BUILD_NAME).tar.gz"
 
 ##
 ## make module=$dllname module[32,64]

proton

@@ -40,7 +40,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="8.0-103"
+CURRENT_PREFIX_VERSION="ULWGL-Proton-8.0-103"
 
 PFX="Proton: "
 ld_path_var = "LD_LIBRARY_PATH"
@@ -1727,11 +1727,16 @@ if __name__ == "__main__":
 
     g_session.init_wine()
 
+    # This is needed for protonfixes
+    os.environ["PROTON_DLL_COPY"] = "*"
+
     if g_proton.missing_default_prefix():
         g_proton.make_default_prefix()
 
     g_session.init_session(sys.argv[1] != "runinprefix")
 
+    import protonfixes
+
     #determine mode
     rc = 0
     if sys.argv[1] == "run":