Add macOS-arm64 builds

Add macOS arm64 to CMakeLists

Add arm64-osx-release to build.yml

dummy commit to trigger workflow

Properly split macOS builds in build.yml

Try to fix actions uploads

Rename the builds

Fix build.yml

Fix typo in build.yml

Author: shinra-electric

.github/workflows/build.yml

@@ -10,24 +10,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        # os: [ubuntu-latest, windows-latest, macos-latest]
+        build: [ubuntu-x64, windows-x64, macos-x64, macos-arm64]
         config: [Release]
         include:
-          - os: ubuntu-latest
+          - build: ubuntu-x64
+            os: ubuntu-latest
             triplet: x64-linux-release
             upload-path: /home/runner/.cache/vcpkg/archives
             vcpkg-root: /usr/local/share/vcpkg
             extra-args: ""
-          - os: windows-latest
+          - build: windows-x64
+            os: windows-latest
             triplet: x64-win-llvm-static-release
             upload-path: C:\Users\runneradmin\AppData\Local\vcpkg\archives
             vcpkg-root: C:\vcpkg
             extra-args: --overlay-triplets=./triplets
-          - os: macos-latest
+          - build: macos-x64
+            os: macos-latest
             triplet: x64-osx-release
             upload-path: /Users/runner/.cache/vcpkg/archives
             vcpkg-root: /usr/local/share/vcpkg
             extra-args: ""
+          - build: macos-arm64
+            os: macos-latest
+            triplet: arm64-osx-release
+            upload-path: /Users/runner/.cache/vcpkg/archives
+            vcpkg-root: /usr/local/share/vcpkg
+            extra-args: ""
 
     steps:
       - uses: actions/checkout@v3
@@ -55,7 +65,6 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: ffmpeg-${{ matrix.os }}
+          name: ffmpeg-${{ matrix.build }}
           path: ${{ matrix.upload-path }}
         if: ${{ always() }}
-

CMakeLists.txt

@@ -14,7 +14,18 @@ if (WIN32 AND NOT MINGW)
 		"${CMAKE_CURRENT_SOURCE_DIR}/lib/windows/x86_64/avfilter.lib"
 		"${CMAKE_CURRENT_SOURCE_DIR}/lib/windows/x86_64/swresample.lib"
 		"psapi;strmiids;uuid;oleaut32;shlwapi;ws2_32;ole32;user32;bcrypt")
-elseif (APPLE)
+elseif (APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
+	target_link_libraries(${FFMPEG_CORE_NAME} INTERFACE
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavformat.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavcodec.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libswscale.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavutil.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavfilter.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libswresample.a"
+		"-framework CoreServices" "-framework CoreFoundation" "-framework AudioUnit"
+		"-framework AudioToolbox" "-framework CoreAudio" "-framework CoreMedia"
+		"-framework VideoToolbox" "-framework CoreVideo" "-framework Security")
+elseif (APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
 	target_link_libraries(${FFMPEG_CORE_NAME} INTERFACE
 		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libavformat.a"
 		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libavcodec.a"