Merge branch 'main' into sonoma-development

resources/wx_gui/gui_settings.py

@@ -386,6 +386,17 @@ class SettingsFrame(wx.Frame):
                         "for unsupported models.",
                     ],
                 },
+                "Disable mediaanalysisd service": {
+                    "type": "checkbox",
+                    "value": self.constants.disable_mediaanalysisd,
+                    "variable": "disable_mediaanalysisd",
+                    "description": [
+                        "For systems that are the primary iCloud",
+                        "Photo Library host with a 3802-based GPU,",
+                        "this may aid in prolonged idle stability.",
+                    ],
+                    "condition": gui_support.CheckProperties(self.constants).host_has_3802_gpu()
+                },
                 "wrap_around 1": {
                     "type": "wrap_around",
                 },
@@ -1003,7 +1014,7 @@ Hardware Information:
                 if self.constants.computer.real_model in smbios_data.smbios_dictionary:
                     if self.constants.detected_os > smbios_data.smbios_dictionary[self.constants.computer.real_model]["Max OS Supported"]:
                         chassis_type = "aluminum"
-                        if self.constants.computer.real_model in ["MacBook4,1", "MacBook5,2", "MacBook6,1", "MacBook7,1"]:
+                        if self.constants.computer.real_model in ["MacBook5,2", "MacBook6,1", "MacBook7,1"]:
                             chassis_type = "plastic"
                         dlg = wx.MessageDialog(self.frame_modal, f"This model, {self.constants.computer.real_model}, does not natively support macOS {os_data.os_conversion.kernel_to_os(self.constants.detected_os)}, {os_data.os_conversion.convert_kernel_to_marketing_name(self.constants.detected_os)}. The last native OS was macOS {os_data.os_conversion.kernel_to_os(smbios_data.smbios_dictionary[self.constants.computer.real_model]['Max OS Supported'])}, {os_data.os_conversion.convert_kernel_to_marketing_name(smbios_data.smbios_dictionary[self.constants.computer.real_model]['Max OS Supported'])}\n\nToggling this option will break booting on this OS. Are you absolutely certain this is desired?\n\nYou may end up with a nice {chassis_type} brick 🧱", "Are you certain?", wx.YES_NO | wx.ICON_WARNING | wx.NO_DEFAULT)
                         if dlg.ShowModal() == wx.ID_NO:

resources/wx_gui/gui_support.py

@@ -13,7 +13,7 @@ import packaging.version
 from pathlib import Path
 
 from resources.wx_gui import gui_about
-from resources import constants
+from resources import constants, device_probe
 from data import model_array, os_data, smbios_data
 
 
@@ -179,6 +179,26 @@ class CheckProperties:
 
         return packaging.version.parse(oclp_plist["PatcherSupportPkg"])
 
+    def host_has_3802_gpu(self) -> bool:
+        """
+        Check if either host, or override model, has a 3802 GPU
+        """
+        gpu_dict = [] if self.constants.custom_model else self.constants.computer.gpus
+        model = self.constants.custom_model if self.constants.custom_model else self.constants.computer.real_model
+        if gpu_dict == []:
+            gpu_dict = smbios_data.smbios_dictionary[model]["Stock GPUs"] if model in smbios_data.smbios_dictionary else []
+
+        for gpu in gpu_dict:
+            if not self.constants.custom_model:
+                gpu = gpu.arch
+            if gpu in [
+                device_probe.Intel.Archs.Ivy_Bridge,
+                device_probe.Intel.Archs.Haswell,
+                device_probe.NVIDIA.Archs.Kepler,
+            ]:
+                return True
+
+        return False
 
 class PayloadMount: