git.iko.soy/typeable/nixpkgs
on master help sign in
ffmpeg_5: 5.0 -> 5.0.1

https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/9687cae2b468e09e35df4cea92cc2e6a0e6c93b3:/Changelog#l4

commitfe871db0886079d3561975ab8941935543102ead authorzowoq <59103226+zowoq@users.noreply.github.com> dateFri 8 Apr 2022, 15:08 (5 years ago) parent23e9e78
2 files changed+2−31
pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch−27 pkgs/development/libraries/ffmpeg/5.nix+2−4
pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patchdeleted−27
@@ -1,27 +0,0 @@
1−From a66b58d61caaae452785a2d69f5de9259ab27138 Mon Sep 17 00:00:00 2001
2−From: James Almer <jamrial@gmail.com>
3−Date: Sun, 16 Jan 2022 00:32:52 -0300
4−Subject: [PATCH] fate/ffmpeg: add missing samples dependency to fate-shortest
5−
6−Signed-off-by: James Almer <jamrial@gmail.com>
7−(cherry picked from commit b1ef5882e35d1a95e9c4838d0933084773055345)
8−---
9− tests/fate/ffmpeg.mak | 2 +-
10− 1 file changed, 1 insertion(+), 1 deletion(-)
11−
12−diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
13−index 0b00bb5b23..b80467d02e 100644
14−--- a/tests/fate/ffmpeg.mak
15−+++ b/tests/fate/ffmpeg.mak
16−@@ -86,7 +86,7 @@ fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \
17− -guess_layout_max 0 -f s32le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \
18− -f ac3 -flags +bitexact -c ac3_fixed
19−
20−-FATE_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \
21−+FATE_SAMPLES_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \
22− SINE_FILTER PCM_S16LE_DECODER RAWVIDEO_DECODER \
23− ARESAMPLE_FILTER AMIX_FILTER MPEG4_ENCODER \
24− AC3_FIXED_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \
25−--
26−2.33.1
27−
pkgs/development/libraries/ffmpeg/5.nix+2−4
@@ -5,10 +5,8 @@
55}@args:
66
77callPackage ./generic.nix (rec {
8− version = "5.0";
8+ version = "5.0.1";
99 branch = version;
10− sha256 = "1ndy6a2bhl6nvz9grmcaakh4xi0vss455466s47l6qy7na6hn4y0";
10+ sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY=";
1111 darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
12−
13− patches = [ ./0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch ];
1412} // args)