Merge branch 'main' into sonoma-development

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

@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build Binary
-        run: /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 Build-Binary.command --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}" --key "${{ env.ANALYTICS_KEY }}" --site "${{ env.ANALYTICS_SITE }}"
+        run: /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 Build-Binary.command --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}" --key "${{ env.ANALYTICS_KEY }}" --site "${{ env.ANALYTICS_SITE }}"
 
       # - name: Import Certificate
       #   if: (!security find-certificate -c "${{ env.MAC_CODESIGN_IDENTITY }}")

.github/workflows/validate.yml

@@ -14,4 +14,4 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Validate
-        run: /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 OpenCore-Patcher-GUI.command --validate
+        run: /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 OpenCore-Patcher-GUI.command --validate

Build-Binary.command

@@ -32,7 +32,6 @@ class CreateBinary:
     def __init__(self):
         start = time.time()
         self._set_cwd()
-        self._is_x86_64()
 
         print("Starting build script")
         self.args = self._parse_arguments()
@@ -45,38 +44,6 @@ class CreateBinary:
         print(f"Build script completed in {str(round(time.time() - start, 2))} seconds")
 
 
-    def _is_x86_64(self):
-        """
-        Check if invoked as x86_64
-        Some of our dependancies are not universal, so we'll create a new virtual environment and invoke as Rosetta
-        """
-
-        if platform.machine() != "arm64":
-            return
-
-        print("Detected ARM64, creating x86_64 environment")
-
-        args = sys.argv[:]
-        if "python" in args[0].lower():
-            args.pop(0)
-
-        if not Path(".x86_64_venv").exists():
-            print("Creating new venv")
-            subprocess.run(["arch", "-x86_64", sys.executable, "-m", "venv", ".x86_64_venv"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            print("Installing requirements")
-            subprocess.run(["arch", "-x86_64", ".x86_64_venv/bin/pip3", "install", "-r", "requirements.txt"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-        print("Relaunching as x86_64")
-        result = subprocess.run(["arch", "-x86_64", ".x86_64_venv/bin/python3"] + args)
-
-        if result.returncode != 0:
-            if result.stdout:
-                print("STDOUT: " + result.stdout.decode("utf-8"))
-            if result.stderr:
-                print("STDERR: " + result.stderr.decode("utf-8"))
-        sys.exit(result.returncode)
-
-
     def _set_cwd(self):
         """
         Initialize current working directory to parent of this script

CHANGELOG.md

@@ -4,6 +4,9 @@
 - Resolve BCM2046 and BCM2070 support on macOS 13.3 and newer
 - Workaround 13.3+ Kernel Panic on AMD GCN GPUs playing DRM content
 - Add new macOS Installer download menu (Jazzzny)
+- Add support for Universal 2 distribution (x86_64 and ARM64)
+  - Drops Rosetta requirement on Apple Silicon Macs
+  - Note building from source will require Python 3.11 or newer and up-to-date Python modules
 - Increment Binaries:
   - OpenCorePkg 0.9.3 - release
   - Lilu 1.6.6 - release
@@ -15,6 +18,14 @@
   - BlueToolFixup 2.6.8 - rolling (2305aaa)
   - CryptexFixup 1.0.2 - release
   - PatcherSupportPkg 1.2.6 - release
+- Build Server Changes:
+  - Upgrade Python backend to 3.11.5
+  - Upgrade Python modules:
+    - requests - 2.31.0
+    - pyobjc - 9.2
+    - wxpython - 4.2.1
+    - pyinstaller - 5.13.2
+    - packaging - 23.1
 
 ## 0.6.8
 - Update non-Metal Binaries:

OpenCore-Patcher-GUI.spec

@@ -41,7 +41,7 @@ exe = EXE(pyz,
           upx=True,
           console=False,
           disable_windowed_traceback=False,
-          target_arch=None,
+          target_arch="universal2",
           codesign_identity=None,
           entitlements_file=None )
 coll = COLLECT(exe,

resources/device_probe.py

@@ -973,7 +973,7 @@ class Computer:
 
     def check_rosetta(self):
         result = subprocess.run("sysctl -in sysctl.proc_translated".split(), stdout=subprocess.PIPE).stdout.decode()
-        if result:
+        if "1" in result:
             self.rosetta_active = True
         else:
             self.rosetta_active = False