Merge branch 'dortania:main' into main

This commit is contained in:
neon ball
2022-06-12 03:20:50 +03:00
committed by GitHub
9 changed files with 165 additions and 6 deletions

View File

@@ -1,5 +1,7 @@
# OpenCore Legacy Patcher changelog
## 0.5.0
## 0.4.6
- Fix Bluetooth support in 12.4 Release
- Applicable for BCM2046 and BCM2070 chipsets
@@ -25,6 +27,7 @@
- Deprecate TUI support
- Users may still manually run from source for future builds
- Binaries will no longer be provided on future release
- Switch boot.efi model patch to iMac18,1
## 0.4.5
- Fix AutoPatcher.pkg download on releases

View File

@@ -17,6 +17,7 @@ class os_data(enum.IntEnum):
catalina = 19
big_sur = 20
monterey = 21
ventura = 22
max_os = 99

View File

@@ -459,6 +459,27 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
},
},
},
"AMD Legacy GCN": {
"Display Name": "Graphics: AMD Legacy GCN",
"OS Support": {
"Minimum OS Support": {
"OS Major": os_data.os_data.ventura,
"OS Minor": 0
},
"Maximum OS Support": {
"OS Major": os_data.os_data.max_os,
"OS Minor": 99
},
},
"Install Reference": {
"/System/Library/Extensions": {
"AMD7000Controller.kext": "12.4",
"AMD8000Controller.kext": "12.4",
"AMD9000Controller.kext": "12.4",
"AMDRadeonX4000.kext": "12.4",
},
},
},
"Intel Ironlake": {
"Display Name": "Graphics: Intel Ironlake",
"OS Support": {
@@ -531,6 +552,75 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
},
},
},
"Intel Haswell": {
"Display Name": "Graphics: Intel Haswell",
"OS Support": {
"Minimum OS Support": {
"OS Major": os_data.os_data.ventura,
"OS Minor": 0
},
"Maximum OS Support": {
"OS Major": os_data.os_data.max_os,
"OS Minor": 99
},
},
"Install Reference": {
"/System/Library/Extensions": {
"AppleIntelFramebufferAzul.kext": "12.4",
"AppleIntelHD5000Graphics.kext": "12.4",
"AppleIntelHD5000GraphicsGLDriver.bundle": "11.0 Beta 6",
"AppleIntelHD5000GraphicsMTLDriver.bundle": "11.0 Beta 6",
"AppleIntelHD5000GraphicsVADriver.bundle": "11.0 Beta 6",
"AppleIntelHSWVA.bundle": "11.0 Beta 6",
},
},
},
"Intel Broadwell": {
"Display Name": "Graphics: Intel Broadwell",
"OS Support": {
"Minimum OS Support": {
"OS Major": os_data.os_data.ventura,
"OS Minor": 0
},
"Maximum OS Support": {
"OS Major": os_data.os_data.max_os,
"OS Minor": 99
},
},
"Install Reference": {
"/System/Library/Extensions": {
"AppleIntelBDWGraphics.kext": "12.4",
"AppleIntelBDWGraphicsFramebuffer.kext": "12.4",
"AppleIntelBDWGraphicsGLDriver.bundle": "11.0 Beta 6",
"AppleIntelBDWGraphicsMTLDriver.bundle": "11.0 Beta 6",
"AppleIntelBDWGraphicsVADriver.bundle": "11.0 Beta 6",
"AppleIntelBDWGraphicsVAME.bundle": "11.0 Beta 6",
},
},
},
"Intel Skylake": {
"Display Name": "Graphics: Intel Skylake",
"OS Support": {
"Minimum OS Support": {
"OS Major": os_data.os_data.ventura,
"OS Minor": 0
},
"Maximum OS Support": {
"OS Major": os_data.os_data.max_os,
"OS Minor": 99
},
},
"Install Reference": {
"/System/Library/Extensions": {
"AppleIntelSKLGraphics.kext": "12.4",
"AppleIntelSKLGraphicsFramebuffer.kext": "12.4",
"AppleIntelSKLGraphicsGLDriver.bundle": "11.0 Beta 6",
"AppleIntelSKLGraphicsMTLDriver.bundle": "11.0 Beta 6",
"AppleIntelSKLGraphicsVADriver.bundle": "11.0 Beta 6",
"AppleIntelSKLGraphicsVAME.bundle": "11.0 Beta 6",
},
},
},
},
"Audio": {
"Legacy Realtek": {

View File

@@ -1046,7 +1046,7 @@ class wx_python_gui:
def root_patch_start(self, event=None):
self.frame.DestroyChildren()
self.frame.SetSize(self.WINDOW_WIDTH_BUILD, -1)
self.frame.SetSize(self.WINDOW_WIDTH_BUILD, self.WINDOW_HEIGHT_MAIN)
# Header
self.header = wx.StaticText(self.frame, label="Root Patching", pos=(10, 10))
@@ -1215,7 +1215,7 @@ class wx_python_gui:
def root_patch_revert(self, event=None):
self.reset_frame_modal()
self.frame_modal.SetSize(self.WINDOW_WIDTH_BUILD, -1)
self.frame_modal.SetSize(self.WINDOW_WIDTH_BUILD, self.WINDOW_HEIGHT_MAIN)
# Header
self.header = wx.StaticText(self.frame_modal, label="Revert Root Patches", pos=(10, 10))
@@ -1258,7 +1258,7 @@ class wx_python_gui:
self.text_box.SetSize(
wx.Size(
self.frame_modal.GetSize().width - 10,
self.frame_modal.GetSize().height + self.text_box.GetPosition().y + 80
self.frame_modal.GetSize().height + self.text_box.GetPosition().y + 10
)
)
self.text_box.Centre(wx.HORIZONTAL)

View File

@@ -1239,6 +1239,42 @@
<key>PlistPath</key>
<string>Contents/Info.plist</string>
</dict>
<dict>
<key>Arch</key>
<string>x86_64</string>
<key>BundlePath</key>
<string>AppleUSBMultitouch.kext</string>
<key>Comment</key>
<string>Trackpad support for 13.0+</string>
<key>Enabled</key>
<false/>
<key>ExecutablePath</key>
<string>Contents/MacOS/AppleUSBMultitouch</string>
<key>MaxKernel</key>
<string></string>
<key>MinKernel</key>
<string>22.0.0</string>
<key>PlistPath</key>
<string>Contents/Info.plist</string>
</dict>
<dict>
<key>Arch</key>
<string>x86_64</string>
<key>BundlePath</key>
<string>AppleUSBTopCase.kext</string>
<key>Comment</key>
<string>Trackpad support for 13.0+</string>
<key>Enabled</key>
<false/>
<key>ExecutablePath</key>
<string>Contents/MacOS/AppleUSBTopCase</string>
<key>MaxKernel</key>
<string></string>
<key>MinKernel</key>
<string>22.0.0</string>
<key>PlistPath</key>
<string>Contents/Info.plist</string>
</dict>
</array>
<key>Block</key>
<array/>

Binary file not shown.

Binary file not shown.

View File

@@ -152,11 +152,11 @@ class BuildOpenCore:
self.get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (2)")["Enabled"] = True
# Patch HW_BID to OC_BID
# Set OC_BID to MacPro6,1 Board ID (Mac-F60DEB81FF30ACF6)
# Set OC_BID to iMac18,1 Board ID (Mac-F60DEB81FF30ACF6)
# Goal is to only allow OS booting through OCLP, otherwise failing
print("- Enabling HW_BID reroute")
self.get_item_by_kv(self.config["Booter"]["Patch"], "Comment", "Reroute HW_BID to OC_BID")["Enabled"] = True
self.config["NVRAM"]["Add"]["4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14"]["OC_BID"] = "Mac-F60DEB81FF30ACF6"
self.config["NVRAM"]["Add"]["4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14"]["OC_BID"] = "Mac-BE088AF8C5EB4FA2"
self.config["NVRAM"]["Delete"]["4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14"] += ["OC_BID"]
else:
print("- Enabling SMC exemption patch")
@@ -841,6 +841,23 @@ class BuildOpenCore:
except KeyError:
pass
# With macOS 13, Ventura, Apple removed the Skylake graphics stack. However due to the lack of inovation
# with the Kaby lake and Coffee Lake iGPUs, we're able to spoof ourselves to natively support them
# Currently the following iGPUs we need to be considerate of:
# - HD530 (mobile): 0x191B0006
# | GPU | Model | Device ID | Platform ID | New Device ID | New Platform ID |
# | -------- | ---------------- | --------- | ----------- | ------------- | --------------- |
# | HD 515 | MacBook9,1 | 0x191E | 0x131E0003 |
# | Iris 540 | MacBookPro13,1/2 | 0x1926 | 0x19160002 | 0x5926 | 0x59260002
# | HD 530 | MacBookPro13,3 | 0x191B | 0x191B0006 | 0x591B | 0x591B0006 |
# | HD 530 | iMac17,1 | 0x1912 | 0x19120001 | 0x5912 | 0x59120003 |
if self.constants.xhci_boot is True:
print("- Adding USB 3.0 Controller Patch")
print("- Adding XhciDxe.efi and UsbBusDxe.efi")
@@ -886,6 +903,8 @@ class BuildOpenCore:
# Disabled due to macOS Monterey crashing shortly after kernel init
# Use DebugEnhancer.kext instead
# self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " msgbuf=1048576"
print("- Enable Beta Lilu support")
self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -lilubetaall"
if self.constants.opencore_debug is True:
print("- Enabling DEBUG OpenCore")
self.config["Misc"]["Debug"]["Target"] = 0x43

View File

@@ -12,7 +12,7 @@ from data import os_data
class Constants:
def __init__(self):
# Patcher Versioning
self.patcher_version = "0.4.6" # OpenCore-Legacy-Patcher
self.patcher_version = "0.5.0" # OpenCore-Legacy-Patcher
self.patcher_support_pkg_version = "0.5.1" # 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/"
@@ -56,6 +56,8 @@ class Constants:
self.apple_isight_version = "1.0.0" # AppleiSight
self.apple_raid_version = "1.0.0" # AppleRAIDCard
self.apfs_zlib_version = "12.3.1" # NoAVXFSCompressionTypeZlib
self.multitouch_version = "1.0.0" # AppleUSBMultitouch
self.topcase_version = "1.0.0" # AppleUSBTopCase
## Apple - Dortania Modified
self.bcm570_version = "1.0.2" # CatalinaBCM5701Ethernet
@@ -313,6 +315,14 @@ class Constants:
def apfs_zlib_path(self):
return self.payload_kexts_path / Path(f"Misc/NoAVXFSCompressionTypeZlib-v{self.apfs_zlib_version}.zip")
@property
def multitouch_path(self):
return self.payload_kexts_path / Path(f"Misc/AppleUSBMultitouch-v{self.multitouch_version}.zip")
@property
def top_case_path(self):
return self.payload_kexts_path / Path(f"Misc/AppleUSBTopCase-v{self.topcase_version}.zip")
@property
def mousse_path(self):
return self.payload_kexts_path / Path(f"SSE/AAAMouSSE-v{self.mousse_version}.zip")