From 8d838a31487121d8da4b483fb9537070110eda75 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Fri, 6 Sep 2024 09:17:27 -0600 Subject: [PATCH] Sync PatcherSupportPkg --- opencore_legacy_patcher/constants.py | 2 +- opencore_legacy_patcher/support/validation.py | 9 +++++++++ .../sys_patch/patchsets/shared_patches/metal_3802.py | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/opencore_legacy_patcher/constants.py b/opencore_legacy_patcher/constants.py index a0f4dae7d..eeafa0333 100644 --- a/opencore_legacy_patcher/constants.py +++ b/opencore_legacy_patcher/constants.py @@ -14,7 +14,7 @@ class Constants: def __init__(self) -> None: # Patcher Versioning self.patcher_version: str = "1.6.0" # OpenCore-Legacy-Patcher - self.patcher_support_pkg_version: str = "1.7.7" # PatcherSupportPkg + self.patcher_support_pkg_version: str = "1.7.8" # PatcherSupportPkg self.copyright_date: str = "Copyright © 2020-2024 Dortania" self.patcher_name: str = "OpenCore Legacy Patcher" diff --git a/opencore_legacy_patcher/support/validation.py b/opencore_legacy_patcher/support/validation.py index 31aee23b2..e9550dd24 100644 --- a/opencore_legacy_patcher/support/validation.py +++ b/opencore_legacy_patcher/support/validation.py @@ -141,6 +141,15 @@ class PatcherValidation: continue except TypeError: pass + + # Technically there is nothing wrong with using a .framework with OVERWRITE, but it's a good indicator of a mistake + if install_type in [PatchType.OVERWRITE_SYSTEM_VOLUME, PatchType.OVERWRITE_DATA_VOLUME]: + if install_file.endswith(".framework"): + raise Exception(f"{install_file} used with {install_type}, are you certain this is correct?") + elif install_type in [PatchType.MERGE_SYSTEM_VOLUME, PatchType.MERGE_DATA_VOLUME]: + if not install_file.endswith(".framework"): + raise Exception(f"{install_file} used with {install_type}, are you certain this is correct?") + source_file = str(self.constants.payload_local_binaries_root_path) + "/" + patchset[patch_core][install_type][install_directory][install_file] + install_directory + "/" + install_file if not Path(source_file).exists(): logging.info(f"File not found: {source_file}") diff --git a/opencore_legacy_patcher/sys_patch/patchsets/shared_patches/metal_3802.py b/opencore_legacy_patcher/sys_patch/patchsets/shared_patches/metal_3802.py index 4236a88cf..b3a43ffa1 100644 --- a/opencore_legacy_patcher/sys_patch/patchsets/shared_patches/metal_3802.py +++ b/opencore_legacy_patcher/sys_patch/patchsets/shared_patches/metal_3802.py @@ -125,6 +125,9 @@ class LegacyMetal3802(BaseSharedPatchSet): "/System/Library/PrivateFrameworks/Tungsten.framework/Versions/A/Resources": { "default.metallib": "15.0 Beta 7", }, + "/System/Library/PrivateFrameworks/RenderBox.framework/Versions/A/Resources": { + "default.metallib": "15.0 Beta 8", + }, "/System/iOSSupport/System/Library/PrivateFrameworks/VFX.framework/Versions/A/Resources": { "default.metallib": DynamicPatchset.MetallibSupportPkg, }, @@ -242,9 +245,6 @@ class LegacyMetal3802(BaseSharedPatchSet): "/System/Library/PrivateFrameworks/SkyLight.framework/Versions/A/Resources": { "SkyLightShaders.air64.metallib": DynamicPatchset.MetallibSupportPkg, }, - "/System/Library/PrivateFrameworks/RenderBox.framework/Versions/A/Resources": { - "default.metallib": DynamicPatchset.MetallibSupportPkg, - }, "/System/Library/PrivateFrameworks/AppleISPEmulator.framework/Versions/A/Resources": { "default.metallib": DynamicPatchset.MetallibSupportPkg, },