sys_patch_dict: Fix versioning

Ref: https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1004

CHANGELOG.md

@@ -1,5 +1,12 @@
 # OpenCore Legacy Patcher changelog
 
+## 0.4.9
+- Split Kepler userspace and kernel space patches
+  - Only installs kernel space patches on 12.5 and newer
+  - Avoids lock out of user, however breaks graphics acceleration
+  - Install 12.4 or older for full graphics acceleration on Kepler
+  - Reference: [macOS 12.5: Nvidia Kepler and WindowServer crashing #1004](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1004)
+
 ## 0.4.8
 - Ensure Apple Silicon-specific installers are not listed
   - ie. M2 specific build (21F2092)
@@ -91,11 +98,11 @@
   - Unknown whether this is a "bug" or intentional from Apple, affects native Macs with SIP disabled
 - Resolved non-Metal issues:
   - Catalyst crashing after 1200 seconds on non-Metal
-  - Automatic Light/Darkmode (credit @moosethegoose2213)
+  - Automatic Light/Dark mode (credit @moosethegoose2213)
   - Rim improvements
   - Trackpad swipe between pages
   - Cycle between windows
-  - Improve Display Prefpane Image
+  - Improve Display Preference pane Image
   - Defaults prefix change (`ASB_` -> `MORAEA_`, reopen non-Metal Settings to apply)
 - Increment Binaries:
   - PatcherSupportPkg 0.3.9 - release
@@ -128,9 +135,9 @@
   - Add Disk Highlighting during Build/Install for previously installed disks
   - Only list newest installers by default (reload to show older binaries)
 - Remove manual root unpatching
-  - Removed due to reliablity issues
+  - Removed due to reliability issues
   - `bless` based reversion still supported in Big Sur+
-- Remove Unoffical Mojave/Catalina Root Patching
+- Remove Unofficial Mojave/Catalina Root Patching
   - For TeraScale 2-based acceleration on older OSes, use v0.4.3
 - Simplify Binary options
   - Removes Online Patcher Variants
@@ -150,7 +157,7 @@
   - Control Centre Sliders
   - Shift/missing icons
   - Hardware Cursor
-    - Note cursor images will be static (ie. beachball)
+    - Note cursor images will be static (ie. beach ball)
   - Quicklook dismiss/expand
   - Keyboard Backlight
     - Drops reliance on LabTick
@@ -213,7 +220,7 @@
   - PatcherSupportPkg 0.2.9 - release
 - Re-add Content Caching support for VMM-spoofed systems
 - Add wxPython Based GUI
-  - Superceeds Obj-C Based GUI
+  - Supersedes Obj-C Based GUI
   - Both standard and offline builds provided
 - Allow optional spoofing on native Models
   - Recommended for systems that cannot update their firmware natively (ie. dead internal drive)
@@ -374,7 +381,7 @@
   - Applicable for BRCM2046 and BRCM2070 chipsets
 - Disable Library Validation allowing for AMFI usage
   - Remove reliance on amfi_get_out_of_my_way=1
-- Add Kepler Accleration Patches for Monterey Beta 7 and newer
+- Add Kepler Acceleration Patches for Monterey Beta 7 and newer
 - Add FirmwareFeature upgrading to all Models
   - Fixes Monterey Beta 7 installation issues
 - Add iMac7,1 USB map
@@ -438,7 +445,7 @@
   - RestrictEvents 1.0.3 rolling (3773ce2 - 06-20-2021)
   - SidecarFixup 1.0.2 rolling (2c29166 - 06-21-2021)
   - PatcherSupportPkg 0.0.18
-- Allow AirPlay to Mac support on Skylake - Coffeelake Macs
+- Allow AirPlay to Mac support on Skylake - Coffee Lake Macs
 
 ## 0.1.9
 
@@ -659,7 +666,7 @@
   - OpenCore 9cd61bb (0.6.8 rolling - 2021-03-27)
 - Add Mavericks and newer .app support
 - Refactor USB map building, fixes USB 3.0 displaying as USB 2.0
-- Fix blackscreen on MacBookPro9,1
+- Fix black screen on MacBookPro9,1
 - Update RestrictEvents with custom build (1.0.1)
   - Blocks `/usr/libexec/displaypolicyd` on MacBookPro9,1 to ensure smooth GPU switching
 - Add custom SD Card icon

data/sys_patch_dict.py

@@ -277,7 +277,7 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                     },
                 },
             },
-            "Nvidia Kepler": {
+            "Nvidia Kepler (Kernel Space)": {
                 "Display Name": "Graphics: Nvidia Kepler",
                 "OS Support": {
                     "Minimum OS Support": {
@@ -292,11 +292,7 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                 },
                 "Install": {
                     "/System/Library/Extensions": {
-                        "GeForceAIRPlugin.bundle": "11.0 Beta 3",
-                        "GeForceGLDriver.bundle":  "11.0 Beta 3",
-                        "GeForceMTLDriver.bundle": "11.0 Beta 3",
                         "GeForce.kext":            "12.0 Beta 6",
-                        "GeForceVADriver.bundle":  "12.0 Beta 6",
                         "NVDAGF100Hal.kext":       "12.0 Beta 6",
                         "NVDAGK100Hal.kext":       "12.0 Beta 6",
                         "NVDAResman.kext":         "12.0 Beta 6",
@@ -304,6 +300,35 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                     },
                 },
             },
+            # With macOS 12.5 Beta 3, Apple broke Metal rendering with Kepler
+            # Specifically, MPSImage/MPSCore stall out trying to render the desktop.
+            # This will eventually trigger the watchdog, and kick the user back to the login screen.
+            #
+            # Reference
+            # - https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1004
+            "Nvidia Kepler (Userspace)": {
+                "Display Name": "",
+                "OS Support": {
+                    "Minimum OS Support": {
+                        # 12.0 beta 7 (XNU 21.1)
+                        "OS Major": os_data.os_data.monterey,
+                        "OS Minor": 1
+                    },
+                    "Maximum OS Support": {
+                        # 12.5 (XNU 21.6)
+                        "OS Major": os_data.os_data.monterey,
+                        "OS Minor": 5
+                    },
+                },
+                "Install": {
+                    "/System/Library/Extensions": {
+                        "GeForceAIRPlugin.bundle": "11.0 Beta 3",
+                        "GeForceGLDriver.bundle":  "11.0 Beta 3",
+                        "GeForceMTLDriver.bundle": "11.0 Beta 3",
+                        "GeForceVADriver.bundle":  "12.0 Beta 6",
+                    },
+                },
+            },
             "Nvidia Web Drivers": {
                 "Display Name": "Graphics: Nvidia Web Drivers",
                 "OS Support": {

resources/constants.py

@@ -12,7 +12,7 @@ from data import os_data
 class Constants:
     def __init__(self):
         # Patcher Versioning
-        self.patcher_version = "0.4.8"  # OpenCore-Legacy-Patcher
+        self.patcher_version = "0.4.9"  # OpenCore-Legacy-Patcher
         self.patcher_support_pkg_version = "0.5.1"  #  PatcherSupportPkg
         self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/"
         self.nightly_url_patcher_support_pkg = "https://nightly.link/dortania/PatcherSupportPkg/workflows/build/master/"

resources/sys_patch_detect.py

@@ -362,7 +362,8 @@ class detect_root_patch:
         if hardware_details["Graphics: Nvidia Kepler"] is True:
             required_patches.update({"Metal Common": all_hardware_patchset["Graphics"]["Metal Common"]})
             required_patches.update({"Modern GVA": all_hardware_patchset["Graphics"]["Modern GVA"]})
-            required_patches.update({"Nvidia Kepler": all_hardware_patchset["Graphics"]["Nvidia Kepler"]})
+            required_patches.update({"Nvidia Kepler (Kernel Space)": all_hardware_patchset["Graphics"]["Nvidia Kepler (Kernel Space)"]})
+            required_patches.update({"Nvidia Kepler (Userspace)": all_hardware_patchset["Graphics"]["Nvidia Kepler (Userspace)"]})
             for gpu in self.constants.computer.gpus:
                 # Handle mixed GPU situations (ie. MacBookPro11,3: Haswell iGPU + Kepler dGPU)
                 if gpu.arch == device_probe.Intel.Archs.Haswell:

resources/updates.py

@@ -28,18 +28,16 @@ class check_binary_updates:
         return False
 
     def check_if_build_newer(self):
-        if self.remote_version_array[0] > self.binary_version_array[0]:
+        # Pad version numbers to match length (ie. 0.1.0 vs 0.1.0.1)
+        while len(self.remote_version_array) > len(self.binary_version_array):
+            self.binary_version_array.append(0)
+        while len(self.remote_version_array) < len(self.binary_version_array):
+            self.remote_version_array.append(0)
+
+        for i in range(0, len(self.remote_version_array)):
+            if self.remote_version_array[i] > self.binary_version_array[i]:
                 return True
-        elif self.remote_version_array[0] == self.binary_version_array[0]:
+
-            if self.remote_version_array[1] > self.binary_version_array[1]:
-                return True
-            elif self.remote_version_array[1] == self.binary_version_array[1]:
-                if self.remote_version_array[2] > self.binary_version_array[2]:
-                    return True
-                else:
-                    return False
-            else:
-                return False
         return False
 
     def determine_local_build_type(self):