From 2c9564a2ff0a11e2d9d9a19f858659c37249f31b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Sun, 19 May 2024 16:54:20 +0200
Subject: [PATCH] Simplify macOs setup

We no longer use cross-compilation, so remove macOs-specific compilation
flags.
---
 .github/workflows/build.yml |  4 ++--
 scripts/build-codecs.py     | 17 ++---------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 094faf0..125aa60 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,9 +9,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-latest
+          - os: macos-14
             arch: arm64
-          - os: macos-latest
+          - os: macos-13
             arch: x86_64
           - os: ubuntu-latest
             arch: aarch64
diff --git a/scripts/build-codecs.py b/scripts/build-codecs.py
index 5ced7f8..7330b08 100644
--- a/scripts/build-codecs.py
+++ b/scripts/build-codecs.py
@@ -92,17 +92,6 @@ def run(cmd):
     os.chdir(build_dir)
 
     prepend_env("PATH", os.path.join(dest_dir, "bin"), separator=":")
-    if platform.system() == "Darwin" and os.environ.get("ARCHFLAGS") == "-arch arm64":
-        opus_configure_args = [
-            "--build",
-            "x86_64-apple-darwin20.6.0",
-            "--host",
-            "amd64-apple-darwin20.6.0",
-        ]
-        vpx_configure_args = ["--target=arm64-darwin20-gcc"]
-    else:
-        opus_configure_args = []
-        vpx_configure_args = []
 
     #### BUILD TOOLS ####
 
@@ -127,8 +116,7 @@ def run(cmd):
             "--disable-shared",
             "--enable-static",
             "--with-pic",
-        ]
-        + opus_configure_args,
+        ],
     )
 
     # build vpx
@@ -140,8 +128,7 @@ def run(cmd):
             "--disable-tools",
             "--disable-unit-tests",
             "--enable-pic",
-        ]
-        + vpx_configure_args,
+        ],
     )
 
     run(["tar", "czvf", output_tarball, "-C", dest_dir, "include", "lib"])