ffmpeg: switch default to ffmpeg_8 (#450436)

This commit is contained in:
Jo
2025-10-25 04:31:00 +00:00
committed by GitHub
4 changed files with 11 additions and 11 deletions
+2 -2
View File
@@ -75,12 +75,12 @@ stdenv.mkDerivation (finalAttrs: {
};
# sha256 because actual output of fpcalc is quite long
expectedHash = "c47ae40e02caf798ff5ab4d91ff00cfdca8f6786c581662436941d3e000c9aac";
expectedHash = "e2895130bcbe7190184379021daa60c5f5d476da4a2fecb06df7160819662e20";
in
''
runHook preCheck
tests/all_tests
${lib.optionalString withTools "diff -u <(src/cmd/fpcalc ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"}
${lib.optionalString withTools "diff -u <(src/cmd/fpcalc -plain ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"}
runHook postCheck
'';
+4 -4
View File
@@ -6,7 +6,7 @@
cmake,
pkg-config,
which,
ffmpeg,
ffmpeg_7,
fftw,
frei0r,
libdv,
@@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
(opencv4.override { inherit ffmpeg; })
ffmpeg
(opencv4.override { inherit ffmpeg_7; })
ffmpeg_7
fftw
frei0r
libdv
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
inherit ffmpeg;
ffmpeg = ffmpeg_7;
};
passthru.updateScript = gitUpdater {
@@ -65,7 +65,7 @@ rec {
# unversioned aliases to allow for quicker migration to new releases,
# but can pin one of the versioned variants if they do not work with
# the current default version.
ffmpeg = ffmpeg_7;
ffmpeg-headless = ffmpeg_7-headless;
ffmpeg-full = ffmpeg_7-full;
ffmpeg = ffmpeg_8;
ffmpeg-headless = ffmpeg_8-headless;
ffmpeg-full = ffmpeg_8-full;
}
+2 -2
View File
@@ -58,7 +58,7 @@
enableVtk ? false,
vtk,
enableFfmpeg ? true,
ffmpeg,
ffmpeg_7,
enableGStreamer ? true,
elfutils,
gst_all_1,
@@ -365,7 +365,7 @@ effectiveStdenv.mkDerivation {
openjpeg
]
++ optionals enableFfmpeg [
ffmpeg
ffmpeg_7
]
++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [
elfutils