From e5fd984daf4fe02e117eba6b4b83a866aecb1c5e Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com>
Date: Tue, 11 May 2021 10:52:56 -0600
Subject: [PATCH] Fix audio support on iMac7,1 and iMac8,1

---
 CHANGELOG.md             | 2 +-
 OpenCore-Patcher.command | 1 +
 Resources/ModelArray.py  | 5 +++--
 Resources/SysPatch.py    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cdee62ea..434d58e2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 - Fix NightShift accidentally disabling on Minimal SMBIOS configs
 - Fix iMac9,1 audio support
 - Heavily expand Graphics ID list
-- Fix iMac7,1 audio support
+- Fix iMac7,1 and iMac8,1 audio support
 - Work-around Bluetooth Kernel Panic on Apple's Bluetooth 2.0 Controllers (USB 05AC:8206)
   - Affects iMac7,1 and MacPro3,1
 - Fix iMac external display support
diff --git a/OpenCore-Patcher.command b/OpenCore-Patcher.command
index 01311206a..8ba19328b 100755
--- a/OpenCore-Patcher.command
+++ b/OpenCore-Patcher.command
@@ -160,6 +160,7 @@ system_profiler SPHardwareDataType | grep 'Model Identifier'
   - Nvidia: Tesla - Fermi (8000-500 series)
   - Intel: Ironlake - Sandy Bridge
   - AMD: TeraScale 1 (2000-4000 series)
+- Audio support for iMac7,1 and iMac8,1
 
 WARNING: Root Volume Patching is still in active development, please
 have all important user data backed up. Note when the system volume
diff --git a/Resources/ModelArray.py b/Resources/ModelArray.py
index 3813ffb3d..1ba5a2620 100644
--- a/Resources/ModelArray.py
+++ b/Resources/ModelArray.py
@@ -268,8 +268,8 @@ LegacyAudio = [
     "Macmini5,1",
     "Macmini5,2",
     "Macmini5,3",
-    "iMac7,1",
-    "iMac8,1",
+    #"iMac7,1",
+    #"iMac8,1",
     "iMac9,1",
     "iMac10,1",
     "iMac11,1",
@@ -1014,5 +1014,6 @@ AddBrightness = [
 ]
 
 AddVolumeControl = [
+    "AppleHDA.kext",
     "IOAudioFamily.kext",
 ]
diff --git a/Resources/SysPatch.py b/Resources/SysPatch.py
index c7e995827..295c14db4 100644
--- a/Resources/SysPatch.py
+++ b/Resources/SysPatch.py
@@ -214,7 +214,7 @@ class PatchSysVolume:
                 self.gpu_accel_patches_11()
                 rebuild_required = True
 
-        if self.model == "iMac7,1":
+        if self.model in ["iMac7,1", "iMac8,1"]:
             print("- Fixing Volume Control Support")
             self.add_new_binaries(ModelArray.AddVolumeControl, self.constants.audio_path)