Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 23:25:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

update wine to 5.13

Browse Source
This commit is contained in:
Andrew Eikum 2020-07-14 09:41:56 -05:00
parent 2cc2552492
commit 7d444028c3
6 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -278,8 +278,8 @@ the Wine prefix. Removing the option will revert to the previous behavior.
| <tt>vkd3dfl12</tt> | | Force the Direct3D 12 feature level to 12, regardless of driver support. | | <tt>vkd3dfl12</tt> | | Force the Direct3D 12 feature level to 12, regardless of driver support. |
| | <tt>WINE_FULLSCREEN_INTEGER_SCALING</tt> | Enable integer scaling mode, to give sharp pixels when upscaling. | | | <tt>WINE_FULLSCREEN_INTEGER_SCALING</tt> | Enable integer scaling mode, to give sharp pixels when upscaling. |
| <tt>cmdlineappend:</tt>| | 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. | | <tt>cmdlineappend:</tt>| | 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. |
| <tt>d9vk</tt> | <tt>PROTON_USE_D9VK</tt> | **Note: Obsoleted in Proton 5.0.** In older versions, use Vulkan-based DXVK instead of OpenGL-based wined3d for d3d9. |
| <tt>seccomp</tt> | <tt>PROTON_USE_SECCOMP</tt> | Enable seccomp-bpf filter to emulate native syscalls, required for some DRM protections to work. |
| <tt>nowritewatch</tt> | <tt>PROTON_NO_WRITE_WATCH</tt> | 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). | | <tt>nowritewatch</tt> | <tt>PROTON_NO_WRITE_WATCH</tt> | 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). |
| <tt>seccomp</tt> | <tt>PROTON_USE_SECCOMP</tt> | **Note: Obsoleted in Proton 5.13.** In older versions, enable seccomp-bpf filter to emulate native syscalls, required for some DRM protections to work. |
| <tt>d9vk</tt> | <tt>PROTON_USE_D9VK</tt> | **Note: Obsoleted in Proton 5.0.** In older versions, use Vulkan-based DXVK instead of OpenGL-based wined3d for d3d9. |
<!-- Target: GitHub Flavor Markdown. To test locally: pandoc -f markdown_github -t html README.md --> <!-- Target: GitHub Flavor Markdown. To test locally: pandoc -f markdown_github -t html README.md -->

18
build/makefile_base.mak
View File

@ -189,8 +189,8 @@ GECKO_VER := 2.47.1
GECKO32_TARBALL := wine-gecko-$(GECKO_VER)-x86.tar.bz2 GECKO32_TARBALL := wine-gecko-$(GECKO_VER)-x86.tar.bz2
GECKO64_TARBALL := wine-gecko-$(GECKO_VER)-x86_64.tar.bz2 GECKO64_TARBALL := wine-gecko-$(GECKO_VER)-x86_64.tar.bz2
WINEMONO_VER := 4.9.4 WINEMONO_VER := 5.1.0
WINEMONO_TARBALL := wine-mono-bin-$(WINEMONO_VER).tar.gz WINEMONO_TARBALL := wine-mono-$(WINEMONO_VER)-x86.tar.xz
FFMPEG := $(SRCDIR)/ffmpeg FFMPEG := $(SRCDIR)/ffmpeg
FFMPEG_OBJ32 := ./obj-ffmpeg32 FFMPEG_OBJ32 := ./obj-ffmpeg32
@ -1054,7 +1054,7 @@ $(LSTEAMCLIENT_CONFIGURE_FILES64): $(LSTEAMCLIENT64) $(MAKEFILE_DEP) | $(LSTEAMC
cp ../$(LSTEAMCLIENT64)/Makefile . && \ cp ../$(LSTEAMCLIENT64)/Makefile . && \
echo >> ./Makefile 'SRCDIR := ../$(LSTEAMCLIENT64)' && \ echo >> ./Makefile 'SRCDIR := ../$(LSTEAMCLIENT64)' && \
echo >> ./Makefile 'vpath % $$(SRCDIR)' && \ echo >> ./Makefile 'vpath % $$(SRCDIR)' && \
echo >> ./Makefile 'lsteamclient_dll_LDFLAGS := $$(patsubst %.spec,$$(SRCDIR)/%.spec,$$(lsteamclient_dll_LDFLAGS))' echo >> ./Makefile 'lsteamclient_dll_LDFLAGS := -ldl $$(patsubst %.spec,$$(SRCDIR)/%.spec,$$(lsteamclient_dll_LDFLAGS))'
# 32-bit configure # 32-bit configure
$(LSTEAMCLIENT_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32) $(LSTEAMCLIENT_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32)
@ -1073,7 +1073,7 @@ $(LSTEAMCLIENT_CONFIGURE_FILES32): $(LSTEAMCLIENT32) $(MAKEFILE_DEP) | $(LSTEAMC
cp ../$(LSTEAMCLIENT32)/Makefile . && \ cp ../$(LSTEAMCLIENT32)/Makefile . && \
echo >> ./Makefile 'SRCDIR := ../$(LSTEAMCLIENT32)' && \ echo >> ./Makefile 'SRCDIR := ../$(LSTEAMCLIENT32)' && \
echo >> ./Makefile 'vpath % $$(SRCDIR)' && \ echo >> ./Makefile 'vpath % $$(SRCDIR)' && \
echo >> ./Makefile 'lsteamclient_dll_LDFLAGS := -m32 $$(patsubst %.spec,$$(SRCDIR)/%.spec,$$(lsteamclient_dll_LDFLAGS))' echo >> ./Makefile 'lsteamclient_dll_LDFLAGS := -ldl -m32 $$(patsubst %.spec,$$(SRCDIR)/%.spec,$$(lsteamclient_dll_LDFLAGS))'
## lsteamclient goals ## lsteamclient goals
LSTEAMCLIENT_TARGETS = lsteamclient lsteamclient_configure lsteamclient32 lsteamclient64 lsteamclient_configure32 lsteamclient_configure64 LSTEAMCLIENT_TARGETS = lsteamclient lsteamclient_configure lsteamclient32 lsteamclient64 lsteamclient_configure32 lsteamclient_configure64
@ -1198,7 +1198,8 @@ $(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 gst_base64 $(WINE_OBJ64)
PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR64))/lib/pkgconfig \ PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR64))/lib/pkgconfig \
LD_LIBRARY_PATH=$(abspath $(TOOLS_DIR64))/lib \ LD_LIBRARY_PATH=$(abspath $(TOOLS_DIR64))/lib \
CC=$(CC_QUOTED) \ CC=$(CC_QUOTED) \
CXX=$(CXX_QUOTED) CXX=$(CXX_QUOTED) \
CROSSDEBUG=split-dwarf
# 32-bit configure # 32-bit configure
$(WINE_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32) $(WINE_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32)
@ -1216,7 +1217,8 @@ $(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 gst_base32 $(WINE_OBJ32)
LD_LIBRARY_PATH=$(abspath $(TOOLS_DIR32))/lib \ LD_LIBRARY_PATH=$(abspath $(TOOLS_DIR32))/lib \
CC=$(CC_QUOTED) \ CC=$(CC_QUOTED) \
CXX=$(CXX_QUOTED) \ CXX=$(CXX_QUOTED) \
PKG_CONFIG="$(PKG_CONFIG32)" PKG_CONFIG="$(PKG_CONFIG32)" \
CROSSDEBUG=split-dwarf
## wine goals ## wine goals
WINE_TARGETS = wine wine_configure wine32 wine64 wine_configure32 wine_configure64 WINE_TARGETS = wine wine_configure wine32 wine64 wine_configure32 wine_configure64
@ -1301,7 +1303,7 @@ $(VRCLIENT_CONFIGURE_FILES64): $(MAKEFILE_DEP) $(VRCLIENT) $(VRCLIENT)/vrclient_
cp ./vrclient_x64/Makefile $(abspath $(dir $@)) && \ cp ./vrclient_x64/Makefile $(abspath $(dir $@)) && \
echo >> $(abspath $(dir $@))/Makefile 'SRCDIR := ../$(VRCLIENT)/vrclient_x64' && \ echo >> $(abspath $(dir $@))/Makefile 'SRCDIR := ../$(VRCLIENT)/vrclient_x64' && \
echo >> $(abspath $(dir $@))/Makefile 'vpath % $$(SRCDIR)' && \ echo >> $(abspath $(dir $@))/Makefile 'vpath % $$(SRCDIR)' && \
echo >> $(abspath $(dir $@))/Makefile 'vrclient_x64_dll_LDFLAGS := $$(patsubst %.spec,$$(SRCDIR)/%.spec,$$(vrclient_x64_dll_LDFLAGS))' echo >> $(abspath $(dir $@))/Makefile 'vrclient_x64_dll_LDFLAGS := -ldl $$(patsubst %.spec,$$(SRCDIR)/%.spec,$$(vrclient_x64_dll_LDFLAGS))'
# 32-bit configure # 32-bit configure
$(VRCLIENT_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32) $(VRCLIENT_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32)
@ -1318,7 +1320,7 @@ $(VRCLIENT_CONFIGURE_FILES32): $(MAKEFILE_DEP) $(VRCLIENT32) | $(VRCLIENT_OBJ32)
cp $(VRCLIENT32)/vrclient/Makefile $(dir $@) && \ cp $(VRCLIENT32)/vrclient/Makefile $(dir $@) && \
echo >> $(dir $@)/Makefile 'SRCDIR := ../$(VRCLIENT32)/vrclient' && \ echo >> $(dir $@)/Makefile 'SRCDIR := ../$(VRCLIENT32)/vrclient' && \
echo >> $(dir $@)/Makefile 'vpath % $$(SRCDIR)' && \ echo >> $(dir $@)/Makefile 'vpath % $$(SRCDIR)' && \
echo >> $(dir $@)/Makefile 'vrclient_dll_LDFLAGS := -m32 $$(patsubst %.spec,$$(SRCDIR)/%.spec,$$(vrclient_dll_LDFLAGS))' echo >> $(dir $@)/Makefile 'vrclient_dll_LDFLAGS := -ldl -m32 $$(patsubst %.spec,$$(SRCDIR)/%.spec,$$(vrclient_dll_LDFLAGS))'
## vrclient goals ## vrclient goals

12
lsteamclient/steamclient_main.c
View File

@ -475,37 +475,37 @@ static int load_steamclient(void)
path[PATH_MAX - 1] = 0; path[PATH_MAX - 1] = 0;
} }
#endif #endif
steamclient_lib = wine_dlopen(path, RTLD_NOW, NULL, 0); steamclient_lib = dlopen(path, RTLD_NOW);
if(!steamclient_lib){ if(!steamclient_lib){
ERR("unable to load native steamclient library\n"); ERR("unable to load native steamclient library\n");
return 0; return 0;
} }
steamclient_CreateInterface = wine_dlsym(steamclient_lib, "CreateInterface", NULL, 0); steamclient_CreateInterface = dlsym(steamclient_lib, "CreateInterface");
if(!steamclient_CreateInterface){ if(!steamclient_CreateInterface){
ERR("unable to load CreateInterface method\n"); ERR("unable to load CreateInterface method\n");
return 0; return 0;
} }
steamclient_BGetCallback = wine_dlsym(steamclient_lib, "Steam_BGetCallback", NULL, 0); steamclient_BGetCallback = dlsym(steamclient_lib, "Steam_BGetCallback");
if(!steamclient_BGetCallback){ if(!steamclient_BGetCallback){
ERR("unable to load BGetCallback method\n"); ERR("unable to load BGetCallback method\n");
return 0; return 0;
} }
steamclient_GetAPICallResult = wine_dlsym(steamclient_lib, "Steam_GetAPICallResult", NULL, 0); steamclient_GetAPICallResult = dlsym(steamclient_lib, "Steam_GetAPICallResult");
if(!steamclient_GetAPICallResult){ if(!steamclient_GetAPICallResult){
ERR("unable to load GetAPICallResult method\n"); ERR("unable to load GetAPICallResult method\n");
return 0; return 0;
} }
steamclient_FreeLastCallback = wine_dlsym(steamclient_lib, "Steam_FreeLastCallback", NULL, 0); steamclient_FreeLastCallback = dlsym(steamclient_lib, "Steam_FreeLastCallback");
if(!steamclient_FreeLastCallback){ if(!steamclient_FreeLastCallback){
ERR("unable to load FreeLastCallback method\n"); ERR("unable to load FreeLastCallback method\n");
return 0; return 0;
} }
steamclient_ReleaseThreadLocalMemory = wine_dlsym(steamclient_lib, "Steam_ReleaseThreadLocalMemory", NULL, 0); steamclient_ReleaseThreadLocalMemory = dlsym(steamclient_lib, "Steam_ReleaseThreadLocalMemory");
if(!steamclient_ReleaseThreadLocalMemory){ if(!steamclient_ReleaseThreadLocalMemory){
ERR("unable to load ReleaseThreadLocalMemory method\n"); ERR("unable to load ReleaseThreadLocalMemory method\n");
return 0; return 0;

6
proton
View File

@ -18,7 +18,7 @@ from filelock import FileLock
#To enable debug logging, copy "user_settings.sample.py" to "user_settings.py" #To enable debug logging, copy "user_settings.sample.py" to "user_settings.py"
#and edit it if needed. #and edit it if needed.
CURRENT_PREFIX_VERSION="5.0-1" CURRENT_PREFIX_VERSION="5.13-1"
PFX="Proton: " PFX="Proton: "
ld_path_var = "LD_LIBRARY_PATH" ld_path_var = "LD_LIBRARY_PATH"
@ -495,7 +495,6 @@ class Session:
self.check_environment("PROTON_NO_FSYNC", "nofsync") self.check_environment("PROTON_NO_FSYNC", "nofsync")
self.check_environment("PROTON_FORCE_LARGE_ADDRESS_AWARE", "forcelgadd") self.check_environment("PROTON_FORCE_LARGE_ADDRESS_AWARE", "forcelgadd")
self.check_environment("PROTON_OLD_GL_STRING", "oldglstr") self.check_environment("PROTON_OLD_GL_STRING", "oldglstr")
self.check_environment("PROTON_USE_SECCOMP", "seccomp")
self.check_environment("PROTON_NO_WRITE_WATCH", "nowritewatch") self.check_environment("PROTON_NO_WRITE_WATCH", "nowritewatch")
if "noesync" in self.compat_config: if "noesync" in self.compat_config:
@ -508,9 +507,6 @@ class Session:
else: else:
self.env["WINEFSYNC"] = "1" self.env["WINEFSYNC"] = "1"
if "seccomp" in self.compat_config:
self.env["WINESECCOMP"] = "1"
if "nowritewatch" in self.compat_config: if "nowritewatch" in self.compat_config:
self.env["WINE_DISABLE_WRITE_WATCH"] = "1" self.env["WINE_DISABLE_WRITE_WATCH"] = "1"

6
vrclient_x64/vrclient_x64/vrclient_main.c
View File

@ -258,19 +258,19 @@ static int load_vrclient(void)
TRACE("got openvr runtime path: %s\n", pathU); TRACE("got openvr runtime path: %s\n", pathU);
vrclient_lib = wine_dlopen(pathU, RTLD_NOW, NULL, 0); vrclient_lib = dlopen(pathU, RTLD_NOW);
if(!vrclient_lib){ if(!vrclient_lib){
TRACE("unable to load vrclient.so\n"); TRACE("unable to load vrclient.so\n");
return 0; return 0;
} }
vrclient_HmdSystemFactory = wine_dlsym(vrclient_lib, "HmdSystemFactory", NULL, 0); vrclient_HmdSystemFactory = dlsym(vrclient_lib, "HmdSystemFactory");
if(!vrclient_HmdSystemFactory){ if(!vrclient_HmdSystemFactory){
ERR("unable to load HmdSystemFactory method\n"); ERR("unable to load HmdSystemFactory method\n");
return 0; return 0;
} }
vrclient_VRClientCoreFactory = wine_dlsym(vrclient_lib, "VRClientCoreFactory", NULL, 0); vrclient_VRClientCoreFactory = dlsym(vrclient_lib, "VRClientCoreFactory");
if(!vrclient_VRClientCoreFactory){ if(!vrclient_VRClientCoreFactory){
ERR("unable to load VRClientCoreFactory method\n"); ERR("unable to load VRClientCoreFactory method\n");
return 0; return 0;

2
wine

@ -1 +1 @@
Subproject commit e9264df6e63b5df87d81e950675df7290ad43615 Subproject commit 6ca10669d635a15b39ea94fe57a1de34b2ad3b46