diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/ffmpeg | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ffmpeg')
3 files changed, 3 insertions, 85 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix deleted file mode 100644 index 0df810ff10b0..000000000000 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (rec { - version = "${branch}.17"; - branch = "2.8"; - sha256 = "05bnhvs2f82aq95z1wd3wr42sljdfq4kiyzqwhpji983mndx14vl"; - knownVulnerabilities = [ - "CVE-2021-30123" - ]; - doCheck = false; -} // args) diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 14405f40f67d..516c7546f564 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -2,48 +2,12 @@ # Darwin frameworks , Cocoa, CoreMedia, VideoToolbox , stdenv, lib -, fetchpatch , ... }@args: callPackage ./generic.nix (rec { - version = "4.4"; - branch = "4.4"; - sha256 = "03kxc29y8190k4y8s8qdpsghlbpmchv1m8iqygq2qn0vfm4ka2a2"; + version = "4.4.1"; + branch = version; + sha256 = "0hmck0placn12kd9l0wam70mrpgfs2nlfmi8krd135gdql5g5jcg"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; - - patches = [ - (fetchpatch { - name = "CVE-2021-33815.patch"; - url = "https://github.com/FFmpeg/FFmpeg/commit/26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777.patch"; - sha256 = "0l8dqga5845f7d3wdbvd05i23saldq4pm2cyfdgszbr0c18sxagf"; - }) - (fetchpatch { - name = "CVE-2021-38114.patch"; - url = "https://github.com/FFmpeg/FFmpeg/commit/7150f9575671f898382c370acae35f9087a30ba1.patch"; - sha256 = "0gwkc7v1wsh4j0am2nnskhsca1b5aqzhcfd41sd9mh2swsdyf27i"; - }) - (fetchpatch { - name = "CVE-2021-38171.patch"; - url = "https://github.com/FFmpeg/FFmpeg/commit/9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6.patch"; - sha256 = "0b8hsb45izw7w1vb2b94k9f6kvn2shxrap5ip1krdxg6hs7an0x8"; - }) - (fetchpatch { - name = "CVE-2021-38291.patch"; - url = "https://github.com/FFmpeg/FFmpeg/commit/e01d306c647b5827102260b885faa223b646d2d1.patch"; - sha256 = "0p2p8gcnb5j469xa3czfssm09w3jk08kz8rnl8wi2l9aj9l08my9"; - }) - # Fix incorrect segment length in HLS child playlist with fmp4 segment format - # FIXME remove in version 4.5 - # https://trac.ffmpeg.org/ticket/9193 - # https://trac.ffmpeg.org/ticket/9205 - (fetchpatch { - name = "ffmpeg_fix_incorrect_segment_length_in_hls.patch"; - url = "https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=59032494e81a1a65c0b960aaae7ec4c2cc9db35a"; - sha256 = "03zz1lw51kkc3g3vh47xa5hfiz3g3g1rbrll3kcnslvwylmrqmy3"; - }) - ] ++ lib.optionals stdenv.isDarwin [ - # Work around https://trac.ffmpeg.org/ticket/9242 - ./v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch - ]; } // args) diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch b/nixpkgs/pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch deleted file mode 100644 index c0c2c1fb23bb..000000000000 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5b562aaddbc6e7a94a079c2e88230b205a7f4d73 Mon Sep 17 00:00:00 2001 -From: Zane van Iperen <zane@zanevaniperen.com> -Date: Sat, 15 May 2021 19:33:52 +1000 -Subject: [PATCH v2] avcodec/videotoolboxenc: #define TARGET_CPU_ARM64 to 0 if - not provided by the SDK - -Fixes build failure on older SDKs without it. - -Fixes #9242 - -Signed-off-by: Zane van Iperen <zane@zanevaniperen.com> ---- - libavcodec/videotoolboxenc.c | 4 ++++ - 1 file changed, 4 insertions(+) - -NB: This is untested, I do not have a Mac to try it on. - -diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c -index 58239e0ab9..f063a86e73 100644 ---- a/libavcodec/videotoolboxenc.c -+++ b/libavcodec/videotoolboxenc.c -@@ -50,6 +50,10 @@ enum { kCVPixelFormatType_420YpCbCr10BiPlanarFullRange = 'xf20' }; - enum { kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange = 'x420' }; - #endif - -+#ifndef TARGET_CPU_ARM64 -+# define TARGET_CPU_ARM64 0 -+#endif -+ - typedef OSStatus (*getParameterSetAtIndex)(CMFormatDescriptionRef videoDesc, - size_t parameterSetIndex, - const uint8_t **parameterSetPointerOut, --- -2.29.3 - |