From fe871db0886079d3561975ab8941935543102ead Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 8 Apr 2022 15:08:22 +1000 Subject: [PATCH] ffmpeg_5: 5.0 -> 5.0.1 https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/9687cae2b468e09e35df4cea92cc2e6a0e6c93b3:/Changelog#l4 --- ...missing-samples-dependency-to-fate-s.patch | 27 ------------------- pkgs/development/libraries/ffmpeg/5.nix | 6 ++--- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch diff --git a/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch b/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch deleted file mode 100644 index ac016069357d..000000000000 --- a/pkgs/development/libraries/ffmpeg/0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a66b58d61caaae452785a2d69f5de9259ab27138 Mon Sep 17 00:00:00 2001 -From: James Almer -Date: Sun, 16 Jan 2022 00:32:52 -0300 -Subject: [PATCH] fate/ffmpeg: add missing samples dependency to fate-shortest - -Signed-off-by: James Almer -(cherry picked from commit b1ef5882e35d1a95e9c4838d0933084773055345) ---- - tests/fate/ffmpeg.mak | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak -index 0b00bb5b23..b80467d02e 100644 ---- a/tests/fate/ffmpeg.mak -+++ b/tests/fate/ffmpeg.mak -@@ -86,7 +86,7 @@ fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \ - -guess_layout_max 0 -f s32le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \ - -f ac3 -flags +bitexact -c ac3_fixed - --FATE_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \ -+FATE_SAMPLES_FFMPEG-$(call ALLYES, FILE_PROTOCOL LAVFI_INDEV RAWVIDEO_DEMUXER \ - SINE_FILTER PCM_S16LE_DECODER RAWVIDEO_DECODER \ - ARESAMPLE_FILTER AMIX_FILTER MPEG4_ENCODER \ - AC3_FIXED_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \ --- -2.33.1 - diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix index 7b79ddff77eb..b5dff5a282e2 100644 --- a/pkgs/development/libraries/ffmpeg/5.nix +++ b/pkgs/development/libraries/ffmpeg/5.nix @@ -5,10 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "5.0"; + version = "5.0.1"; branch = version; - sha256 = "1ndy6a2bhl6nvz9grmcaakh4xi0vss455466s47l6qy7na6hn4y0"; + sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY="; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; - - patches = [ ./0001-fate-ffmpeg-add-missing-samples-dependency-to-fate-s.patch ]; } // args)