From f4b9eabe3851c1e52cb3414c21878d173253d8df Mon Sep 17 00:00:00 2001
From: Richard Smith <github@electronstudio.co.uk>
Date: Mon, 27 Oct 2025 19:34:44 +0000
Subject: [PATCH 1/4] test mac build

---
 .github/workflows/build.yml | 106 ++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7a331bf..c8d7d71 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -117,6 +117,112 @@ jobs:
           path: dist/*
 
 
+  build-mac-arm:
+    runs-on: macos-13
+    strategy:
+      matrix:
+        python-version: [ '3.12', '3.13', '3.14', 'pypy-3.11' ]
+        raylib-platform: ['Desktop', 'SDL']
+    env:
+      MACOSX_DEPLOYMENT_TARGET: '11'
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: fix raygui bug
+        run: |
+          patch -p0 <raygui.h.diff
+
+      - name: Build SDL
+        run: |
+          wget https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.32.8.tar.gz
+          tar xvfz release-2.32.8.tar.gz
+          mkdir build
+          cd build
+          cmake ../SDL-release-2.32.8 -DSDL_SHARED=OFF -DSDL_STATIC=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release
+          cmake --build . --config Release
+          sudo cmake --install .
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          # Version range or exact version of a Python version to use, using SemVer's version range syntax.
+          python-version: ${{ matrix.python-version }}
+          # The target architecture (x86, x64) of the Python interpreter.
+          architecture: arm64
+
+      # Runs a set of commands using the runners shell
+      - name: Build raylib without SDL because SDL version has incorrect pkg-config
+        run: |
+          cd raylib-c
+          mkdir build
+          cd build
+          cmake -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
+          make -j2
+          sudo make install
+
+      - name: Build raylib with SDL if selected
+        run: |
+          cd raylib-c
+          mkdir build2
+          cd build2
+          cmake -DPLATFORM=${{ matrix.raylib-platform }}  -DBUILD_EXAMPLES=OFF -DCUSTOMIZE_BUILD=ON -DSUPPORT_FILEFORMAT_JPG=ON -DSUPPORT_FILEFORMAT_FLAC=ON -DWITH_PIC=ON -DCMAKE_BUILD_TYPE=Release ..
+          make -j2
+          sudo cp raylib/libraylib.a /usr/local/lib/libraylib.a
+
+      - name: Copy extras
+        run: |
+          sudo cp -r raylib-c/src/external/glfw/include/GLFW /usr/local/include/
+          sudo cp physac/src/physac.h /usr/local/include/
+          sudo cp raygui/src/raygui.h /usr/local/include/
+
+      - name: Build raylib-python-cffi
+        env:
+          RAYLIB_PLATFORM: ${{ matrix.raylib-platform }}
+
+        run: |
+          python -m pip install --upgrade pip
+          pip3 install --upgrade "cffi>=2.0.0"
+          pip3 install --upgrade wheel
+          pip3 install --upgrade setuptools
+          python -m pip install --upgrade build
+          python -m build --wheel
+
+#      - name: Rename wheels from universal2 to x86_64
+#        run: |
+#          # Rename universal2 wheels to x86_64 since they aren't truly universal
+#          for wheel in dist/*universal2.whl; do
+#            if [ -f "$wheel" ]; then
+#              new_wheel=$(echo "$wheel" | sed 's/universal2/x86_64/')
+#              echo "Renaming: $(basename "$wheel") -> $(basename "$new_wheel")"
+#              mv "$wheel" "$new_wheel"
+#            fi
+#          done
+#        shell: bash
+
+      - name: Test
+        run: |
+          pip3 install dist/*.whl
+          cd /
+          python3 -c 'import pyray; pyray.init_window(100,100,"test")' >/tmp/output 2>&1 || true
+          cat /tmp/output
+          if grep -q "INFO: Initializing raylib" /tmp/output; then
+            echo "Passed"
+            exit 0
+          else
+            echo "Failed"
+            exit 1
+          fi
+
+      - name: Upload build Artifact wheel
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheel-mac-${{ matrix.raylib-platform }}-${{ matrix.python-version }}
+          path: dist/*
+
+
 
   build-linux:
     runs-on: ubuntu-latest

From 302c790e8324603142c606cc82c5688b321ca45c Mon Sep 17 00:00:00 2001
From: Richard Smith <github@electronstudio.co.uk>
Date: Mon, 27 Oct 2025 19:55:38 +0000
Subject: [PATCH 2/4] test mac build

---
 .cirrus.yml                 |  4 ++--
 .github/workflows/build.yml | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7ca6623..bc448ef 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -72,9 +72,9 @@ pi_task:
 mac_task:
   macos_instance:
     matrix:
-      - image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
+      - image: ghcr.io/cirruslabs/macos-sequoia-xcode:latest
   env:
-    MACOSX_DEPLOYMENT_TARGET: "11.0"
+    MACOSX_DEPLOYMENT_TARGET: "11"
   matrix:
     - env:
         PY_VER: "3.12"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c8d7d71..5cc0541 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -117,7 +117,7 @@ jobs:
           path: dist/*
 
 
-  build-mac-arm:
+  build-mac-arm64:
     runs-on: macos-13
     strategy:
       matrix:
@@ -190,17 +190,17 @@ jobs:
           python -m pip install --upgrade build
           python -m build --wheel
 
-#      - name: Rename wheels from universal2 to x86_64
-#        run: |
-#          # Rename universal2 wheels to x86_64 since they aren't truly universal
-#          for wheel in dist/*universal2.whl; do
-#            if [ -f "$wheel" ]; then
-#              new_wheel=$(echo "$wheel" | sed 's/universal2/x86_64/')
-#              echo "Renaming: $(basename "$wheel") -> $(basename "$new_wheel")"
-#              mv "$wheel" "$new_wheel"
-#            fi
-#          done
-#        shell: bash
+      - name: Rename wheels from universal2 to arm64
+        run: |
+          # Rename universal2 wheels to arm64 since they aren't truly universal
+          for wheel in dist/*universal2.whl; do
+            if [ -f "$wheel" ]; then
+              new_wheel=$(echo "$wheel" | sed 's/universal2/arm64/')
+              echo "Renaming: $(basename "$wheel") -> $(basename "$new_wheel")"
+              mv "$wheel" "$new_wheel"
+            fi
+          done
+        shell: bash
 
       - name: Test
         run: |
@@ -219,7 +219,7 @@ jobs:
       - name: Upload build Artifact wheel
         uses: actions/upload-artifact@v4
         with:
-          name: wheel-mac-${{ matrix.raylib-platform }}-${{ matrix.python-version }}
+          name: wheel-mac-arm64-${{ matrix.raylib-platform }}-${{ matrix.python-version }}
           path: dist/*
 
 
@@ -500,7 +500,7 @@ jobs:
           path: dynamic/dist/*
 
   merge:
-    needs: [build-mac-intel, build-windows, build-linux, source-distro, dynamic-distro]
+    needs: [build-mac-intel, build-mac-arm64, build-windows, build-linux, source-distro, dynamic-distro]
     runs-on: ubuntu-latest
     steps:
       - name: Merge All Artifacts

From e60b228468c0cb55b63d5b3c43a104134ecd2bb1 Mon Sep 17 00:00:00 2001
From: Richard Smith <github@electronstudio.co.uk>
Date: Mon, 27 Oct 2025 20:20:17 +0000
Subject: [PATCH 3/4] test mac build

---
 .github/workflows/build.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5cc0541..08775e7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -190,18 +190,6 @@ jobs:
           python -m pip install --upgrade build
           python -m build --wheel
 
-      - name: Rename wheels from universal2 to arm64
-        run: |
-          # Rename universal2 wheels to arm64 since they aren't truly universal
-          for wheel in dist/*universal2.whl; do
-            if [ -f "$wheel" ]; then
-              new_wheel=$(echo "$wheel" | sed 's/universal2/arm64/')
-              echo "Renaming: $(basename "$wheel") -> $(basename "$new_wheel")"
-              mv "$wheel" "$new_wheel"
-            fi
-          done
-        shell: bash
-
       - name: Test
         run: |
           pip3 install dist/*.whl
@@ -216,6 +204,18 @@ jobs:
             exit 1
           fi
 
+      - name: Rename wheels from universal2 to arm64
+        run: |
+          # Rename universal2 wheels to arm64 since they aren't truly universal
+          for wheel in dist/*universal2.whl; do
+            if [ -f "$wheel" ]; then
+              new_wheel=$(echo "$wheel" | sed 's/universal2/arm64/')
+              echo "Renaming: $(basename "$wheel") -> $(basename "$new_wheel")"
+              mv "$wheel" "$new_wheel"
+            fi
+          done
+        shell: bash
+
       - name: Upload build Artifact wheel
         uses: actions/upload-artifact@v4
         with:

From 49267e7c79221c92b1b714cff05c958f59f7279a Mon Sep 17 00:00:00 2001
From: Richard Smith <github@electronstudio.co.uk>
Date: Mon, 27 Oct 2025 20:27:36 +0000
Subject: [PATCH 4/4] test mac build

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 08775e7..3a5359f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -121,7 +121,7 @@ jobs:
     runs-on: macos-13
     strategy:
       matrix:
-        python-version: [ '3.12', '3.13', '3.14', 'pypy-3.11' ]
+        python-version: [ '3.12', '3.13', '3.14']
         raylib-platform: ['Desktop', 'SDL']
     env:
       MACOSX_DEPLOYMENT_TARGET: '11'