Increment build

dortania · Nov 17, 2024 · e9e681c · e9e681c
1 parent 4a9564f
commit e9e681c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # OpenCore Legacy Patcher changelog
 
+## 2.2.0
+
 ## 2.1.2
 - Add additional error handling for when building OpenCore errors out
   - Prevents broken EFI from being installed to disk

diff --git a/opencore_legacy_patcher/constants.py b/opencore_legacy_patcher/constants.py
@@ -13,7 +13,7 @@
 class Constants:
     def __init__(self) -> None:
         # Patcher Versioning
-        self.patcher_version:                 str = "2.1.2"  # OpenCore-Legacy-Patcher
+        self.patcher_version:                 str = "2.2.0"  # OpenCore-Legacy-Patcher
         self.patcher_support_pkg_version:     str = "1.8.4"  # PatcherSupportPkg
         self.copyright_date:                  str = "Copyright © 2020-2024 Dortania"
         self.patcher_name:                    str = "OpenCore Legacy Patcher"

diff --git a/opencore_legacy_patcher/sys_patch/patchsets/hardware/graphics/amd_navi.py b/opencore_legacy_patcher/sys_patch/patchsets/hardware/graphics/amd_navi.py
@@ -6,6 +6,7 @@
 
 from ...base import PatchType
 
+from ...shared_patches.monterey_gva    import MontereyGVA
 from ...shared_patches.monterey_opencl import MontereyOpenCL
 from ...shared_patches.amd_opencl      import AMDOpenCL
 
@@ -74,15 +75,17 @@ def _model_specific_patches(self) -> dict:
         return {
             "AMD Navi": {
                 PatchType.OVERWRITE_SYSTEM_VOLUME: {
-                    "AMDRadeonX6000.kext":            self._resolve_monterey_framebuffers(),
-                    "AMDRadeonX6000Framebuffer.kext": "12.5",
+                    "/System/Library/Extensions": {
+                        "AMDRadeonX6000.kext":            self._resolve_monterey_framebuffers(),
+                        "AMDRadeonX6000Framebuffer.kext": "12.5",
 
-                    "AMDRadeonVADriver2.bundle":      "12.5",
-                    "AMDRadeonX6000GLDriver.bundle":  "12.5",
-                    "AMDRadeonX6000MTLDriver.bundle": "12.5" if self._xnu_major < os_data.sequoia else "12.5-24",
-                    "AMDRadeonX6000Shared.bundle":    "12.5",
+                        "AMDRadeonVADriver2.bundle":      "12.5",
+                        "AMDRadeonX6000GLDriver.bundle":  "12.5",
+                        "AMDRadeonX6000MTLDriver.bundle": "12.5" if self._xnu_major < os_data.sequoia else "12.5-24",
+                        "AMDRadeonX6000Shared.bundle":    "12.5",
 
-                    "AMDShared.bundle":               "12.5",
+                        "AMDShared.bundle":               "12.5",
+                    },
                 }
             }
         }
@@ -120,6 +123,7 @@ def patches(self) -> dict:
             return {}
 
         return {
+            **MontereyGVA(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).revert_patches(),
             **MontereyOpenCL(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **AMDOpenCL(self._xnu_major, self._xnu_minor, self._constants.detected_os_version).patches(),
             **self._model_specific_patches(),