Merge pull request #118990 from TredwellGit/ffmpeg

ffmpeg: 4.3.2 -> 4.4
This commit is contained in:
Martin Weinelt 2021-04-17 02:55:34 +02:00 committed by GitHub
commit 2a2f1b4025
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 19 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkg-config, perl, texinfo, yasm { lib, stdenv, ffmpeg, addOpenGLRunpath, pkg-config, perl, texinfo, yasm
/* /*
* Licensing options (yes some are listed twice, filters and such are not listed) * Licensing options (yes some are listed twice, filters and such are not listed)
*/ */
@ -126,7 +126,6 @@
, vid-stab ? null # Video stabilization , vid-stab ? null # Video stabilization
#, vo-aacenc ? null # AAC encoder #, vo-aacenc ? null # AAC encoder
, vo-amrwbenc ? null # AMR-WB encoder , vo-amrwbenc ? null # AMR-WB encoder
, wavpack ? null # Wavpack encoder
, x264 ? null # H.264/AVC encoder , x264 ? null # H.264/AVC encoder
, x265 ? null # H.265/HEVC encoder , x265 ? null # H.265/HEVC encoder
, xavs ? null # AVS encoder , xavs ? null # AVS encoder
@ -244,15 +243,6 @@ stdenv.mkDerivation rec {
pname = "ffmpeg-full"; pname = "ffmpeg-full";
inherit (ffmpeg) src version; inherit (ffmpeg) src version;
# this should go away in the next release
patches = [
# Patch ffmpeg for svt-av1 until version 4.4
(fetchpatch {
url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch";
sha256 = "1p4g8skr5gjw5h1648j7qrks81zx49lrnx9g0p81qgnrvxc2wwx0";
})
];
prePatch = '' prePatch = ''
patchShebangs . patchShebangs .
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
@ -405,7 +395,6 @@ stdenv.mkDerivation rec {
(enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0 (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0
#(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc")
(enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") (enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc")
(enableFeature (wavpack != null) "libwavpack")
(enableFeature (x264 != null && gplLicensing) "libx264") (enableFeature (x264 != null && gplLicensing) "libx264")
(enableFeature (x265 != null && gplLicensing) "libx265") (enableFeature (x265 != null && gplLicensing) "libx265")
(enableFeature (xavs != null && gplLicensing) "libxavs") (enableFeature (xavs != null && gplLicensing) "libxavs")
@ -432,7 +421,7 @@ stdenv.mkDerivation rec {
libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr
samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore
zeromq4 zlib zeromq4 zlib
] ++ optionals openglExtlib [ libGL libGLU ] ] ++ optionals openglExtlib [ libGL libGLU ]
++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]
@ -465,6 +454,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A complete, cross-platform solution to record, convert and stream audio and video"; description = "A complete, cross-platform solution to record, convert and stream audio and video";
homepage = "https://www.ffmpeg.org/"; homepage = "https://www.ffmpeg.org/";
changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog";
longDescription = '' longDescription = ''
FFmpeg is the leading multimedia framework, able to decode, encode, transcode, FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
mux, demux, stream, filter and play pretty much anything that humans and machines mux, demux, stream, filter and play pretty much anything that humans and machines

View file

@ -1,4 +1,4 @@
{ callPackage, fetchpatch { callPackage
# Darwin frameworks # Darwin frameworks
, Cocoa, CoreMedia , Cocoa, CoreMedia
, ... , ...

View file

@ -1,12 +1,12 @@
{ callPackage, fetchpatch { callPackage
# Darwin frameworks # Darwin frameworks
, Cocoa, CoreMedia, VideoToolbox , Cocoa, CoreMedia, VideoToolbox
, ... , ...
}@args: }@args:
callPackage ./generic.nix (rec { callPackage ./generic.nix (rec {
version = "4.3.2"; version = "4.4";
branch = "4.3"; branch = "4.4";
sha256 = "0flik4y7c5kchj65p3p908mk1dsncqgzjdvzysjs12rmf1m6sfmb"; sha256 = "03kxc29y8190k4y8s8qdpsghlbpmchv1m8iqygq2qn0vfm4ka2a2";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args) } // args)

View file

@ -213,7 +213,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A complete, cross-platform solution to record, convert and stream audio and video"; description = "A complete, cross-platform solution to record, convert and stream audio and video";
homepage = "http://www.ffmpeg.org/"; homepage = "https://www.ffmpeg.org/";
changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog";
longDescription = '' longDescription = ''
FFmpeg is the leading multimedia framework, able to decode, encode, transcode, FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
mux, demux, stream, filter and play pretty much anything that humans and machines mux, demux, stream, filter and play pretty much anything that humans and machines