Merge branch 'main' into ventura-alpha

This commit is contained in:
Mykola Grymalyuk
2022-08-06 10:13:15 -06:00
4 changed files with 13 additions and 30 deletions

View File

@@ -1,6 +1,11 @@
# OpenCore Legacy Patcher changelog
## 0.4.11
## 0.4.10
- Resolve Nvidia Kepler support in macOS 12.5 Beta 3 and newer
- Increment Binaries:
- PatcherSupportPkg 0.5.2 - release
- Ventura Specific Updates:

View File

@@ -279,7 +279,7 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
},
},
},
"Nvidia Kepler (Kernel Space)": {
"Nvidia Kepler": {
"Display Name": "Graphics: Nvidia Kepler",
"OS Support": {
"Minimum OS Support": {
@@ -299,36 +299,15 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
"NVDAGK100Hal.kext": "12.0 Beta 6",
"NVDAResman.kext": "12.0 Beta 6",
"NVDAStartup.kext": "12.0 Beta 6",
},
},
},
# With macOS 12.5 Beta 3, Apple broke Metal rendering with Kepler
# Specifically, MPSImage/MPSCore stall out trying to render the desktop.
# This will eventually trigger the watchdog, and kick the user back to the login screen.
#
# Reference
# - https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1004
"Nvidia Kepler (Userspace)": {
"Display Name": "",
"OS Support": {
"Minimum OS Support": {
# 12.0 beta 7 (XNU 21.1)
"OS Major": os_data.os_data.monterey,
"OS Minor": 1
},
"Maximum OS Support": {
# 12.5 (XNU 21.6)
"OS Major": os_data.os_data.monterey,
"OS Minor": 5
},
},
"Install": {
"/System/Library/Extensions": {
"GeForceAIRPlugin.bundle": "11.0 Beta 3",
"GeForceGLDriver.bundle": "11.0 Beta 3",
"GeForceMTLDriver.bundle": "11.0 Beta 3",
"GeForceVADriver.bundle": "12.0 Beta 6",
},
"/System/Library/Frameworks": {
# XNU 21.6 (macOS 12.5)
**({ "Metal.framework": "12.5 Beta 2"} if os_data.os_conversion.is_os_newer(os_data.os_data.monterey, 5, os_major, os_minor) else {})
},
},
},
"Nvidia Web Drivers": {

View File

@@ -12,8 +12,8 @@ from data import os_data
class Constants:
def __init__(self):
# Patcher Versioning
self.patcher_version = "0.4.10" # OpenCore-Legacy-Patcher
self.patcher_support_pkg_version = "0.5.1" # PatcherSupportPkg
self.patcher_version = "0.4.11" # OpenCore-Legacy-Patcher
self.patcher_support_pkg_version = "0.5.2" # PatcherSupportPkg
self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/"
self.nightly_url_patcher_support_pkg = "https://nightly.link/dortania/PatcherSupportPkg/workflows/build/master/"
self.discord_link = "https://discord.gg/rqdPgH8xSN"

View File

@@ -407,8 +407,7 @@ class detect_root_patch:
if hardware_details["Graphics: Nvidia Kepler"] is True:
required_patches.update({"Metal Common": all_hardware_patchset["Graphics"]["Metal Common"]})
required_patches.update({"Modern GVA": all_hardware_patchset["Graphics"]["Modern GVA"]})
required_patches.update({"Nvidia Kepler (Kernel Space)": all_hardware_patchset["Graphics"]["Nvidia Kepler (Kernel Space)"]})
required_patches.update({"Nvidia Kepler (Userspace)": all_hardware_patchset["Graphics"]["Nvidia Kepler (Userspace)"]})
required_patches.update({"Nvidia Kepler": all_hardware_patchset["Graphics"]["Nvidia Kepler"]})
for gpu in self.constants.computer.gpus:
# Handle mixed GPU situations (ie. MacBookPro11,3: Haswell iGPU + Kepler dGPU)
if gpu.arch == device_probe.Intel.Archs.Haswell: