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 6.3

Browse Source
This commit is contained in:
Andrew Eikum 2021-03-03 12:18:05 -06:00
parent 7c91f57ec9
commit 8398ebded4
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/makefile_base.mak
View File

@ -173,11 +173,11 @@ COMPAT_MANIFEST_TEMPLATE := $(SRCDIR)/compatibilitytool.vdf.template
LICENSE := $(SRCDIR)/dist.LICENSE LICENSE := $(SRCDIR)/dist.LICENSE
OFL_LICENSE := $(SRCDIR)/fonts/liberation-fonts/LICENSE OFL_LICENSE := $(SRCDIR)/fonts/liberation-fonts/LICENSE
GECKO_VER := 2.47.1 GECKO_VER := 2.47.2
GECKO32_TARBALL := wine-gecko-$(GECKO_VER)-x86.tar.bz2 GECKO32_TARBALL := wine-gecko-$(GECKO_VER)-x86.tar.xz
GECKO64_TARBALL := wine-gecko-$(GECKO_VER)-x86_64.tar.bz2 GECKO64_TARBALL := wine-gecko-$(GECKO_VER)-x86_64.tar.xz
WINEMONO_VER := 5.1.1 WINEMONO_VER := 6.1.1
WINEMONO_TARBALL := wine-mono-$(WINEMONO_VER)-x86.tar.xz WINEMONO_TARBALL := wine-mono-$(WINEMONO_VER)-x86.tar.xz
GST_ORC := $(SRCDIR)/gst-orc GST_ORC := $(SRCDIR)/gst-orc
@ -1227,7 +1227,6 @@ $(WINE_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL)
$(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 jxrlib64 gst_base64 $(WINE_OBJ64) $(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 jxrlib64 gst_base64 $(WINE_OBJ64)
cd $(dir $@) && \ cd $(dir $@) && \
../$(WINE)/configure \ ../$(WINE)/configure \
--without-curses \
--enable-win64 \ --enable-win64 \
--disable-tests \ --disable-tests \
--prefix=$(abspath $(DST_DIR)) \ --prefix=$(abspath $(DST_DIR)) \
@ -1248,7 +1247,6 @@ $(WINE_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL)
$(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 jxrlib32 gst_base32 $(WINE_OBJ32) $(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 jxrlib32 gst_base32 $(WINE_OBJ32)
cd $(dir $@) && \ cd $(dir $@) && \
../$(WINE)/configure \ ../$(WINE)/configure \
--without-curses \
--disable-tests \ --disable-tests \
--prefix=$(abspath $(WINE_DST32)) \ --prefix=$(abspath $(WINE_DST32)) \
LD_LIBRARY_PATH=$(abspath $(TOOLS_DIR32))/lib \ LD_LIBRARY_PATH=$(abspath $(TOOLS_DIR32))/lib \

1
lsteamclient/steamclient_main.c
View File

@ -10,7 +10,6 @@
#include "winnls.h" #include "winnls.h"
#include "winuser.h" #include "winuser.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/library.h"
#include "wine/list.h" #include "wine/list.h"
#include "steam_defs.h" #include "steam_defs.h"

3
proton
View File

@ -20,7 +20,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.13-1" CURRENT_PREFIX_VERSION="6.3-1"
PFX="Proton: " PFX="Proton: "
ld_path_var = "LD_LIBRARY_PATH" ld_path_var = "LD_LIBRARY_PATH"
@ -606,7 +606,6 @@ class Session:
self.dlloverrides = { self.dlloverrides = {
"steam.exe": "b", #always use our special built-in steam.exe "steam.exe": "b", #always use our special built-in steam.exe
"dotnetfx35.exe": "b", #replace the broken installer, as does Windows "dotnetfx35.exe": "b", #replace the broken installer, as does Windows
"mfplay": "n" #disable built-in mfplay
} }
self.compat_config = set() self.compat_config = set()

1
vrclient_x64/vrclient_x64/vrclient_main.c
View File

@ -9,7 +9,6 @@
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/library.h"
#include "vrclient_defs.h" #include "vrclient_defs.h"
#include "vrclient_private.h" #include "vrclient_private.h"

2
wine

@ -1 +1 @@
Subproject commit c14054e6923c3cbb4163c24ce41fcf2d0815e84b Subproject commit 3da025c3b623c415f61e3200c4ec77554e1ab7d7