From 852d4a662c31cdb4e4cd152531c77b21aa9ae800 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Sat, 5 Mar 2022 22:25:49 +0200 Subject: [PATCH] Updated wine and dxvk versions - added `GE-Proton 7-5`, `7-6`, `7-7` and `7-8` `7-6` and `7-7` versions are not recommended because contain some bugs fixed in the next versions - added `Wine-GE-Proton 7-1`, `7-2`, `7-3`, `7-4`, `7-5` `7-3` and `7-4` versions are hidden by the same reason - added `dxvk 1.10` - made `Wine-GE-Proton 7-5` and `dxvk 1.10` default to use --- public/dxvks.yaml | 4 + public/runners.yaml | 145 +++++++++++++++++++++++--- src/ts/launcher/states/InstallDXVK.ts | 10 +- src/ts/launcher/states/InstallWine.ts | 8 +- 4 files changed, 141 insertions(+), 26 deletions(-) diff --git a/public/dxvks.yaml b/public/dxvks.yaml index fa8a268..4a35a3f 100644 --- a/public/dxvks.yaml +++ b/public/dxvks.yaml @@ -1,3 +1,7 @@ +- version: '1.10' + uri: https://github.com/doitsujin/dxvk/releases/download/v1.10/dxvk-1.10.tar.gz + recommended: true + - version: '1.9.4' uri: https://github.com/doitsujin/dxvk/releases/download/v1.9.4/dxvk-1.9.4.tar.gz recommended: true diff --git a/public/runners.yaml b/public/runners.yaml index d505a24..40d663d 100644 --- a/public/runners.yaml +++ b/public/runners.yaml @@ -1,8 +1,71 @@ -# Wine-GE versions -- title: Wine-GE +# Wine-GE-Proton versions +- title: Wine-GE-Proton runners: + # Wine-GE-Proton 7-5 + - family: Wine-GE-Proton + name: lutris-GE-Proton7-5-x86_64 + title: Wine-GE-Proton 7-5 + uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/GE-Proton7-5/wine-lutris-GE-Proton7-5-x86_64.tar.xz + files: + wine: bin/wine64 + wineserver: bin/wineserver + winecfg: lib64/wine/x86_64-windows/winecfg.exe + recommended: true + + # Wine-GE-Proton 7-4 + - family: Wine-GE-Proton + name: lutris-GE-Proton7-4-x86_64 + title: Wine-GE-Proton 7-4 + uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/GE-Proton7-4/wine-lutris-GE-Proton7-4-x86_64.tar.xz + files: + wine: bin/wine64 + wineserver: bin/wineserver + winecfg: lib64/wine/x86_64-windows/winecfg.exe + + # Wine-GE-Proton 7-5 includes hotfix, so 7-4 is hidden + recommended: false + + # Wine-GE-Proton 7-3 + - family: Wine-GE-Proton + name: lutris-GE-Proton7-3-x86_64 + title: Wine-GE-Proton 7-3 + uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/GE-Proton7-3/wine-lutris-GE-Proton7-3-x86_64.tar.xz + files: + wine: bin/wine64 + wineserver: bin/wineserver + winecfg: lib64/wine/x86_64-windows/winecfg.exe + + # Wine-GE-Proton 7-4 includes hotfix, so 7-3 is hidden + recommended: false + + # Wine-GE-Proton 7-2 + - family: Wine-GE-Proton + name: lutris-GE-Proton7-2-x86_64 + title: Wine-GE-Proton 7-2 + uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/GE-Proton7-2/wine-lutris-GE-Proton7-2-x86_64.tar.xz + files: + wine: bin/wine64 + wineserver: bin/wineserver + winecfg: lib64/wine/x86_64-windows/winecfg.exe + recommended: true + + # Wine-GE-Proton 7-1 + - family: Wine-GE-Proton + name: lutris-GE-Proton7-1-x86_64 + title: Wine-GE-Proton 7-1 + uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/GE-Proton7-1/wine-lutris-GE-Proton7-1-x86_64.tar.xz + files: + wine: bin/wine64 + wineserver: bin/wineserver + winecfg: lib64/wine/x86_64-windows/winecfg.exe + recommended: true + + # Project versioning (and name) was changed + # https://github.com/GloriousEggroll/wine-ge-custom/releases/tag/GE-Proton7-1 + # https://www.patreon.com/posts/changing-wine-63101415 + # Wine-GE 7.2-2 - - family: Wine-GE + - family: Wine-GE-Proton name: lutris-ge-7.2-2-x86_64 title: Wine 7.2 GE 2 uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/7.2-GE-2/wine-lutris-ge-7.2-2-x86_64.tar.xz @@ -13,7 +76,7 @@ recommended: true # Wine-GE 7.2-1 - - family: Wine-GE + - family: Wine-GE-Proton name: lutris-ge-7.2-1-x86_64 title: Wine 7.2 GE 1 uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/7.2-GE-1/wine-lutris-ge-7.2-1-x86_64.tar.xz @@ -24,7 +87,7 @@ recommended: true # Wine-GE 7.1-1 - - family: Wine-GE + - family: Wine-GE-Proton name: lutris-ge-7.1-1-x86_64 title: Wine 7.1 GE 1 uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/7.1-GE-1/wine-lutris-ge-7.1-1-x86_64.tar.xz @@ -35,7 +98,7 @@ recommended: true # Wine-GE 6.21-1 - - family: Wine-GE + - family: Wine-GE-Proton name: lutris-ge-6.21-1-x86_64 title: Wine 6.21 GE 1 uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/6.21-GE-1/wine-lutris-ge-6.21-1-x86_64.tar.xz @@ -46,7 +109,7 @@ recommended: false # Wine-GE 6.20-1 - - family: Wine-GE + - family: Wine-GE-Proton name: lutris-ge-6.20-1-x86_64 title: Wine 6.20 GE 1 uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/6.20-GE-1/wine-lutris-ge-6.20-1-x86_64.tar.xz @@ -54,10 +117,10 @@ wine: bin/wine64 wineserver: bin/wineserver winecfg: lib64/wine/x86_64-windows/winecfg.exe - recommended: true + recommended: false # works, but outdated # Wine-GE 6.19-1 - - family: Wine-GE + - family: Wine-GE-Proton name: lutris-ge-6.19-1-x86_64 title: Wine 6.19 GE 1 uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/6.19-GE-1/wine-lutris-ge-6.19-1-x86_64.tar.xz @@ -65,10 +128,10 @@ wine: bin/wine64 wineserver: bin/wineserver winecfg: lib64/wine/x86_64-windows/winecfg.exe - recommended: true + recommended: false # works, but outdated # Wine-GE 6.18-1 - - family: Wine-GE + - family: Wine-GE-Proton name: lutris-ge-6.18-1-x86_64 title: Wine 6.18 GE 1 uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/6.18-GE-1/wine-lutris-ge-6.18-1-x86_64.tar.xz @@ -76,10 +139,10 @@ wine: bin/wine64 wineserver: bin/wineserver winecfg: lib64/wine/x86_64-windows/winecfg.exe - recommended: true + recommended: false # works, but outdated # Wine-GE 6.16-1 - - family: Wine-GE + - family: Wine-GE-Proton name: lutris-ge-6.16-1-x86_64 title: Wine 6.16 GE 1 uri: https://github.com/GloriousEggroll/wine-ge-custom/releases/download/6.16-GE-1/lutris-ge-6.16-1-x86_64.tar.xz @@ -249,6 +312,54 @@ # GE-Proton versions - title: GE-Proton runners: + # GE-Proton 7-8 + - family: GE-Proton + name: GE-Proton7-8 + title: GE-Proton 7-8 + uri: https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-8/GE-Proton7-8.tar.gz + files: + wine: files/bin/wine64 + wineserver: files/bin/wineserver + winecfg: files/lib64/wine/x86_64-windows/winecfg.exe + recommended: true + + # GE-Proton 7-7 + - family: GE-Proton + name: GE-Proton7-7 + title: GE-Proton 7-7 + uri: https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-7/GE-Proton7-7.tar.gz + files: + wine: files/bin/wine64 + wineserver: files/bin/wineserver + winecfg: files/lib64/wine/x86_64-windows/winecfg.exe + + # GE-Proton 7-8 includes hotfix, so 7-7 is hidden + recommended: false + + # GE-Proton 7-6 + - family: GE-Proton + name: GE-Proton7-6 + title: GE-Proton 7-6 + uri: https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-6/GE-Proton7-6.tar.gz + files: + wine: files/bin/wine64 + wineserver: files/bin/wineserver + winecfg: files/lib64/wine/x86_64-windows/winecfg.exe + + # GE-Proton 7-7 includes hotfix, so 7-6 is hidden + recommended: false + + # GE-Proton 7-5 + - family: GE-Proton + name: GE-Proton7-5 + title: GE-Proton 7-5 + uri: https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-5/GE-Proton7-5.tar.gz + files: + wine: files/bin/wine64 + wineserver: files/bin/wineserver + winecfg: files/lib64/wine/x86_64-windows/winecfg.exe + recommended: true + # GE-Proton 7-4 - family: GE-Proton name: GE-Proton7-4 @@ -310,7 +421,7 @@ wine: files/bin/wine64 wineserver: files/bin/wineserver winecfg: files/lib64/wine/x86_64-windows/winecfg.exe - recommended: true + recommended: false # works, but outdated # Proton-GE 7.2-1 - family: GE-Proton @@ -321,7 +432,7 @@ wine: files/bin/wine64 wineserver: files/bin/wineserver winecfg: files/lib64/wine/x86_64-windows/winecfg.exe - recommended: true + recommended: false # works, but outdated # Proton-GE 7.1-2 - family: GE-Proton @@ -332,7 +443,7 @@ wine: files/bin/wine64 wineserver: files/bin/wineserver winecfg: files/lib64/wine/x86_64-windows/winecfg.exe - recommended: true + recommended: false # works, but outdated # Proton-GE 7.1-1 - family: GE-Proton @@ -343,7 +454,7 @@ wine: files/bin/wine64 wineserver: files/bin/wineserver winecfg: files/lib64/wine/x86_64-windows/winecfg.exe - recommended: true + recommended: false # works, but outdated # Proton-GE 6.21-2 - family: GE-Proton diff --git a/src/ts/launcher/states/InstallDXVK.ts b/src/ts/launcher/states/InstallDXVK.ts index 9d2fb32..3ec6a73 100644 --- a/src/ts/launcher/states/InstallDXVK.ts +++ b/src/ts/launcher/states/InstallDXVK.ts @@ -9,9 +9,9 @@ export default (launcher: Launcher): Promise => { import('./CreatePrefix').then((module) => { module.default(launcher).then(() => { // And then download the DXVK - DXVK.download('1.9.4').then((stream) => { + DXVK.download('1.10').then((stream) => { launcher.progressBar?.init({ - label: 'Downloading DXVK 1.9.4...', + label: 'Downloading DXVK 1.10...', showSpeed: true, showEta: true, showPercents: true, @@ -28,7 +28,7 @@ export default (launcher: Launcher): Promise => { stream?.unpackStart(() => { launcher.progressBar?.init({ - label: () => unpacking ? 'Unpacking DXVK 1.9.4...' : 'Applying DXVK 1.9.4...', + label: () => unpacking ? 'Unpacking DXVK 1.10...' : 'Applying DXVK 1.10...', showSpeed: true, showEta: true, showPercents: true, @@ -44,10 +44,10 @@ export default (launcher: Launcher): Promise => { unpacking = false; // Select this DXVK - await DXVK.current('1.9.4'); + await DXVK.current('1.10'); // And apply it - DXVK.apply(await constants.paths.prefix.current, '1.9.4').then(() => { + DXVK.apply(await constants.paths.prefix.current, '1.10').then(() => { launcher.progressBar?.hide(); resolve(); diff --git a/src/ts/launcher/states/InstallWine.ts b/src/ts/launcher/states/InstallWine.ts index 7a61e37..048095c 100644 --- a/src/ts/launcher/states/InstallWine.ts +++ b/src/ts/launcher/states/InstallWine.ts @@ -5,9 +5,9 @@ import DXVK from '../../core/DXVK'; export default (launcher: Launcher): Promise => { return new Promise(async (resolve) => { - Runners.download('lutris-ge-7.2-2-x86_64').then((stream) => { + Runners.download('lutris-GE-Proton7-5-x86_64').then((stream) => { launcher.progressBar?.init({ - label: 'Downloading Wine-GE 7.2-2...', + label: 'Downloading Wine-GE-Proton 7-5...', showSpeed: true, showEta: true, showPercents: true, @@ -22,7 +22,7 @@ export default (launcher: Launcher): Promise => { stream?.unpackStart(() => { launcher.progressBar?.init({ - label: 'Unpacking Wine-GE 7.2-2...', + label: 'Unpacking Wine-GE-Proton 7-5...', showSpeed: true, showEta: true, showPercents: true, @@ -36,7 +36,7 @@ export default (launcher: Launcher): Promise => { stream?.unpackFinish(async () => { // Select this runner - await Runners.current('lutris-ge-7.2-2-x86_64'); + await Runners.current('lutris-GE-Proton7-5-x86_64'); // Create prefix if it is not created import('./CreatePrefix').then((module) => {