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

Bump packaged FFmpeg version 5.1.2 -> 7.0.2

Browse Source 
The previously-bundled version was so old, when packaging FFmpeg for
Windows release, FFmpeg could not be downloaded any more.

Reviewed-on: https://projects.blender.org/studio/flamenco/pulls/104351
This commit is contained in:
Nitin-Rawat-1 2025-02-16 10:31:43 +00:00 committed by Sybren A. Stüvel
parent 4be5c1ca5b
commit edc57ab392
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ bugs in actually-released versions.
- Fix issue where jobs could get stuck in `pause-requested` state. Such jobs are now also detected at startup of the Manager, and sent to `paused` when possible. - Fix issue where jobs could get stuck in `pause-requested` state. Such jobs are now also detected at startup of the Manager, and sent to `paused` when possible.
- Log a warning at startup when the `blender` variable is missing, or has no value for one or more platforms. - Log a warning at startup when the `blender` variable is missing, or has no value for one or more platforms.
- Fix an issue in the First Time Setup wizard, where the "System Default Location for Blender" could cause the `blender` variable to be empty, and thus the farm inoperable. - Fix an issue in the First Time Setup wizard, where the "System Default Location for Blender" could cause the `blender` variable to be empty, and thus the farm inoperable.
- Upgrade bundled FFmpeg from 5.1.2 to 7.0.2
## 3.6 - released 2024-12-01 ## 3.6 - released 2024-12-01

23
Makefile
View File

@ -195,27 +195,22 @@ tools:
# FFmpeg version to bundle. # FFmpeg version to bundle.
# Version 5.1.3 is the last release in the 5.x series, but binaries have not FFMPEG_VERSION=7.0.2
# been made available. And then there are different 'latest' binaries for the
# different platforms.
FFMPEG_VERSION_LINUX=5.1.1
FFMPEG_VERSION_WINDOWS=5.1.2
FFMPEG_VERSION_DARWIN=5.1.2
TOOLS=./tools TOOLS=./tools
TOOLS_DOWNLOAD=./tools/download TOOLS_DOWNLOAD=./tools/download
FFMPEG_PACKAGE_LINUX=$(TOOLS_DOWNLOAD)/ffmpeg-$(FFMPEG_VERSION_LINUX)-linux-amd64-static.tar.xz FFMPEG_PACKAGE_LINUX=$(TOOLS_DOWNLOAD)/ffmpeg-$(FFMPEG_VERSION)-linux-amd64-static.tar.xz
FFMPEG_PACKAGE_DARWIN=$(TOOLS_DOWNLOAD)/ffmpeg-$(FFMPEG_VERSION_DARWIN)-darwin-amd64.zip FFMPEG_PACKAGE_DARWIN=$(TOOLS_DOWNLOAD)/ffmpeg-$(FFMPEG_VERSION)-darwin-amd64.zip
FFMPEG_PACKAGE_WINDOWS=$(TOOLS_DOWNLOAD)/ffmpeg-$(FFMPEG_VERSION_WINDOWS)-windows-amd64.zip FFMPEG_PACKAGE_WINDOWS=$(TOOLS_DOWNLOAD)/ffmpeg-$(FFMPEG_VERSION)-windows-amd64.zip
.PHONY: tools-linux .PHONY: tools-linux
tools-linux: tools-linux:
[ -e $(FFMPEG_PACKAGE_LINUX) ] || curl \ [ -e $(FFMPEG_PACKAGE_LINUX) ] || curl \
--create-dirs -o $(FFMPEG_PACKAGE_LINUX) \ --create-dirs -o $(FFMPEG_PACKAGE_LINUX) \
https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-$(FFMPEG_VERSION_LINUX)-amd64-static.tar.xz https://www.johnvansickle.com/ffmpeg/releases/ffmpeg-$(FFMPEG_VERSION)-amd64-static.tar.xz
tar xvf \ tar xvf \
$(FFMPEG_PACKAGE_LINUX) \ $(FFMPEG_PACKAGE_LINUX) \
ffmpeg-$(FFMPEG_VERSION_LINUX)-amd64-static/ffmpeg \ ffmpeg-$(FFMPEG_VERSION)-amd64-static/ffmpeg \
--strip-components=1 --strip-components=1
mv ffmpeg $(TOOLS)/ffmpeg-linux-amd64 mv ffmpeg $(TOOLS)/ffmpeg-linux-amd64
@ -223,7 +218,7 @@ tools-linux:
tools-darwin: tools-darwin:
[ -e $(FFMPEG_PACKAGE_DARWIN) ] || curl \ [ -e $(FFMPEG_PACKAGE_DARWIN) ] || curl \
--create-dirs -o $(FFMPEG_PACKAGE_DARWIN) \ --create-dirs -o $(FFMPEG_PACKAGE_DARWIN) \
https://evermeet.cx/ffmpeg/ffmpeg-$(FFMPEG_VERSION_DARWIN).zip https://evermeet.cx/ffmpeg/ffmpeg-$(FFMPEG_VERSION).zip
unzip $(FFMPEG_PACKAGE_DARWIN) unzip $(FFMPEG_PACKAGE_DARWIN)
mv ffmpeg $(TOOLS)/ffmpeg-darwin-amd64 mv ffmpeg $(TOOLS)/ffmpeg-darwin-amd64
@ -231,8 +226,8 @@ tools-darwin:
tools-windows: tools-windows:
[ -e $(FFMPEG_PACKAGE_WINDOWS) ] || curl \ [ -e $(FFMPEG_PACKAGE_WINDOWS) ] || curl \
--create-dirs -o $(FFMPEG_PACKAGE_WINDOWS) \ --create-dirs -o $(FFMPEG_PACKAGE_WINDOWS) \
https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-$(FFMPEG_VERSION_WINDOWS)-essentials_build.zip https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-$(FFMPEG_VERSION)-essentials_build.zip
unzip -j $(FFMPEG_PACKAGE_WINDOWS) ffmpeg-$(FFMPEG_VERSION_WINDOWS)-essentials_build/bin/ffmpeg.exe -d . unzip -j $(FFMPEG_PACKAGE_WINDOWS) ffmpeg-$(FFMPEG_VERSION)-essentials_build/bin/ffmpeg.exe -d .
mv ffmpeg.exe $(TOOLS)/ffmpeg-windows-amd64.exe mv ffmpeg.exe $(TOOLS)/ffmpeg-windows-amd64.exe