- Move Lilu and WEG Patch

- Improve Audio Patch & Settings
- Fix DMG Sort

Author: pyquick

.github/workflows/build-self.yml

@@ -31,8 +31,7 @@ def present(self) -> bool:
         AppleHDA was outright removed in macOS 26, so this patch set is always present if OS requires it
         """
 
-        return self._constants.audio_type=="AppleHDA" and utilities.check_kext_loaded("as.vit9696.AppleALC") !=""
-
+        return self._constants.audio_type=="AppleHDA" and utilities.check_kext_loaded("as.vit9696.AppleALC") !="" and utilities.check_kext_loaded("org.voodoo.driver.VoodooHDA") ==""
 
     def native_os(self) -> bool:
         """
@@ -61,20 +60,6 @@ def _modern_audio_patches(self) -> dict:
         """
         return {
             "Modern Audio": {
-                PatchType.REMOVE_SYSTEM_VOLUME: {
-                    "/System/Library/Extensions":[
-                        "VoodooHDA.kext",
-                    ],
-                    "/Library/Extensions":[
-                        "VoodooHDA.kext",
-                    ],
-                    "/Library/PreferencePanes":[
-                        "VoodooHDA.prefPane",
-                    ],
-                    "/System/Library/PreferencePanes":[
-                        "VoodooHDA.prefPane",
-                    ],
-                },
                 PatchType.OVERWRITE_SYSTEM_VOLUME: {
                     "/System/Library/Extensions": {
                         "AppleHDA.kext":      "26.0 Beta 1",

oclp_r/sys_patch/patchsets/hardware/misc/modern_audio.py

@@ -20,7 +20,7 @@ def name(self) -> str:
 
 
     def present(self) -> bool:
-        return self._constants.audio_type=="VoodooHDA" and utilities.check_kext_loaded("as.vit9696.AppleALC") ==""
+        return self._constants.audio_type=="VoodooHDA" and utilities.check_kext_loaded("as.vit9696.AppleALC") =="" and utilities.check_kext_loaded("org.voodoo.driver.VoodooHDA")==""
 
 
     def native_os(self) -> bool:

oclp_r/sys_patch/patchsets/hardware/misc/voodoo_audio.py

@@ -58,7 +58,7 @@ def _weg_patches(self) -> dict:
         return {
             "WEG Patch": {
                 PatchType.OVERWRITE_SYSTEM_VOLUME: {
-                    "/System/Library/Extensions": {
+                    "/Library/Extensions": {
                         "WhateverGreen.kext":      "WEG",
                         "Lilu.kext":               "WEG",
                     },

oclp_r/sys_patch/patchsets/hardware/misc/whatevergreen.py

@@ -196,6 +196,9 @@ def _fetch_simplehac_dmgs():
                 aes=requests.get(aesurl,verify=False)
                 if res.status_code == 200:
                     dmgdata=res.json()
+                    dmgdata['dmgFiles'] = sorted(dmgdata['dmgFiles'], key=lambda x: x['build'])
+
+                    print(dmgdata)
                     logging.info("JSON data:")
                     dmgwell=json.dumps(dmgdata, indent=4, ensure_ascii=False)
                     if aes.status_code == 200:

oclp_r/wx_gui/gui_macos_installer_download.py

@@ -33,8 +33,9 @@
     os_data,
     cpu_data
 )
+from ..support   import utilities
 
-
+import platform
 class SettingsFrame(wx.Frame):
     """
     Modal-based Settings Frame
@@ -44,7 +45,7 @@ def __init__(self, parent: wx.Frame, title: str, global_constants: constants.Con
         self.constants: constants.Constants = global_constants
         self.title: str = title
         self.parent: wx.Frame = parent
-
+        self.xnu_major = int(platform.release().split(".")[0])
         self.hyperlink_colour = (25, 179, 231)
 
         self.settings = self._settings()
@@ -201,6 +202,10 @@ def _generate_elements(self, frame: wx.Frame = None) -> None:
                         choice.Bind(wx.EVT_CHOICE, lambda event, variable=setting: self.settings[tab][variable]["override_function"](event))
                     else:
                         choice.Bind(wx.EVT_CHOICE, lambda event, variable=setting: self.on_choice(event, variable))
+                    if "condition" in setting_info:
+                        choice.Enable(setting_info["condition"])
+                        if setting_info["condition"] is False:
+                            choice.Disable()
                     height += 10
                 elif setting_info["type"] == "button":
                     button = wx.Button(panel, label=setting, pos=(width + 25, 10 + height), size = (200,-1))
@@ -230,8 +235,14 @@ def _generate_elements(self, frame: wx.Frame = None) -> None:
 
                 if height > lowest_height_reached:
                     lowest_height_reached = height
-
-
+    def audio_check(self):
+        if utilities.check_kext_loaded("com.apple.driver.AppleHDA")!="" or utilities.check_kext_loaded("as.vit9696.AppleALC") !="":
+            self.constants.audio_type="AppleHDA"
+            return False
+        if utilities.check_kext_loaded("com.apple.driver.AppleHDA") and self.xnu_major>=os_data.os_data.tahoe:
+            self.constants.audio_type="AppleHDA"
+            return False
+        return True
     def _settings(self) -> dict:
         """
         Generates a dictionary of settings to be used in the GUI
@@ -729,11 +740,12 @@ def _settings(self) -> dict:
                         "  on Monterey and newer.",
                         "  Not recommended.",
                     ],
+                    "condition":self.audio_check()
                 },
                 "wrap_around 1": {
                     "type": "wrap_around",
                 },
-                "Allow Tahoe Old USB Exts Patch": {
+                "Allow Tahoe Modern USB Patch": {
                     "type": "checkbox",
                     "value": self.constants.allow_usb_patch,
                     "variable": "allow_usb_patch",