diff --git a/DortaniaInternalResources.dmg b/DortaniaInternalResources.dmg index d09b93a2b..8dbd6cbee 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 10c35ac2b..f25e8205f 100644 --- a/data/sys_patch_dict.py +++ b/data/sys_patch_dict.py @@ -344,7 +344,7 @@ class SystemPatchDictionary(): }, "Install": { "/System/Library/Frameworks": { - "Metal.framework": "12.5-3802", + "Metal.framework": f"12.5-3802-{self.os_major}", }, "/System/Library/PrivateFrameworks": { "MTLCompiler.framework": "12.5-3802", @@ -372,11 +372,11 @@ class SystemPatchDictionary(): }, "Install": { "/System/Library/Frameworks": { - "Metal.framework": "13.2.1", + "Metal.framework": f"13.2.1-{self.os_major}", }, "/System/Library/PrivateFrameworks": { - "MTLCompiler.framework": "13.2.1", - "GPUCompiler.framework": "13.2.1", + **({ "MTLCompiler.framework": "13.2.1" } if self.os_major == os_data.os_data.ventura else {}), + **({ "GPUCompiler.framework": "13.2.1" } if self.os_major == os_data.os_data.ventura else {}), }, }, }, @@ -574,7 +574,7 @@ class SystemPatchDictionary(): "NVDAStartup.kext": "12.0 Beta 6", "GeForceAIRPlugin.bundle": "11.0 Beta 3", "GeForceGLDriver.bundle": "11.0 Beta 3", - "GeForceMTLDriver.bundle": "11.0 Beta 3" if self.os_major <= os_data.os_data.monterey else f"11.0 Beta 3-{self.os_major}", + "GeForceMTLDriver.bundle": "11.0 Beta 3" if self.os_major <= os_data.os_data.monterey else f"11.0 Beta 3-22", "GeForceVADriver.bundle": "12.0 Beta 6", }, "/System/Library/Frameworks": { @@ -1004,10 +1004,10 @@ class SystemPatchDictionary(): }, "Install": { "/System/Library/Frameworks": { - "Metal.framework": "12.5-3802-23", # Patched XPC service to handle 32023 inputs inside of 'CompilerPluginInterface::CompilerPluginInterface()' + "MetalPerformanceShaders.framework": "13.5 Beta 2", }, "/System/Library/PrivateFrameworks": { - "MTLCompiler.framework": "13.5 Beta 2", + "MTLCompiler.framework": "14.0", }, }, }, diff --git a/resources/sys_patch/sys_patch_generate.py b/resources/sys_patch/sys_patch_generate.py index fb1c27c13..93c40c760 100644 --- a/resources/sys_patch/sys_patch_generate.py +++ b/resources/sys_patch/sys_patch_generate.py @@ -113,6 +113,7 @@ 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 Intel Extended": all_hardware_patchset["Graphics"]["Sonoma Intel 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"]}) for gpu in self.constants.computer.gpus: diff --git a/resources/sys_patch/sys_patch_helpers.py b/resources/sys_patch/sys_patch_helpers.py index 816dfb855..0e4828ece 100644 --- a/resources/sys_patch/sys_patch_helpers.py +++ b/resources/sys_patch/sys_patch_helpers.py @@ -234,15 +234,16 @@ class SysPatchHelpers: - opencl-c.h - lib (entire directory) + Note: With macOS Sonoma, 32023 compiler is used instead and so this patch is not needed + Parameters: mount_point: The mount point of the target volume """ - if self.constants.detected_os < os_data.os_data.ventura: + if self.constants.detected_os != os_data.os_data.ventura: + return + if self.constants.detected_os_minor < 4: return - if self.constants.detected_os == os_data.os_data.ventura: - if self.constants.detected_os_minor < 4: - return LIBRARY_DIR = f"{mount_point}/System/Library/PrivateFrameworks/GPUCompiler.framework/Versions/31001/Libraries/lib/clang" GPU_VERSION = "31001.669"