From 8e9329f76800ec3d0c13d212369e7776174910fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 31 Oct 2023 10:34:35 +0100 Subject: [PATCH] Include text file in macOS ARM64 build to indicate location of ffmpeg Add a bit more documentation about the lack of ffmpeg on macOS/arm64 builds and include a text file in the download package for that platform to signal where any ffmpeg binary should be placed. --- Makefile | 3 ++- .../content/download/_index.md | 26 ++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index be5bc0b7..e99a7539 100644 --- a/Makefile +++ b/Makefile @@ -371,7 +371,8 @@ release-package-darwin: # ARM64, without tools because ffmpeg.org doesn't link to any official ARM64 binary. $(MAKE) -s flamenco-manager-without-webapp GOOS=darwin GOARCH=arm64 $(MAKE) -s flamenco-worker GOOS=darwin GOARCH=arm64 - mkdir -p dist/${RELEASE_PACKAGE_DARWIN_ARM64_BASE} + mkdir -p dist/${RELEASE_PACKAGE_DARWIN_ARM64_BASE}/tools + echo "Put an ffmpeg executable in this directory so that Flamenco Worker can find it" > dist/${RELEASE_PACKAGE_DARWIN_ARM64_BASE}/tools/put_ffmpeg_here.txt cp flamenco-manager flamenco-worker ${RELEASE_PACKAGE_EXTRA_FILES} dist/${RELEASE_PACKAGE_DARWIN_ARM64_BASE} cd dist; tar zcvf ${RELEASE_PACKAGE_DARWIN_ARM64} ${RELEASE_PACKAGE_DARWIN_ARM64_BASE} rm -rf dist/${RELEASE_PACKAGE_DARWIN_ARM64_BASE} diff --git a/web/project-website/content/download/_index.md b/web/project-website/content/download/_index.md index d1c98668..9cb1b03c 100644 --- a/web/project-website/content/download/_index.md +++ b/web/project-website/content/download/_index.md @@ -29,16 +29,18 @@ and `flamenco-manager.sqlite` files before you venture forth. To see what's new, check [the changelog](https://projects.blender.org/studio/flamenco/src/branch/main/CHANGELOG.md). -| Platform | File | -|---------------|------------------------------------------------------------------| -| Windows | {{< flamenco/downloadExperimentalLink os="windows" ext="zip" >}} | -| Linux | {{< flamenco/downloadExperimentalLink os="linux" >}} | -| macOS (Intel) | {{< flamenco/downloadExperimentalLink os="macos" >}} | -| checksums | {{< flamenco/sha256linkExperimental >}} | +| Platform | File | +|---------------------|----------------------------------------------------------------------------------------------------------| +| Windows | {{< flamenco/downloadExperimentalLink os="windows" ext="zip" >}} | +| Linux | {{< flamenco/downloadExperimentalLink os="linux" >}} | +| macOS (Intel) | {{< flamenco/downloadExperimentalLink os="macos" >}} | +| macOS (Silicon/ARM) | {{< flamenco/downloadExperimentalLink os="macos" arch="arm64" >}} (without FFmpeg, [see below][mac-arm]) | +| checksums | {{< flamenco/sha256linkExperimental >}} | Please report any issue at [projects.blender.org][bugs]. [bugs]: https://projects.blender.org/studio/flamenco/issues/new?template=.gitea%2fissue_template%2fbug.yaml +[mac-arm]: #macos-silicon-builds +## macOS "Silicon" builds + +The FFmpeg binaries that are bundled with Flamenco are linked directly from +[ffmpeg.org](https://ffmpeg.org/), and thus there is a level of trust. That +website, however, does not link directly to any trusted binaries for macOS +"Silicon" ARM64. This is why Flamenco did not ship macOS/ARM64 builds for a long +time. As of v3.3 this architecture will be included in the official Flamenco +builds, but for now will be shipped without FFmpeg binary. + +To install this binary, download it from a source you trust or build it +yourself, then place it into Flamenco's `tools` directory. + ## License Flamenco is Free and Open Source software, available under the