diff --git a/CHANGELOG.md b/CHANGELOG.md index 52067cc12..c1e62e2e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ - Add Legacy GMUX patchsets - Applicable for dual GPU MacBookPro5,x and demuxed MacBookPro8,x - Increment Binaries: - - PatcherSupportPkg 0.1.5 release + - PatcherSupportPkg 0.1.6 release - RestrictEvents 1.0.5 rolling (2430ed0) - Limit MacBookPro6,2 G State - Works around crashing when switching GPUs @@ -35,6 +35,10 @@ - Due to both Kepler and Ivy needing root patching, no benefit to disable the iGPU - Refactor Hardware Model building - Resolve dGPU output on MacBookPro10,1 +- Add Panel ID `9cd6` for iMac11,3 + - Resolves Brightness control +- Add AppleGVA patch set for HD3000 machines + - Mainly applicable for iMac12,x and iGPU-only MacBooks ## 0.2.5 diff --git a/data/pci_data.py b/data/pci_data.py index 8e6ef8be1..9bf0df392 100644 --- a/data/pci_data.py +++ b/data/pci_data.py @@ -686,35 +686,35 @@ class amd_ids: ] terascale_2_ids = [ - 0x6738, - 0x6739, - 0x6720, - 0x6722, - 0x6768, - 0x6770, - 0x6779, - 0x6760, - 0x6761, - 0x68E0, - 0x6898, - 0x6899, - 0x68B8, - 0x68B0, - 0x68B1, - 0x68A0, - 0x68A1, - 0x6840, - 0x6841, - 0x68D8, - 0x68C0, - 0x68C1, - 0x68D9, - 0x6750, - 0x6758, - 0x6759, - 0x6740, - 0x6741, - 0x6745, + 0x6738, # HD 6870 + 0x6739, # HD 6850 + 0x6720, # HD 6970M/6990M + 0x6722, # Unknown + 0x6768, # Unknown + 0x6770, # HD 6450A/7450A + 0x6779, # HD 6450/7450/8450 / R5 230 OEM + 0x6760, # HD 6400M/7400M + 0x6761, # HD 6430M + 0x68E0, # HD 5430/5450/547 + 0x6898, # HD 5870 + 0x6899, # HD 5850 + 0x68B8, # HD 5770 + 0x68B0, # Unknown + 0x68B1, # Unknown + 0x68A0, # HD 5870 (mobile) + 0x68A1, # HD 5850 (mobile) + 0x6840, # HD 7500M/7600M + 0x6841, # HD 7550M/7570M/7650M + 0x68D8, # HD 5670/5690/5730 + 0x68C0, # HD 5730 / 6570M + 0x68C1, # HD 5650/5750 / 6530M/6550M + 0x68D9, # HD 5550/5570/5630/6510/6610/7570 + 0x6750, # HD 6650A/7650A + 0x6758, # HD 6670/7670 + 0x6759, # HD 6570/7570/8550 + 0x6740, # HD 6730M/6770M/7690M XT + 0x6741, # HD 6630M/6650M/6750M/7670M/7690M + 0x6745, # Unknown ] diff --git a/payloads/Kexts/Misc/BacklightInjector-v1.0.0.zip b/payloads/Kexts/Misc/BacklightInjector-v1.0.0.zip deleted file mode 100644 index 79d17e59d..000000000 Binary files a/payloads/Kexts/Misc/BacklightInjector-v1.0.0.zip and /dev/null differ diff --git a/payloads/Kexts/Misc/BacklightInjector-v1.1.0.zip b/payloads/Kexts/Misc/BacklightInjector-v1.1.0.zip new file mode 100644 index 000000000..281c7edd8 Binary files /dev/null and b/payloads/Kexts/Misc/BacklightInjector-v1.1.0.zip differ diff --git a/resources/cli_menu.py b/resources/cli_menu.py index 01899a8cd..fb5f48998 100644 --- a/resources/cli_menu.py +++ b/resources/cli_menu.py @@ -857,7 +857,7 @@ system_profiler SPHardwareDataType | grep 'Model Identifier' ], [ f"Set Secure Boot Model (SBM):\t\tCurrently {self.constants.secure_status}", - MenuOptions(self.constants.custom_model or self.constant.computer.real_model, self.constants).change_sbm, + MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).change_sbm, ], [f"Set Vault Mode:\t\t\t\tCurrently {self.constants.vault}", MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).change_vault], ] diff --git a/resources/constants.py b/resources/constants.py index b73982c05..53f3b135c 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -13,8 +13,9 @@ from resources import device_probe class Constants: def __init__(self): # Patcher Versioning - self.patcher_version = "0.3.0" # OpenCore-Legacy-Patcher - self.patcher_support_pkg_version = "0.1.5" # PatcherSupportPkg + self.patcher_support_pkg_version = "0.1.6" # 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/" # OpenCore Versioning # https://github.com/acidanthera/OpenCorePkg @@ -54,7 +55,7 @@ class Constants: ## Dortania ## https://github.com/dortania - self.backlight_injector_version = "1.0.0" # BacklightInjector + self.backlight_injector_version = "1.1.0" # BacklightInjector self.smcspoof_version = "1.0.0" # SMC-Spoof self.mce_version = "1.0.0" # AppleMCEReporterDisabler self.btspoof_version = "1.0.0" # Bluetooth-Spoof @@ -145,6 +146,7 @@ class Constants: self.dGPU_switch = True # Set Display GPU Switching for Windows self.force_surplus = False # Force SurPlus patch in newer OSes self.set_kext_usage = True # Set Kext usage + self.force_latest_psp = False # Force latest PatcherSupportPkg # OS Versions ## Based off Major Kernel Version @@ -190,9 +192,6 @@ class Constants: self.arch_fermi = "GF100" self.arch_kepler = "GK100" - # External Files - self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/" - self.legacy_accel_support = [ self.mojave, self.catalina, @@ -566,6 +565,10 @@ class Constants: @property def payload_apple_private_frameworks_path_brightness(self): return self.payload_apple_private_frameworks_path / Path("Brightness-Control") + + @property + def payload_apple_private_frameworks_path_legacy_drm(self): + return self.payload_apple_private_frameworks_path / Path("Legacy-GVA") # Apple Extensions # El Capitan Extensions diff --git a/resources/defaults.py b/resources/defaults.py index 213ac4d49..1393e8036 100644 --- a/resources/defaults.py +++ b/resources/defaults.py @@ -77,7 +77,7 @@ class generate_defaults(): if utilities.amfi_status() is False: settings.amfi_status = False - if utilities.get_nvram("gpu-power-prefs", "FA4CE28D-B62F-4C99-9CC3-6815686E30F9"): + if model in ["MacBookPro8,2", "MacBookPro8,3"]: # Users disabling TS2 most likely have a faulty dGPU # users can override this in settings settings.allow_ts2_accel = False diff --git a/resources/sys_patch.py b/resources/sys_patch.py index 990c13f39..aa19886a3 100644 --- a/resources/sys_patch.py +++ b/resources/sys_patch.py @@ -117,7 +117,7 @@ class PatchSysVolume: print("- Creating Backup folder") utilities.process_status( - self.elevated( + utilities.elevated( ["cp", "-r", f"{self.mount_location}/{location}", f"{self.mount_location}/{location}-Backup"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, @@ -125,7 +125,7 @@ class PatchSysVolume: ) print("- Zipping Backup folder") utilities.process_status( - self.elevated( + utilities.elevated( ["ditto", "-c", "-k", "--sequesterRsrc", "--keepParent", f"{self.mount_location}/{location}-Backup", f"{self.mount_location}/{location_zip}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, @@ -134,7 +134,7 @@ class PatchSysVolume: print("- Removing Backup folder") utilities.process_status( - self.elevated( + utilities.elevated( ["rm", "-r", f"{self.mount_location}/{location}-Backup"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, @@ -397,6 +397,7 @@ set million colour before rebooting""" self.gpu_accel_legacy() self.add_new_binaries(sys_patch_data.AddIntelGen2Accel, self.constants.legacy_intel_gen2_path) self.gpu_accel_legacy_sandybridge_board_id() + self.gpu_accel_legacy_gva() else: print("- Installing basic Sandy Bridge Framebuffer Kext patches for generic OS") self.add_new_binaries(sys_patch_data.AddIntelGen2Accel, self.constants.legacy_intel_gen2_path) @@ -435,6 +436,10 @@ set million colour before rebooting""" else: print("- Installing Kepler Kext patches for generic OS") self.add_new_binaries(sys_patch_data.AddNvidiaKeplerAccel11, self.constants.legacy_nvidia_kepler_path) + + def gpu_accel_legacy_gva(self): + print("- Merging AppleGVA Hardware Accel patches for non-Metal") + utilities.elevated(["rsync", "-r", "-i", "-a", f"{self.constants.payload_apple_private_frameworks_path_legacy_drm}/", self.mount_private_frameworks], stdout=subprocess.PIPE) def gpu_accel_legacy_extended(self): print("- Merging general legacy Frameworks")