Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ffmpeg: jxl support #303730

Merged
merged 1 commit into from
Apr 19, 2024
Merged

ffmpeg: jxl support #303730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkgs/development/libraries/ffmpeg/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
, withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1" # Needed for drawtext filter
, withIconv ? withHeadlessDeps
, withJack ? withFullDeps && !stdenv.isDarwin # Jack audio
, withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding
, withLadspa ? withFullDeps # LADSPA audio filtering
, withLzma ? withHeadlessDeps # xz-utils
, withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx
Expand Down Expand Up @@ -239,6 +240,7 @@
, libGLU
, libiconv
, libjack2
, libjxl
, libmodplug
, libmysofa
, libogg
Expand Down Expand Up @@ -411,6 +413,13 @@ stdenv.mkDerivation (finalAttrs: {
'';
}
]
++ (lib.optionals (lib.versionAtLeast version "5" && lib.versionOlder version "6") [
{
name = "fix_build_failure_due_to_libjxl_version_to_new";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2";
hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU=";
}
])
++ (lib.optionals (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";
Expand Down Expand Up @@ -552,6 +561,9 @@ stdenv.mkDerivation (finalAttrs: {
] ++ [
(enableFeature withIconv "iconv")
(enableFeature withJack "libjack")
] ++ optionals (versionAtLeast finalAttrs.version "5.0") [
(enableFeature withJxl "libjxl")
] ++ [
(enableFeature withLadspa "ladspa")
(enableFeature withLzma "lzma")
(enableFeature withMfx "libmfx")
Expand Down Expand Up @@ -686,6 +698,7 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals withHarfbuzz [ harfbuzz ]
++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it?
++ optionals withJack [ libjack2 ]
++ optionals withJxl [ libjxl ]
++ optionals withLadspa [ ladspaH ]
++ optionals withLzma [ xz ]
++ optionals withMfx [ intel-media-sdk ]
Expand Down