Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ Heroic would not be possible without the work done in many other projects:
- Nile: https://github.com/imLinguin/nile
- Comet: https://github.com/imLinguin/comet
- GE-Proton: https://github.com/GloriousEggroll/proton-ge-custom
- Proton-Sarek: https://github.com/pythonlover02/Proton-Sarek
- umu-launcher: https://github.com/Open-Wine-Components/umu-launcher
- DXVK: https://github.com/doitsujin/dxvk
- VKD3D: https://github.com/HansKristian-Work/vkd3d-proton
Expand Down
1 change: 1 addition & 0 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,7 @@
},
"wineExplanation": {
"proton-ge": "GE-Proton is a Proton variant created by Glorious Eggroll. It is meant to be used along with the umu launcher (default in Heroic).",
"proton-sarek": "Proton-Sarek is a Proton variant created by pythonlover02. It is meant to be used with GPUs that do not support Vulkan 1.3+.",
"wine-ge": "Wine-GE-Proton is a Wine variant created by Glorious Eggroll. It has been deprecated in favor of GE-Proton with the umu launcher."
},
"winetricks": {
Expand Down
4 changes: 2 additions & 2 deletions src/backend/tools/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ function getDxvkUrl(): string {
}
if (any_gpu_supports_version([1, 1, 0])) {
logInfo(
'The GPU(s) in this system only support Vulkan 1.1/1.2, falling back to DXVK 1.10.3',
'The GPU(s) in this system only support Vulkan 1.1/1.2, falling back to DXVK 1.10.3 for Wine, or use Proton-Sarek.',
LogPrefix.ToolInstaller
)
return 'https://api.github.com/repos/doitsujin/dxvk/releases/tags/v1.10.3'
Expand Down Expand Up @@ -851,7 +851,7 @@ function getVkd3dUrl(): string {
}
if (any_gpu_supports_version([1, 1, 0])) {
logInfo(
'The GPU(s) in this system only support Vulkan 1.1/1.2, falling back to VKD3D 2.6',
'The GPU(s) in this system only support Vulkan 1.1/1.2, falling back to VKD3D 2.6 for Wine, or use Proton-Sarek.',
LogPrefix.ToolInstaller
)
return 'https://api.github.com/repos/Heroic-Games-Launcher/vkd3d-proton/releases/tags/v2.6'
Expand Down
4 changes: 4 additions & 0 deletions src/backend/wine/manager/downloader/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@ export const WINESTAGINGMACOS_URL =
/// Url to Game Porting Toolkit from Gcenx github release page
export const GPTK_URL =
'https://api.github.com/repos/Gcenx/game-porting-toolkit/releases'

/// Url for Proton Sarek github release page
export const PROTON_SAREK_URL =
'https://api.github.com/repos/pythonlover02/Proton-Sarek/releases'
18 changes: 17 additions & 1 deletion src/backend/wine/manager/downloader/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import {
WINELUTRIS_URL,
WINECROSSOVER_URL,
WINESTAGINGMACOS_URL,
GPTK_URL
GPTK_URL,
PROTON_SAREK_URL
} from './constants'
import { VersionInfo, Repositorys, WineVersionInfo } from 'common/types'
import {
Expand Down Expand Up @@ -150,6 +151,21 @@ async function getAvailableVersions({
})
break
}
case Repositorys.PROTONSAREK: {
await fetchReleases({
url: PROTON_SAREK_URL,
type: 'Proton-Sarek',
count: count
})
.then((fetchedReleases: VersionInfo[]) => {
console.log(fetchedReleases)
releases.push(...fetchedReleases)
})
.catch((error: Error) => {
logError(error, LogPrefix.WineDownloader)
})
break
}
default: {
logWarning(
`Unknown and not supported repository key passed! Skip fetch for ${repo}`,
Expand Down
13 changes: 12 additions & 1 deletion src/backend/wine/manager/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ function getLatestLocalVersions(): Record<string, string | undefined> {
?.date,
latestGEProton: localWines.find(
(wine) => wine.version === 'GE-Proton-latest'
)?.date,
latestProtonSarek: localWines.find(
(wine) => wine.version === 'Proton-Sarek-latest'
)?.date
}
}
Expand Down Expand Up @@ -104,6 +107,14 @@ export function updateWineListsIfOutdated(releasesData: ReleasesInfo) {
)
)
repositoriesToFetch.push(Repositorys.WINEGE)

if (
localVersionIsOlder(
latestLocalVersions.latestProtonSarek,
releasesData['proton-sarek']
)
)
repositoriesToFetch.push(Repositorys.PROTONSAREK)
}

if (isMac) {
Expand Down Expand Up @@ -155,7 +166,7 @@ async function updateWineVersionInfos(
Repositorys.WINESTAGINGMACOS,
Repositorys.GPTK
]
: [Repositorys.WINEGE, Repositorys.PROTONGE]
: [Repositorys.WINEGE, Repositorys.PROTONGE, Repositorys.PROTONSAREK]
}

await getAvailableVersions({
Expand Down
5 changes: 4 additions & 1 deletion src/common/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,7 @@ export type Type =
| 'Wine-GE'
| 'GE-Proton'
| 'Proton'
| 'Proton-Sarek'
| 'Wine-Lutris'
| 'Wine-Kron4ek'
| 'Wine-Crossover'
Expand Down Expand Up @@ -775,7 +776,8 @@ export enum Repositorys {
WINELUTRIS,
WINECROSSOVER,
WINESTAGINGMACOS,
GPTK
GPTK,
PROTONSAREK
}

export type WineManagerStatus =
Expand Down Expand Up @@ -850,6 +852,7 @@ export type ReleasesInfo = Record<
| 'game-porting-toolkit'
| 'wine-staging'
| 'wine-crossover'
| 'proton-sarek'
| 'dxvk'
| 'dxvk-mac'
| 'dxmt'
Expand Down
11 changes: 11 additions & 0 deletions src/frontend/screens/WineManager/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export default function WineManager(): JSX.Element | null {
WineManagerUISettings[]
>([
protonge,
{ type: 'Proton-Sarek', value: 'protonsarek', enabled: isLinux },
{ type: 'Wine-GE', value: 'winege', enabled: isLinux },
gamePortingToolkit,
wineCrossover,
Expand Down Expand Up @@ -160,6 +161,16 @@ export default function WineManager(): JSX.Element | null {
)}
</div>
)
case 'Proton-Sarek':
return (
<div className="infoBox">
<FontAwesomeIcon icon={faCheck} color={'green'} />
{t(
'wineExplanation.proton-sarek',
'Proton-Sarek is a Proton variant created by pythonlover02. It is meant to be used with GPUs that do not support Vulkan 1.3+.'
)}
</div>
)
default:
return <></>
}
Expand Down
Loading