mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 19:21:04 +00:00
ffmpeg: add ilbc options
This commit is contained in:
parent
f236d96d3b
commit
d91ad22d82
|
@ -69,6 +69,7 @@
|
||||||
, withGsm ? withFullDeps # GSM de/encoder
|
, withGsm ? withFullDeps # GSM de/encoder
|
||||||
, withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1" # Needed for drawtext filter
|
, withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1" # Needed for drawtext filter
|
||||||
, withIconv ? withHeadlessDeps
|
, withIconv ? withHeadlessDeps
|
||||||
|
, withIlbc ? withFullDeps # iLBC de/encoding
|
||||||
, withJack ? withFullDeps && !stdenv.isDarwin # Jack audio
|
, withJack ? withFullDeps && !stdenv.isDarwin # Jack audio
|
||||||
, withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding
|
, withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding
|
||||||
, withLadspa ? withFullDeps # LADSPA audio filtering
|
, withLadspa ? withFullDeps # LADSPA audio filtering
|
||||||
|
@ -252,6 +253,7 @@
|
||||||
, libGL
|
, libGL
|
||||||
, libGLU
|
, libGLU
|
||||||
, libiconv
|
, libiconv
|
||||||
|
, libilbc
|
||||||
, libjack2
|
, libjack2
|
||||||
, libjxl
|
, libjxl
|
||||||
, libmodplug
|
, libmodplug
|
||||||
|
@ -619,6 +621,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
(enableFeature withHarfbuzz "libharfbuzz")
|
(enableFeature withHarfbuzz "libharfbuzz")
|
||||||
] ++ [
|
] ++ [
|
||||||
(enableFeature withIconv "iconv")
|
(enableFeature withIconv "iconv")
|
||||||
|
(enableFeature withIlbc "libilbc")
|
||||||
(enableFeature withJack "libjack")
|
(enableFeature withJack "libjack")
|
||||||
] ++ optionals (versionAtLeast finalAttrs.version "5.0") [
|
] ++ optionals (versionAtLeast finalAttrs.version "5.0") [
|
||||||
(enableFeature withJxl "libjxl")
|
(enableFeature withJxl "libjxl")
|
||||||
|
@ -774,6 +777,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
++ optionals withGsm [ gsm ]
|
++ optionals withGsm [ gsm ]
|
||||||
++ optionals withHarfbuzz [ harfbuzz ]
|
++ optionals withHarfbuzz [ harfbuzz ]
|
||||||
++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it?
|
++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it?
|
||||||
|
++ optionals withIlbc [ libilbc ]
|
||||||
++ optionals withJack [ libjack2 ]
|
++ optionals withJack [ libjack2 ]
|
||||||
++ optionals withJxl [ libjxl ]
|
++ optionals withJxl [ libjxl ]
|
||||||
++ optionals withLadspa [ ladspaH ]
|
++ optionals withLadspa [ ladspaH ]
|
||||||
|
|
Loading…
Reference in a new issue