diff --git a/DortaniaInternalResources.dmg b/DortaniaInternalResources.dmg index c9ba5e92f..7ffacca17 100644 Binary files a/DortaniaInternalResources.dmg and b/DortaniaInternalResources.dmg differ diff --git a/data/sys_patch_dict.py b/data/sys_patch_dict.py index 76f7a36df..84a6dce6a 100644 --- a/data/sys_patch_dict.py +++ b/data/sys_patch_dict.py @@ -991,10 +991,31 @@ class SystemPatchDictionary(): }, }, }, + "Sonoma 3802 Extended": { + "Display Name": "", + "OS Support": { + "Minimum OS Support": { + "OS Major": os_data.os_data.sonoma, + "OS Minor": 0 + }, + "Maximum OS Support": { + "OS Major": os_data.os_data.max_os, + "OS Minor": 99 + }, + }, + "Install": { + "/System/Library/Frameworks": { + "Metal.framework": "12.5-3802-23", # Patched XPC service to handle 32023 inputs inside of 'CompilerPluginInterface::CompilerPluginInterface()' + }, + "/System/Library/PrivateFrameworks": { + "MTLCompiler.framework": "13.5 Beta 2", + }, + }, + }, # On macOS Sonoma, the IOSurface ABI changed slightly that we now get corrupted UI elements # Namely, macOS wallpaper and menubar. # Temporary workaround for development only, until we can figure out what's going on. - "Sonoma 31001 Extended": { + "Sonoma Legacy Metal Extended": { "Display Name": "", "OS Support": { "Minimum OS Support": { @@ -1138,7 +1159,6 @@ class SystemPatchDictionary(): "/System/Library/PrivateFrameworks": { "CoreWiFi.framework": "12.6.2", "IO80211.framework": "12.6.2", - # TODO: When PatchSupportPkg has published binaries, remove comment **({ "CoreAnalytics.framework": "13.5 Beta 2"} if self.os_major >= os_data.os_data.sonoma else {}), **({ "WiFiAnalytics.framework": "13.5 Beta 2"} if self.os_major >= os_data.os_data.sonoma else {}), }, @@ -1162,16 +1182,18 @@ class SystemPatchDictionary(): "/usr/libexec": { "airportd": "13.5 Beta 2", "wifianalyticsd": "13.5 Beta 2", + "wifip2pd": "13.5 Beta 2", }, "/System/Library/Frameworks": { "CoreWLAN.framework": "13.5 Beta 2", }, "/System/Library/PrivateFrameworks": { - "CoreAnalytics.framework": "13.5 Beta 2", - "CoreWiFi.framework": "13.5 Beta 2", - "IO80211.framework": "13.5 Beta 2", - "WiFiAnalytics.framework": "13.5 Beta 2", - "WiFiPolicy.framework": "13.5 Beta 2", + "CoreAnalytics.framework": "13.5 Beta 2", + "CoreWiFi.framework": "13.5 Beta 2", + "IO80211.framework": "13.5 Beta 2", + "WiFiAnalytics.framework": "13.5 Beta 2", + "WiFiPolicy.framework": "13.5 Beta 2", + "WiFiPeerToPeer.framework": "13.5 Beta 2", }, }, }, diff --git a/resources/sys_patch/sys_patch.py b/resources/sys_patch/sys_patch.py index a72bfe847..04fc28525 100644 --- a/resources/sys_patch/sys_patch.py +++ b/resources/sys_patch/sys_patch.py @@ -865,7 +865,7 @@ class PatchSysVolume: return False logging.info("- Mounted Universal-Binaries.dmg") - if Path(self.constants.overlay_psp_path_dmg).exists() and Path("~/.dortania_developer").expanduser().exists(): + if self.constants.cli_mode is False and Path(self.constants.overlay_psp_path_dmg).exists() and Path("~/.dortania_developer").expanduser().exists(): icon_path = str(self.constants.app_icon_path).replace("/", ":")[1:] msg = "Welcome to the DortaniaInternal Program, please provided the decryption key to access internal resources. Press cancel to skip." password = Path("~/.dortania_developer_key").expanduser().read_text().strip() if Path("~/.dortania_developer_key").expanduser().exists() else "" diff --git a/resources/sys_patch/sys_patch_generate.py b/resources/sys_patch/sys_patch_generate.py index 26e7b4467..e5e08a33c 100644 --- a/resources/sys_patch/sys_patch_generate.py +++ b/resources/sys_patch/sys_patch_generate.py @@ -65,7 +65,8 @@ class GenerateRootPatchSets: required_patches.update({"WebKit Monterey Common": all_hardware_patchset["Graphics"]["WebKit Monterey Common"]}) required_patches.update({"Intel Ivy Bridge": all_hardware_patchset["Graphics"]["Intel Ivy Bridge"]}) required_patches.update({"Sonoma Intel Extended": all_hardware_patchset["Graphics"]["Sonoma Intel Extended"]}) - required_patches.update({"Sonoma 31001 Extended": all_hardware_patchset["Graphics"]["Sonoma 31001 Extended"]}) + required_patches.update({"Sonoma Legacy Metal Extended": all_hardware_patchset["Graphics"]["Sonoma Legacy Metal Extended"]}) + required_patches.update({"Sonoma 3802 Extended": all_hardware_patchset["Graphics"]["Sonoma 3802 Extended"]}) if self.hardware_details["Graphics: Intel Haswell"] is True: required_patches.update({"Metal 3802 Common": all_hardware_patchset["Graphics"]["Metal 3802 Common"]}) @@ -74,21 +75,22 @@ class GenerateRootPatchSets: required_patches.update({"Monterey OpenCL": all_hardware_patchset["Graphics"]["Monterey OpenCL"]}) required_patches.update({"Intel Haswell": all_hardware_patchset["Graphics"]["Intel Haswell"]}) required_patches.update({"Sonoma Intel Extended": all_hardware_patchset["Graphics"]["Sonoma Intel Extended"]}) - required_patches.update({"Sonoma 31001 Extended": all_hardware_patchset["Graphics"]["Sonoma 31001 Extended"]}) + required_patches.update({"Sonoma Legacy Metal Extended": all_hardware_patchset["Graphics"]["Sonoma Legacy Metal Extended"]}) + required_patches.update({"Sonoma 3802 Extended": all_hardware_patchset["Graphics"]["Sonoma 3802 Extended"]}) if self.hardware_details["Graphics: Intel Broadwell"] is True: required_patches.update({"Monterey GVA": all_hardware_patchset["Graphics"]["Monterey GVA"]}) required_patches.update({"Monterey OpenCL": all_hardware_patchset["Graphics"]["Monterey OpenCL"]}) required_patches.update({"Intel Broadwell": all_hardware_patchset["Graphics"]["Intel Broadwell"]}) required_patches.update({"Sonoma Intel Extended": all_hardware_patchset["Graphics"]["Sonoma Intel Extended"]}) - required_patches.update({"Sonoma 31001 Extended": all_hardware_patchset["Graphics"]["Sonoma 31001 Extended"]}) + required_patches.update({"Sonoma Legacy Metal Extended": all_hardware_patchset["Graphics"]["Sonoma Legacy Metal Extended"]}) if self.hardware_details["Graphics: Intel Skylake"] is True: required_patches.update({"Monterey GVA": all_hardware_patchset["Graphics"]["Monterey GVA"]}) required_patches.update({"Monterey OpenCL": all_hardware_patchset["Graphics"]["Monterey OpenCL"]}) required_patches.update({"Intel Skylake": all_hardware_patchset["Graphics"]["Intel Skylake"]}) required_patches.update({"Sonoma Intel Extended": all_hardware_patchset["Graphics"]["Sonoma Intel Extended"]}) - required_patches.update({"Sonoma 31001 Extended": all_hardware_patchset["Graphics"]["Sonoma 31001 Extended"]}) + required_patches.update({"Sonoma Legacy Metal Extended": all_hardware_patchset["Graphics"]["Sonoma Legacy Metal Extended"]}) if self.hardware_details["Graphics: Nvidia Tesla"] is True: required_patches.update({"Non-Metal Common": all_hardware_patchset["Graphics"]["Non-Metal Common"]}) @@ -111,6 +113,8 @@ class GenerateRootPatchSets: required_patches.update({"Big Sur OpenCL": all_hardware_patchset["Graphics"]["Big Sur OpenCL"]}) required_patches.update({"WebKit Monterey Common": all_hardware_patchset["Graphics"]["WebKit Monterey Common"]}) required_patches.update({"Nvidia Kepler": all_hardware_patchset["Graphics"]["Nvidia Kepler"]}) + required_patches.update({"Sonoma Legacy Metal Extended": all_hardware_patchset["Graphics"]["Sonoma Legacy Metal Extended"]}) + required_patches.update({"Sonoma 3802 Extended": all_hardware_patchset["Graphics"]["Sonoma 3802 Extended"]}) 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: @@ -145,7 +149,7 @@ class GenerateRootPatchSets: required_patches.update({"Revert GVA Downgrade": all_hardware_patchset["Graphics"]["Revert GVA Downgrade"]}) if "AVX2" not in self.constants.computer.cpu.leafs: required_patches.update({"AMD OpenCL": all_hardware_patchset["Graphics"]["AMD OpenCL"]}) - required_patches.update({"Sonoma 31001 Extended": all_hardware_patchset["Graphics"]["Sonoma 31001 Extended"]}) + required_patches.update({"Sonoma Legacy Metal Extended": all_hardware_patchset["Graphics"]["Sonoma Legacy Metal Extended"]}) if self.hardware_details["Graphics: AMD Legacy Vega"] is True: required_patches.update({"Monterey GVA": all_hardware_patchset["Graphics"]["Monterey GVA"]})