From d6ec466140839dd70c1a43671eb4a08b007695c2 Mon Sep 17 00:00:00 2001
From: Kevin Granade <kevin.granade@gmail.com>
Date: Tue, 28 Feb 2023 16:53:47 -0800
Subject: [PATCH] ReReRevert MacOS Arm build (#63848)

---
 .github/workflows/release.yml           | 24 ++---------------
 build-scripts/get-mac-sdl2-framework.sh | 35 -------------------------
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100755 build-scripts/get-mac-sdl2-framework.sh

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 95b0644e7be50..12db8186416b6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -174,7 +174,6 @@ jobs:
             content: application/gzip
           - name: OSX Curses x64
             os: macos-10.15
-            arch: x64
             mxe: none
             tiles: 0
             sound: 0
@@ -183,22 +182,12 @@ jobs:
             content: application/x-apple-diskimage
           - name: OSX Tiles x64
             os: macos-10.15
-            arch: x64
             mxe: none
             tiles: 1
             sound: 0
             artifact: osx-tiles-x64
             ext: dmg
             content: application/x-apple-diskimage
-          - name: OSX Tiles arm64
-            os: macos-11
-            arch: arm64
-            mxe: none
-            tiles: 1
-            sound: 0
-            artifact: osx-tiles-arm64
-            ext: dmg
-            content: application/x-apple-diskimage
           - name: Android x64
             os: ubuntu-latest
             mxe: none
@@ -273,12 +262,8 @@ jobs:
       - name: Install dependencies (mac)
         if: runner.os == 'macOS'
         run: |
-          brew install gettext ccache parallel
-          ${{ github.workspace }}/build-scripts/get-mac-sdl2-framework.sh
+          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel
           pip3 install mac_alias==2.2.0 dmgbuild==1.4.2 biplist
-        env:
-          HOMEBREW_NO_AUTO_UPDATE: 1
-          HOMEBREW_NO_INSTALL_CLEANUP: 1
       - name: Create VERSION.TXT
         shell: bash
         run: |
@@ -316,12 +301,7 @@ jobs:
       - name: Build CDDA (osx)
         if: runner.os == 'macOS'
         run: |
-          if [[ '${{ matrix.arch }}' == 'arm64' ]]; then
-            OSX_MIN=11.0
-          else
-            OSX_MIN=10.12
-          fi
-          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 OSX_MIN=$OSX_MIN FRAMEWORK=1 ARCH=${{ matrix.arch }} dmgdist
+          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 OSX_MIN=10.12 dmgdist
           mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
       - name: Set up JDK 8 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
diff --git a/build-scripts/get-mac-sdl2-framework.sh b/build-scripts/get-mac-sdl2-framework.sh
deleted file mode 100755
index d407a97b69edb..0000000000000
--- a/build-scripts/get-mac-sdl2-framework.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#/bin/bash
-
-# This script downloads the SDL2 framework for macOS
-set -u
-
-SDL2_VERSION=2.26.3
-SDL2_TTF_VERSION=2.20.2
-SDL2_IMAGE_VERSION=2.6.3
-SDL2_MIXER_VERSION=2.6.3
-TARGET_PATH=~/Library/Frameworks
-
-function download_sdl_framework {
-  local project_id=$1
-  local version=$2
-
-  local github_id=${project_id%2}
-  local url=https://github.com/libsdl-org/$github_id/releases/download/release-$version/$project_id-$version.dmg
-  local output_file=$project_id-$version.dmg
-  
-  echo "Downloading $project_id"
-  curl -L -o $output_file $url
-  hdiutil attach $output_file
-  cp -R /Volumes/$project_id/$project_id.framework $TARGET_PATH
-  hdiutil detach /Volumes/$project_id
-  rm $output_file
-}
-
-pushd $(mktemp -d)
-
-download_sdl_framework SDL2 $SDL2_VERSION
-download_sdl_framework SDL2_ttf $SDL2_TTF_VERSION
-download_sdl_framework SDL2_image $SDL2_IMAGE_VERSION
-download_sdl_framework SDL2_mixer $SDL2_MIXER_VERSION
-
-popd