diff --git a/CHANGELOG.md b/CHANGELOG.md index 05a3152d5..32a12f6bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,12 @@ - Update non-Metal Binaries: - Improve experimental Menubar implementation stability - Implement reduce transparency Menubar + - Resolve Color Profile support and Black Box rendering issues on HD 3000 Macs + - Drops ColorSync downgrade configuration option - Resolve app not updating in `/Applications` after an update - Work-around users manually copying app to `/Applications` instead of allowing Root Volume Patcher to create a proper alias - Increment Binaries: - - PatcherSupportPkg 1.1.3 - release + - PatcherSupportPkg 1.1.4 - release ## 0.6.7 - Resolve partition buttons overlapping in Install OpenCore UI diff --git a/data/sys_patch_dict.py b/data/sys_patch_dict.py index 9df67bf90..4b58f631f 100644 --- a/data/sys_patch_dict.py +++ b/data/sys_patch_dict.py @@ -228,10 +228,9 @@ class SystemPatchDictionary(): }, }, - "Non-Metal ColorSync Workaround": { - # HD3000 Macs have issues with certain ColorProfiles - # This downgrade allows for proper UI rendering, - # however limited to Ventura due to regression with Big Sur and Monterey + "Revert Non-Metal ColorSync Workaround": { + # Old patch for ColorSync in Ventura on HD3000s + # Proper solution has been integrated into QuartzCore "Display Name": "", "OS Support": { "Minimum OS Support": { @@ -239,14 +238,15 @@ class SystemPatchDictionary(): "OS Minor": 0 }, "Maximum OS Support": { - "OS Major": self.non_metal_os_support[-1], + "OS Major": os_data.os_data.ventura, "OS Minor": 99 }, }, - "Install": { - "/System/Library/Frameworks": { - "ColorSync.framework": f"10.15.7-{self.os_major}", - }, + "Remove": { + "/System/Library/Frameworks/ColorSync.framework/Versions/A": [ + "ColorSync", + "ColorSyncOld.dylib", + ], }, }, diff --git a/resources/constants.py b/resources/constants.py index ce4312b10..974130548 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -13,7 +13,7 @@ class Constants: def __init__(self) -> None: # Patcher Versioning self.patcher_version: str = "0.6.8" # OpenCore-Legacy-Patcher - self.patcher_support_pkg_version: str = "1.1.3" # PatcherSupportPkg + self.patcher_support_pkg_version: str = "1.1.4" # PatcherSupportPkg self.copyright_date: str = "Copyright © 2020-2023 Dortania" self.patcher_name: str = "OpenCore Legacy Patcher" @@ -215,7 +215,6 @@ class Constants: self.disable_connectdrivers: bool = False # Disable ConnectDrivers (hibernation) self.set_content_caching: bool = False # Set Content Caching self.set_vmm_cpuid: bool = False # Set VMM bit inside CPUID - self.disable_cat_colorsync: bool = False # Disable the ColorSync patch to regain Display Profiles self.set_alc_usage: bool = True # Set AppleALC usage self.allow_3rd_party_drives: bool = True # Allow ThridPartyDrives quirk self.allow_nvme_fixing: bool = True # Allow NVMe Kernel Space Patches diff --git a/resources/defaults.py b/resources/defaults.py index ce85e72da..7b5fbd8eb 100644 --- a/resources/defaults.py +++ b/resources/defaults.py @@ -71,14 +71,6 @@ class GenerateDefaults: global_settings.GlobalEnviromentSettings().write_property("MacBookPro_TeraScale_2_Accel", False) self.constants.allow_ts2_accel = False - if self.model in ["MacBookAir4,1","MacBookAir4,2","MacBookPro8,1","MacBookPro8,2","MacBookPro8,3","Macmini5,1"]: - colorsync_status = global_settings.GlobalEnviromentSettings().read_property("Disable_ColorSync_Downgrade") - if colorsync_status is True: - self.constants.disable_cat_colorsync = True - else: - global_settings.GlobalEnviromentSettings().write_property("Disable_ColorSync_Downgrade", False) - self.constants.disable_cat_colorsync = False - if self.model in smbios_data.smbios_dictionary: if smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.CPUGen.skylake.value: # On 2016-2017 MacBook Pros, 15" devices used a stock Samsung SSD with IONVMeController diff --git a/resources/sys_patch/sys_patch_generate.py b/resources/sys_patch/sys_patch_generate.py index ebb0f5c89..83fc16665 100644 --- a/resources/sys_patch/sys_patch_generate.py +++ b/resources/sys_patch/sys_patch_generate.py @@ -53,8 +53,8 @@ class GenerateRootPatchSets: required_patches.update({"WebKit Monterey Common": all_hardware_patchset["Graphics"]["WebKit Monterey Common"]}) required_patches.update({"Intel Sandy Bridge": all_hardware_patchset["Graphics"]["Intel Sandy Bridge"]}) # Patchset breaks Display Profiles, don't install if primary GPU is AMD. Give users option to disable patch in settings to restore Display Profiles - if self.constants.computer.real_model not in ["Macmini5,2", "iMac12,1", "iMac12,2"] or self.constants.disable_cat_colorsync is False: - required_patches.update({"Non-Metal ColorSync Workaround": all_hardware_patchset["Graphics"]["Non-Metal ColorSync Workaround"]}) + if self.constants.computer.real_model not in ["Macmini5,2", "iMac12,1", "iMac12,2"]: + required_patches.update({"Revert Non-Metal ColorSync Workaround": all_hardware_patchset["Graphics"]["Revert Non-Metal ColorSync Workaround"]}) if self.hardware_details["Graphics: Intel Ivy Bridge"] is True: required_patches.update({"Metal 3802 Common": all_hardware_patchset["Graphics"]["Metal 3802 Common"]}) diff --git a/resources/wx_gui/gui_settings.py b/resources/wx_gui/gui_settings.py index 77613cf97..a7068bc7e 100644 --- a/resources/wx_gui/gui_settings.py +++ b/resources/wx_gui/gui_settings.py @@ -675,18 +675,6 @@ class SettingsFrame(wx.Frame): "wrap_around 1": { "type": "wrap_around", }, - "Disable ColorSync Downgrade": { - "type": "checkbox", - "value": global_settings.GlobalEnviromentSettings().read_property("Disable_ColorSync_Downgrade") or self.constants.disable_cat_colorsync, - "variable": "Disable_ColorSync_Downgrade", - "constants_variable": "disable_cat_colorsync", - "description": [ - "Disable ColorSync downgrade", - "on HD3000 GPUs in Ventura and newer.", - "Note: Disabling can cause UI corruption.", - ], - "condition": not bool(self.constants.computer.real_model not in ["MacBookAir4,1","MacBookAir4,2","MacBookPro8,1","MacBookPro8,2","MacBookPro8,3","Macmini5,1"]) - }, "Non-Metal Configuration": { "type": "title", },