- Add AppleHDA.kext fixes--15.6

Author: pyquick

.github/workflows/build-app-wxpython.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     name: Build wxPython
-    runs-on: macos-15
+    runs-on: macos-13
     if: github.repository_owner == 'hackdoc'
     permissions:
       contents: write
@@ -29,7 +29,7 @@ jobs:
           rm -rf *pay*.dmg
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install -r requirements.txt
 
-          aria2c -x 16 "https://github.com/hackdoc/PatcherSupportPkg/releases/download/1.9.9pre3/Universal-Binaries.dmg"
+          aria2c -x 16 "https://github.com/hackdoc/PatcherSupportPkg/releases/download/1.10.0/Universal-Binaries.dmg"
 
       - name: Force Universal2 charset for Python
         run: |

.github/workflows/validate.yml

@@ -25,5 +25,5 @@ jobs:
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install -r requirements.txt
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install packaging
           rm -rf Univ*
-          aria2c -x 16 "https://github.com/hackdoc/PatcherSupportPkg/releases/download/1.9.9pre3/Universal-Binaries.dmg"
+          aria2c -x 16 "https://github.com/hackdoc/PatcherSupportPkg/releases/download/1.10.0/Universal-Binaries.dmg"
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 OCLP-R-GUI.command --validate

oclp_r/constants.py

@@ -14,7 +14,7 @@ class Constants:
     def __init__(self) -> None:
         # Patcher Versioning
         self.patcher_version:                 str = "3.0.0"  # OCLP-R
-        self.patcher_support_pkg_version:     str = "1.9.9"  # PatcherSupportPkg
+        self.patcher_support_pkg_version:     str = "1.10.0"  # PatcherSupportPkg
         self.copyright_date:                  str = "Copyright © 2020-2025 Dortania and Hackdoc"
         self.patcher_name:                    str = "OCLP-R"
 
@@ -166,7 +166,7 @@ def __init__(self) -> None:
         self.computer: device_probe.Computer = None  # type: ignore
         self.custom_model:     Optional[str] = None
         self.change_launchpad:bool = False
-
+        self.applehda_version:str="15.6"
 
         ## OpenCore Settings
         self.opencore_debug: bool = False # Enable OpenCore debug

oclp_r/sys_patch/patchsets/detect.py

@@ -43,7 +43,7 @@
     legacy_audio,
     legacy_usb11,
     modern_audio,
-    Control,
+
     Launch,
     modern_usb,
     pcie_webcam,
@@ -134,7 +134,7 @@ def __init__(self, constants: constants.Constants,
             modern_wireless.ModernWireless,
             legacy_audio.LegacyAudio,
             modern_audio.ModernAudio,
-            Control.ModernControl,
+           
             Launch.LaunchPad,
             voodoo_audio.VoodooAudio,
             modern_usb.LegacyUSBHost,

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

@@ -30,7 +30,8 @@ def present(self) -> bool:
         """
         AppleHDA was outright removed in macOS 26, so this patch set is always present if OS requires it
         """
-       
+        if utilities.check_kext_loaded("org.voodoo.driver.VoodooHDA") !="" and self._constants.audio_type!="AppleHDA":
+            self._constants.audio_type="AppleHDA"
         return self._constants.audio_type=="AppleHDA" and utilities.check_kext_loaded("as.vit9696.AppleALC") !="" and utilities.check_kext_loaded("org.voodoo.driver.VoodooHDA") ==""
     def requires_kernel_debug_kit(self) -> bool:
         """
@@ -45,7 +46,7 @@ def native_os(self) -> bool:
             return True
 
         # Technically, macOS Tahoe Beta 1 is also native, so return True
-        if self._os_build == "25A5279m":
+        if self._os_build == "25A5279m" and self._constants.applehda_version=="26.0 Beta 1":
             return True
 
         return False
@@ -66,7 +67,7 @@ def _modern_audio_patches(self) -> dict:
             "Modern Audio": {
                 PatchType.OVERWRITE_SYSTEM_VOLUME: {
                     "/System/Library/Extensions": {
-                        "AppleHDA.kext":      "26.0 Beta 1",
+                        "AppleHDA.kext":      f"{self._constants.applehda_version}",
                     },
                 },
             },

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

@@ -811,7 +811,20 @@ def _settings(self) -> dict:
                         "Center on Tahoe.",
                     ],
                     "condition":self.condition_exp("CC")
-                },               
+                },      
+                "AppleHDA.kext Version": {
+                    "type": "choice",
+                    "choices": [
+                        "15.6",
+                        "26.0 Beta 1"
+                    ],
+                    "value": self.constants.applehda_version,
+                    "variable": "applehda_version",
+                    "constants_variable": "applehda_version",
+                    "description": [
+                        "",
+                    ],
+                },         
             },
             "Non-Metal":{
                 "Non-Metal Settings": {