diff --git a/patches/protonprep-nofshack.sh b/patches/protonprep-nofshack.sh index 390274b81..df2b5de22 100755 --- a/patches/protonprep-nofshack.sh +++ b/patches/protonprep-nofshack.sh @@ -70,8 +70,7 @@ git clean -xdf echo "rawinput staging rebase" - patch -Np1 < ../patches/wine-hotfixes/0001-rawinput-staging-rebase.patch - #patch -Np1 < ../patches/wine-hotfixes/0001-rawinput-staging-rebase-include-keyboard.patch + patch -Np1 < ../patches/wine-hotfixes/staging-restore-rawinput-hidewineexports-threadtime.patch cd .. #WINE @@ -97,9 +96,9 @@ echo "winevulkan hotfixes pending" patch -Np1 < ../patches/wine-hotfixes/pending/winevulkan-dont_initialize_vulkan_driver_in_dllmain.patch - echo "rawinput pending" - patch -Np1 < ../patches/wine-hotfixes/pending/rawinput-pending-upstream.patch - + echo "rawinput backports" + patch -Np1 < ../patches/wine-hotfixes/pending/rawinput_backports.patch + echo "applying staging patches" ../wine-staging/patches/patchinstall.sh DESTDIR="." --all \ -W server-Desktop_Refcount \ @@ -113,6 +112,18 @@ echo "planet zoo/jurassic world hotfixes pending" patch -Np1 < ../patches/wine-hotfixes/pending/planet-zoo-jurassic-world-pending-upstream-staging.patch + + echo "nvidia locale backports" + patch -Np1 < ../patches/wine-hotfixes/pending/nvidia_locale_fix.patch + + echo "evr/mf/quartz backports" + patch -Np1 < ../patches/wine-hotfixes/pending/evr_mf_quartz_pending.patch + + echo "winhttp backports" + patch -Np1 < ../patches/wine-hotfixes/pending/winhttp_backports.patch + + echo "Indiana Jones and the Emperor's Tomb pending" + patch -Np1 < ../patches/wine-hotfixes/pending/indiana_jones_fix.patch #WINE FAUDIO #echo "applying faudio patches" @@ -146,9 +157,9 @@ echo "mk11 patch" patch -Np1 < ../patches/game-patches/mk11.patch -# Disabled for now. The game uses CEG which does not work in proton. -# echo "blackops 2 fix" -# patch -Np1 < ../patches/game-patches/blackops_2_fix.patch +# The game uses CEG which does not work in proton. + echo "blackops 2 fix" + patch -Np1 < ../patches/game-patches/blackops_2_fix.patch ### END GAME PATCH SECTION ### diff --git a/proton b/proton index 0bb4b23d9..23faa9146 100755 --- a/proton +++ b/proton @@ -18,7 +18,7 @@ from filelock import FileLock #To enable debug logging, copy "user_settings.sample.py" to "user_settings.py" #and edit it if needed. -CURRENT_PREFIX_VERSION="5.11-GE-2-MF" +CURRENT_PREFIX_VERSION="5.11-GE-3-MF" PFX="Proton: " ld_path_var = "LD_LIBRARY_PATH"