diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-06-07 17:52:40 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-06-07 17:54:02 +0300 |
| commit | 214a78a46f227feb9e35f7bb3597b47825a88aac (patch) | |
| tree | e845c13e7c61fee6cd3d2475ba919211830d9a2c /build_files/build_environment | |
| parent | f87f8532c3c2735b8cbf47cc1e23d20bcfb118e0 (diff) | |
Revert most of rB93a865dde775e.
This revert went too far, only one line (the minimal version of FFMPEG
for `install_deps.sh` script`) actually needed to be reverted...
Sorry for the noise.
Diffstat (limited to 'build_files/build_environment')
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 6 | ||||
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 88f84614867..4500245d42a 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -297,10 +297,10 @@ set(OPENJPEG_HASH 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6 set(OPENJPEG_HASH_TYPE SHA256) set(OPENJPEG_FILE openjpeg-v${OPENJPEG_VERSION}.tar.gz) -set(FFMPEG_VERSION 4.2.3) +set(FFMPEG_VERSION 4.4) set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2) -set(FFMPEG_HASH 695fad11f3baf27784e24cb0e977b65a) -set(FFMPEG_HASH_TYPE MD5) +set(FFMPEG_HASH 42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e) +set(FFMPEG_HASH_TYPE SHA256) set(FFMPEG_FILE ffmpeg-${FFMPEG_VERSION}.tar.bz2) set(FFTW_VERSION 3.3.8) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 18922799d08..fd68129a0ff 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -563,8 +563,8 @@ OIDN_SKIP=false ISPC_VERSION="1.14.1" -FFMPEG_VERSION="4.2.3" -FFMPEG_VERSION_SHORT="4.2" +FFMPEG_VERSION="4.4" +FFMPEG_VERSION_SHORT="4.4" FFMPEG_VERSION_MIN="3.0" FFMPEG_VERSION_MAX="5.0" FFMPEG_FORCE_BUILD=false |