qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg_7: 7.0.2 -> 7.1

Browse Source
This commit is contained in:
Emily 2024-10-04 23:02:08 +01:00
parent e624818293
commit 7ad7e69aa8
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -506,7 +506,7 @@
- Minimal installer ISOs are no longer built on the small channel.
Please obtain installer images from the full release channels.
- The default FFmpeg version is now 7, and FFmpeg 5 has been removed.
- The default FFmpeg version is now 7.1, and FFmpeg 5 has been removed.
Please prefer using the package variants without a version suffix,
or pin FFmpeg 6 or 4 if necessary for compatibility.
Note that we keep old versions around only as required

4
pkgs/development/libraries/ffmpeg/default.nix
View File

@ -34,8 +34,8 @@ let
};
v7 = {
version = "7.0.2";
hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs=";
version = "7.1";
hash = "sha256-erTkv156VskhYEJWjpWFvHjmcr2hr6qgUi28Ho8NFYk=";
};
in

10
pkgs/development/libraries/ffmpeg/fix-fate-ffmpeg-spec-disposition-7.1.patch Normal file
View File

@ -0,0 +1,10 @@
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
index 869376dd18..d9348ee837 100644
--- a/tests/fate/ffmpeg.mak
+++ b/tests/fate/ffmpeg.mak
@@ -266,4 +266,4 @@
# test matching by stream disposition
fate-ffmpeg-spec-disposition: CMD = framecrc -i $(TARGET_SAMPLES)/mpegts/pmtchange.ts -map '0:disp:visual_impaired+descriptions:1' -c copy
-FATE_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition

11
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -457,16 +457,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y=";
})
]
++ optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.0.1") [
(fetchpatch2 {
# Will likely be obsolete in >7.0
name = "fate_avoid_dependency_on_samples";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834";
hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I=";
})
]
++ optionals (lib.versionAtLeast version "7.0") [
++ optionals (lib.versionAtLeast version "7.1") [
./0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch
./fix-fate-ffmpeg-spec-disposition-7.1.patch
# Expose a private API for Chromium / Qt WebEngine.
(fetchpatch2 {