diff options
| author | Atemu <atemu.main@gmail.com> | 2023-04-16 10:56:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-16 10:56:27 +0200 |
| commit | e789c7976fc6a4d5bfea37cbadc7267e4e00b59c (patch) | |
| tree | 6949e87ae82e4764a04ea138750d1230387af835 | |
| parent | ca817d669eb7eba9ce4ea415f68b695d7ae969b4 (diff) | |
| parent | 59d2de73ede277f614313a3200caeeb1358608dc (diff) | |
| download | nixpkgs-e789c7976fc6a4d5bfea37cbadc7267e4e00b59c.tar nixpkgs-e789c7976fc6a4d5bfea37cbadc7267e4e00b59c.tar.gz nixpkgs-e789c7976fc6a4d5bfea37cbadc7267e4e00b59c.tar.bz2 nixpkgs-e789c7976fc6a4d5bfea37cbadc7267e4e00b59c.tar.lz nixpkgs-e789c7976fc6a4d5bfea37cbadc7267e4e00b59c.tar.xz nixpkgs-e789c7976fc6a4d5bfea37cbadc7267e4e00b59c.tar.zst nixpkgs-e789c7976fc6a4d5bfea37cbadc7267e4e00b59c.zip | |
Merge pull request #197979 from justinas/ffmpeg-libplacebo
ffmpeg: add libplacebo
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 0ece46f3266..0870a9fde1f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -52,6 +52,7 @@ , withIlbc ? withFullDeps , withJack ? withFullDeps && !stdenv.isDarwin # Jack audio , withLadspa ? withFullDeps # LADSPA audio filtering +, withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library , withLzma ? withHeadlessDeps # xz-utils , withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support @@ -209,6 +210,7 @@ , libogg , libopenmpt , libopus +, libplacebo , librsvg , libssh , libtheora @@ -288,7 +290,7 @@ */ let - inherit (lib) optional optionals optionalString enableFeature; + inherit (lib) optional optionals optionalString enableFeature versionAtLeast; in @@ -469,6 +471,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withModplug "libmodplug") (enableFeature withMysofa "libmysofa") (enableFeature withOpus "libopus") + (optionalString (versionAtLeast version "5.0" && withLibplacebo) "--enable-libplacebo") (enableFeature withSvg "librsvg") (enableFeature withSrt "libsrt") (enableFeature withSsh "libssh") @@ -571,6 +574,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it? ++ optionals withJack [ libjack2 ] ++ optionals withLadspa [ ladspaH ] + ++ optionals withLibplacebo [ libplacebo vulkan-headers ] ++ optionals withLzma [ xz ] ++ optionals withMfx [ intel-media-sdk ] ++ optionals withModplug [ libmodplug ] |