Avoid GVA downgrade on Skylake hosts

.gitignore

@@ -36,4 +36,5 @@ __pycache__/
 /Universal-Binaries.dmg
 /payloads/KDKInfo.plist
 /payloads/update.sh
-/payloads/OpenCore-Patcher.app
+/payloads/OpenCore-Patcher.app
+/.x86_64_venv

CHANGELOG.md

@@ -6,6 +6,7 @@
   - Implement reduce transparency Menubar
   - Resolve Color Profile support and Black Box rendering issues on HD 3000 Macs
     - Drops ColorSync downgrade configuration option
+    - Resolves macOS 13.5 booting on HD 3000 Macs
 - 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
 - Add configuration for mediaanalysisd usage
@@ -18,6 +19,9 @@
   - Thanks [@jazzzny](https://github.com/jazzzny)
 - Resolve AMD Vega support on pre-AVX2 Macs in macOS Ventura
   - Originally caused by regression from 0.6.2
+- Disable non-Metal's Menubar 2 configuration
+  - Can be manually re-enabled, however application will try to disable to prevent issues
+- Remove AppleGVA downgrade on Intel Skylake iGPUs
 - Backend Changes:
   - device_probe.py:
     - Add USB device parsing via `IOUSBDevice` class
@@ -27,7 +31,7 @@
   - utilities.py:
     - Fix indexing error on Device Paths (thx [@Ausdauersportler](https://github.com/Ausdauersportler))
 - Increment Binaries:
-  - PatcherSupportPkg 1.1.4 - release
+  - PatcherSupportPkg 1.2.2 - release
 
 ## 0.6.7
 - Resolve partition buttons overlapping in Install OpenCore UI

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.4"  # PatcherSupportPkg
+        self.patcher_support_pkg_version:     str = "1.2.2"  # PatcherSupportPkg
         self.copyright_date:                  str = "Copyright © 2020-2023 Dortania"
         self.patcher_name:                    str = "OpenCore Legacy Patcher"
 
@@ -345,7 +345,7 @@ class Constants:
     @property
     def bcm570_path(self):
         return self.payload_kexts_path / Path(f"Ethernet/CatalinaBCM5701Ethernet-v{self.bcm570_version}.zip")
-    
+
     @property
     def aquantia_path(self):
         return self.payload_kexts_path / Path(f"Ethernet/AppleEthernetAbuantiaAqtion-v{self.aquantia_version}.zip")

resources/defaults.py

@@ -303,8 +303,10 @@ class GenerateDefaults:
                     # Only disable AMFI if we officially support Ventura
                     self.constants.disable_amfi = True
 
-                for key in ["Moraea_BlurBeta", "Amy.MenuBar2Beta"]:
+                for key in ["Moraea_BlurBeta"]:
                     # Enable BetaBlur if user hasn't disabled it
                     is_key_enabled = subprocess.run(["defaults", "read", "-g", key], stdout=subprocess.PIPE).stdout.decode("utf-8").strip()
                     if is_key_enabled not in ["false", "0"]:
-                        subprocess.run(["defaults", "write", "-g", key, "-bool", "true"])
+                        subprocess.run(["defaults", "write", "-g", key, "-bool", "true"])
+
+                subprocess.run(["defaults", "write", "-g", "Amy.MenuBar2Beta", "-bool", "false"])

resources/sys_patch/sys_patch_generate.py

@@ -78,7 +78,7 @@ class GenerateRootPatchSets:
             required_patches.update({"Intel Broadwell": all_hardware_patchset["Graphics"]["Intel Broadwell"]})
 
         if self.hardware_details["Graphics: Intel Skylake"] is True:
-            required_patches.update({"Monterey GVA": all_hardware_patchset["Graphics"]["Monterey GVA"]})
+            required_patches.update({"Revert GVA Downgrade": all_hardware_patchset["Graphics"]["Revert GVA Downgrade"]})
             required_patches.update({"Monterey OpenCL": all_hardware_patchset["Graphics"]["Monterey OpenCL"]})
             required_patches.update({"Intel Skylake": all_hardware_patchset["Graphics"]["Intel Skylake"]})
 
@@ -128,7 +128,9 @@ class GenerateRootPatchSets:
                 del(required_patches["AMD TeraScale 2"]["Install"]["/System/Library/Extensions"]["AMDRadeonX3000.kext"])
 
         if self.hardware_details["Graphics: AMD Legacy GCN"] is True or self.hardware_details["Graphics: AMD Legacy Polaris"] is True:
-            required_patches.update({"Monterey GVA": all_hardware_patchset["Graphics"]["Monterey GVA"]})
+            if self.hardware_details["Graphics: Intel Skylake"] is False:
+                # GVA downgrade not required if Skylake is present
+                required_patches.update({"Monterey GVA": all_hardware_patchset["Graphics"]["Monterey GVA"]})
             required_patches.update({"Monterey OpenCL": all_hardware_patchset["Graphics"]["Monterey OpenCL"]})
             if self.hardware_details["Graphics: AMD Legacy GCN"] is True:
                 required_patches.update({"AMD Legacy GCN": all_hardware_patchset["Graphics"]["AMD Legacy GCN"]})