jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

macOS arm64 (#591)

Browse source
This commit is contained in:
Brad Richardson 2022-12-20 14:38:50 -05:00 • committed by GitHub
commit 7a23d6aa81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -38,3 +38,7 @@
path = third-party/ffmpeg-linux-aarch64 path = third-party/ffmpeg-linux-aarch64
url = https://github.com/LizardByte/build-deps url = https://github.com/LizardByte/build-deps
branch = ffmpeg-linux-aarch64 branch = ffmpeg-linux-aarch64
[submodule "ffmpeg-macos-aarch64"]
path = third-party/ffmpeg-macos-aarch64
url = https://github.com/LizardByte/build-deps
branch = ffmpeg-macos-aarch64

6
CMakeLists.txt
View file

@ -375,7 +375,11 @@ if(WIN32)
set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64") set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64")
set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid) set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid)
elseif(APPLE) elseif(APPLE)
set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64") if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-aarch64")
else()
set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64")
endif()
else() else()
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64") set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64")

2
docs/source/building/macos.rst
View file

@ -12,7 +12,7 @@ MacPorts
Install Requirements Install Requirements
.. code-block:: bash .. code-block:: bash
sudo port install boost cmake libopus npm9 sudo port install avahi boost180 cmake curl libopus npm9 pkgconfig
Homebrew Homebrew
"""""""" """"""""

1
packaging/macos/Portfile
View file

@ -32,6 +32,7 @@ post-fetch {
} }
depends_lib port:avahi \ depends_lib port:avahi \
port:boost180 \
port:curl \ port:curl \
port:libopus \ port:libopus \
port:npm9 \ port:npm9 \

1
third-party/ffmpeg-macos-aarch64 vendored Submodule

@ -0,0 +1 @@
Subproject commit 9103674a57ab04f5109d4e10812fbf9f22685468