libjxl: 0.8.2 -> 0.9.1, libaom: remove butteraugli support
This commit is contained in:
parent
1263e013db
commit
15a8cd49df
|
@ -204,6 +204,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||||
`globalRedirect` can now have redirect codes other than 301 through
|
`globalRedirect` can now have redirect codes other than 301 through
|
||||||
`redirectCode`.
|
`redirectCode`.
|
||||||
|
|
||||||
|
- `libjxl` 0.9.0 [dropped support for the butteraugli API](https://github.com/libjxl/libjxl/pull/2576). You will no longer be able to set `enableButteraugli` on `libaom`.
|
||||||
|
|
||||||
- The source of the `mockgen` package has changed to the [go.uber.org/mock](https://github.com/uber-go/mock) fork because [the original repository is no longer maintained](https://github.com/golang/mock#gomock).
|
- The source of the `mockgen` package has changed to the [go.uber.org/mock](https://github.com/uber-go/mock) fork because [the original repository is no longer maintained](https://github.com/golang/mock#gomock).
|
||||||
|
|
||||||
- `security.pam.enableSSHAgentAuth` was renamed to `security.pam.sshAgentAuth.enable` and an `authorizedKeysFiles`
|
- `security.pam.enableSSHAgentAuth` was renamed to `security.pam.sshAgentAuth.enable` and an `authorizedKeysFiles`
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{ lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3
|
{ lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3
|
||||||
, enableButteraugli ? true, libjxl
|
|
||||||
, enableVmaf ? true, libvmaf
|
, enableVmaf ? true, libvmaf
|
||||||
, gitUpdater
|
, gitUpdater
|
||||||
}:
|
}:
|
||||||
|
@ -23,8 +22,7 @@ stdenv.mkDerivation rec {
|
||||||
yasm perl cmake pkg-config python3
|
yasm perl cmake pkg-config python3
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = lib.optional enableButteraugli libjxl
|
propagatedBuildInputs = lib.optional enableVmaf libvmaf;
|
||||||
++ lib.optional enableVmaf libvmaf;
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
# build uses `git describe` to set the build version
|
# build uses `git describe` to set the build version
|
||||||
|
@ -42,8 +40,6 @@ stdenv.mkDerivation rec {
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DBUILD_SHARED_LIBS=ON"
|
"-DBUILD_SHARED_LIBS=ON"
|
||||||
"-DENABLE_TESTS=OFF"
|
"-DENABLE_TESTS=OFF"
|
||||||
] ++ lib.optionals enableButteraugli [
|
|
||||||
"-DCONFIG_TUNE_BUTTERAUGLI=1"
|
|
||||||
] ++ lib.optionals enableVmaf [
|
] ++ lib.optionals enableVmaf [
|
||||||
"-DCONFIG_TUNE_VMAF=1"
|
"-DCONFIG_TUNE_VMAF=1"
|
||||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{ stdenv, lib, fetchFromGitHub
|
{ stdenv, lib, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, brotli
|
, brotli
|
||||||
, cmake
|
, cmake
|
||||||
, giflib
|
, giflib
|
||||||
|
@ -12,7 +11,6 @@
|
||||||
, openexr_3
|
, openexr_3
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, zlib
|
, zlib
|
||||||
, buildDocs ? true
|
|
||||||
, asciidoc
|
, asciidoc
|
||||||
, graphviz
|
, graphviz
|
||||||
, doxygen
|
, doxygen
|
||||||
|
@ -21,7 +19,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libjxl";
|
pname = "libjxl";
|
||||||
version = "0.8.2";
|
version = "0.9.1";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
@ -29,31 +27,21 @@ stdenv.mkDerivation rec {
|
||||||
owner = "libjxl";
|
owner = "libjxl";
|
||||||
repo = "libjxl";
|
repo = "libjxl";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-I3PGgh0XqRkCFz7lUZ3Q4eU0+0GwaQcVb6t4Pru1kKo=";
|
hash = "sha256-n5KNbbw6NQRROEM7Cojla/igRCFNawUq7nfhzJlMlPI=";
|
||||||
# There are various submodules in `third_party/`.
|
# There are various submodules in `third_party/`.
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Add missing <atomic> content to fix gcc compilation for RISCV architecture
|
|
||||||
# https://github.com/libjxl/libjxl/pull/2211
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/libjxl/libjxl/commit/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch";
|
|
||||||
hash = "sha256-X4fbYTMS+kHfZRbeGzSdBW5jQKw8UN44FEyFRUtw0qo=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
gtest
|
gtest
|
||||||
pkg-config
|
pkg-config
|
||||||
] ++ lib.optionals buildDocs [
|
|
||||||
asciidoc
|
asciidoc
|
||||||
doxygen
|
doxygen
|
||||||
python3
|
python3
|
||||||
];
|
];
|
||||||
|
|
||||||
depsBuildBuild = lib.optionals buildDocs [
|
depsBuildBuild = [
|
||||||
graphviz
|
graphviz
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -22390,10 +22390,7 @@ with pkgs;
|
||||||
|
|
||||||
libantlr3c = callPackage ../development/libraries/libantlr3c { };
|
libantlr3c = callPackage ../development/libraries/libantlr3c { };
|
||||||
|
|
||||||
libaom = callPackage ../development/libraries/libaom {
|
libaom = callPackage ../development/libraries/libaom { };
|
||||||
# Remove circular dependency for libavif
|
|
||||||
libjxl = libjxl.override { buildDocs = false; };
|
|
||||||
};
|
|
||||||
|
|
||||||
libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
|
libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
|
||||||
libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
|
libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
|
||||||
|
|
Loading…
Reference in New Issue
Block a user