diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ffmpeg')
4 files changed, 37 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 8dc42dea247d..e57c0fcff5bc 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -1,6 +1,6 @@ import ./generic.nix { version = "4.4.4"; - sha256 = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA="; + hash = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA="; extraPatches = [ { name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix index a3ff054f1e60..68edb0fd37e4 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix @@ -1,6 +1,6 @@ import ./generic.nix { version = "5.1.3"; - sha256 = "sha256-twfJvANLQGO7TiyHPMPqApfHLFUlOGZTTIIGEnjyvuE="; + hash = "sha256-twfJvANLQGO7TiyHPMPqApfHLFUlOGZTTIIGEnjyvuE="; extraPatches = [ { name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix index 37bdf5b060f7..62d3919c0646 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "6.0"; - sha256 = "sha256-RVbgsafIbeUUNXmUbDQ03ZN42oaUo0njqROo7KOQgv0="; + version = "6.1"; + hash = "sha256-NzhD2D16bCVCyCXo0TRwZYp3Ta5eFSfoQPa+iRkeNZg="; } diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index e713ca1413fb..9d4369003e47 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ version, sha256, extraPatches ? [] }: +{ version, hash, extraPatches ? [] }: { lib, stdenv, buildPackages, removeReferencesTo, addOpenGLRunpath, pkg-config, perl, texinfo, yasm @@ -27,6 +27,7 @@ # Feature flags , withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT , withAom ? withFullDeps # AV1 reference encoder +, withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering , withBluray ? withFullDeps # BluRay reading , withBs2b ? withFullDeps # bs2b DSP library @@ -85,7 +86,7 @@ , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps # Vdpau hardware acceleration , withVidStab ? withFullDeps # Video stabilization -, withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 # Netflix's VMAF (Video Multi-Method Assessment Fusion) +, withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding @@ -179,8 +180,8 @@ */ , alsa-lib , bzip2 -, clang , celt +, clang , dav1d , fdk_aac , fontconfig @@ -188,27 +189,32 @@ , frei0r , fribidi , game-music-emu +, glslang , gnutls , gsm -, libjack2 +, intel-media-sdk , ladspaH , lame -, libass , libaom +, libaribcaption +, libass , libbluray , libbs2b , libcaca , libdc1394 -, libraw1394 , libdrm +, libGL +, libGLU , libiconv -, intel-media-sdk +, libjack2 , libmodplug , libmysofa , libogg , libopenmpt , libopus , libplacebo +, libpulseaudio +, libraw1394 , librsvg , libssh , libtensorflow @@ -223,41 +229,37 @@ , libwebp , libX11 , libxcb -, libXv , libXext , libxml2 -, xz +, libXv , nv-codec-headers -, nv-codec-headers-11 -, openal +, nv-codec-headers-12 , ocl-icd # OpenCL ICD +, openal , opencl-headers # OpenCL headers , opencore-amr -, libGL -, libGLU , openh264 , openjpeg -, libpulseaudio , rav1e -, svt-av1 , rtmpdump , samba , SDL2 , soxr , speex , srt +, svt-av1 , vid-stab , vo-amrwbenc +, vulkan-headers +, vulkan-loader , x264 , x265 , xavs , xvidcore +, xz , zeromq4 , zimg , zlib -, vulkan-headers -, vulkan-loader -, glslang /* * Darwin frameworks */ @@ -334,7 +336,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchgit { url = "https://git.ffmpeg.org/ffmpeg.git"; rev = "n${finalAttrs.version}"; - inherit sha256; + inherit hash; }; postPatch = '' @@ -344,10 +346,6 @@ stdenv.mkDerivation (finalAttrs: { --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 substituteInPlace doc/filters.texi \ --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 - '' + lib.optionalString withVulkan '' - # FIXME: horrible hack, remove for next release - substituteInPlace libavutil/hwcontext_vulkan.c \ - --replace VK_EXT_VIDEO_DECODE VK_KHR_VIDEO_DECODE ''; patches = map (patch: fetchpatch patch) (extraPatches @@ -357,6 +355,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/814178f92647be2411516bbb82f48532373d2554"; hash = "sha256-FQV9/PiarPXCm45ldtCsxGHjlrriL8DKpn1LaKJ8owI="; } + ) + ++ (lib.optional (stdenv.isDarwin && lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") + { # this can be removed post 6.1 + name = "fix_build_failure_due_to_PropertyKey_EncoderID"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; + hash = "sha256-Ittka0mId1N/BwJ0FQ0ygpTSS6Y11u2SjWDpbGN+KXo="; + } )); configurePlatforms = []; @@ -441,6 +446,8 @@ stdenv.mkDerivation (finalAttrs: { * External libraries */ (enableFeature withAlsa "alsa") + # FIXME: see if jellyfin-ffmpeg is already on a version >= 6.1 to use enableFeature + (optionalString (withAribcaption && lib.versionAtLeast finalAttrs.version "6.1") "--enable-libaribcaption") (enableFeature withBzlib "bzlib") (enableFeature withCelt "libcelt") (enableFeature withCuda "cuda") @@ -553,9 +560,10 @@ stdenv.mkDerivation (finalAttrs: { # TODO This was always in buildInputs before, why? buildInputs = optionals withFullDeps [ libdc1394 ] ++ optionals (withFullDeps && !stdenv.isDarwin) [ libraw1394 ] # TODO where does this belong to - ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast version "6") then nv-codec-headers-11 else nv-codec-headers) ] + ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast version "6") then nv-codec-headers-12 else nv-codec-headers) ] ++ optionals withAlsa [ alsa-lib ] ++ optionals withAom [ libaom ] + ++ optionals withAribcaption [ libaribcaption ] ++ optionals withAss [ libass ] ++ optionals withBluray [ libbluray ] ++ optionals withBs2b [ libbs2b ] @@ -698,7 +706,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optional withUnfree unfreeRedistributable; pkgConfigModules = [ "libavutil" ]; platforms = platforms.all; - maintainers = with maintainers; [ atemu ]; + maintainers = with maintainers; [ atemu arthsmn ]; mainProgram = "ffmpeg"; }; }) |