blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include text file in macOS ARM64 build to indicate location of ffmpeg

Browse Source 
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.
This commit is contained in:
Sybren A. Stüvel 2023-10-31 10:34:35 +01:00
parent 06f2a2bc29
commit 8e9329f768
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -371,7 +371,8 @@ release-package-darwin:
# ARM64, without tools because ffmpeg.org doesn't link to any official ARM64 binary. # 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-manager-without-webapp GOOS=darwin GOARCH=arm64
$(MAKE) -s flamenco-worker 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} 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} cd dist; tar zcvf ${RELEASE_PACKAGE_DARWIN_ARM64} ${RELEASE_PACKAGE_DARWIN_ARM64_BASE}
rm -rf dist/${RELEASE_PACKAGE_DARWIN_ARM64_BASE} rm -rf dist/${RELEASE_PACKAGE_DARWIN_ARM64_BASE}

26
web/project-website/content/download/_index.md
View File

@ -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). To see what's new, check [the changelog](https://projects.blender.org/studio/flamenco/src/branch/main/CHANGELOG.md).
| Platform | File | | Platform | File |
|---------------|------------------------------------------------------------------| |---------------------|----------------------------------------------------------------------------------------------------------|
| Windows | {{< flamenco/downloadExperimentalLink os="windows" ext="zip" >}} | | Windows | {{< flamenco/downloadExperimentalLink os="windows" ext="zip" >}} |
| Linux | {{< flamenco/downloadExperimentalLink os="linux" >}} | | Linux | {{< flamenco/downloadExperimentalLink os="linux" >}} |
| macOS (Intel) | {{< flamenco/downloadExperimentalLink os="macos" >}} | | macOS (Intel) | {{< flamenco/downloadExperimentalLink os="macos" >}} |
| checksums | {{< flamenco/sha256linkExperimental >}} | | 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]. Please report any issue at [projects.blender.org][bugs].
[bugs]: https://projects.blender.org/studio/flamenco/issues/new?template=.gitea%2fissue_template%2fbug.yaml [bugs]: https://projects.blender.org/studio/flamenco/issues/new?template=.gitea%2fissue_template%2fbug.yaml
[mac-arm]: #macos-silicon-builds
<!-- <!--
@ -59,6 +61,18 @@ start afresh with the following steps:
{{< /hint >}} {{< /hint >}}
--> -->
## 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 ## License
Flamenco is Free and Open Source software, available under the Flamenco is Free and Open Source software, available under the