Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-07-29 16:41:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update wine to proton_7.0-dev.

Browse Source
This commit is contained in:
Rémi Bernon 2021-12-13 10:54:03 +01:00 committed by Arkadiusz Hiler
parent 8ea9fabd02
commit f38c68b43b
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/makefile_base.mak
View File

@ -669,7 +669,6 @@ WINE_SOURCE_ARGS = \
WINE_CONFIGURE_ARGS = \ WINE_CONFIGURE_ARGS = \
--with-mingw \ --with-mingw \
--without-xpresent \
--disable-tests --disable-tests
WINE_CONFIGURE_ARGS64 = --enable-win64 WINE_CONFIGURE_ARGS64 = --enable-win64

6
default_pfx.py
View File

@ -59,15 +59,13 @@ def setup_dll_symlinks(default_pfx_dir, dist_dir):
if os.path.isfile(filename) and file_is_wine_builtin_dll(filename): if os.path.isfile(filename) and file_is_wine_builtin_dll(filename):
bitness = dll_bitness(filename) bitness = dll_bitness(filename)
if bitness == 32: if bitness == 32:
libdir = os.path.join(dist_dir, 'lib/wine') libdir = os.path.join(dist_dir, 'lib/wine/i386-windows')
elif bitness == 64: elif bitness == 64:
libdir = os.path.join(dist_dir, 'lib64/wine') libdir = os.path.join(dist_dir, 'lib64/wine/x86_64-windows')
else: else:
continue continue
if os.path.exists(os.path.join(libdir, file_)): if os.path.exists(os.path.join(libdir, file_)):
target = os.path.join(libdir, file_) target = os.path.join(libdir, file_)
elif os.path.exists(os.path.join(libdir, 'fakedlls', file_)):
target = os.path.join(libdir, 'fakedlls', file_)
else: else:
continue continue
os.unlink(filename) os.unlink(filename)

13
proton
View File

@ -30,7 +30,7 @@ from random import randrange
#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="6.3-3" CURRENT_PREFIX_VERSION="7.0-100"
PFX="Proton: " PFX="Proton: "
ld_path_var = "LD_LIBRARY_PATH" ld_path_var = "LD_LIBRARY_PATH"
@ -57,7 +57,16 @@ def log(msg):
def file_is_wine_builtin_dll(path): def file_is_wine_builtin_dll(path):
if os.path.islink(path): if os.path.islink(path):
contents = os.readlink(path) contents = os.readlink(path)
if os.path.dirname(contents).endswith(('/lib/wine/i386-unix', '/lib/wine/i386-windows', '/lib64/wine/x86_64-unix', '/lib64/wine/x86_64-windows')): if os.path.dirname(contents).endswith((
'/lib/wine',
'/lib64/wine',
'/lib/wine/fakedlls',
'/lib64/wine/fakedlls',
'/lib/wine/i386-unix',
'/lib/wine/i386-windows',
'/lib64/wine/x86_64-unix',
'/lib64/wine/x86_64-windows'
)):
# This may be a broken link to a dll in a removed Proton install # This may be a broken link to a dll in a removed Proton install
return True return True
if not os.path.exists(path): if not os.path.exists(path):

2
wine

@ -1 +1 @@
Subproject commit cea3e779fb907915c55955140931633c7e9989c3 Subproject commit 27c9176fe348fcf05f972f72df331c967b32adb4