libjxl: 0.7.0 -> 0.8.1
Signed-off-by: Henri Rosten <henri.rosten@unikie.com>
This commit is contained in:
parent
758a48fae4
commit
66e579a856
|
@ -1,5 +1,4 @@
|
||||||
{ stdenv, lib, fetchFromGitHub
|
{ stdenv, lib, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, brotli
|
, brotli
|
||||||
, cmake
|
, cmake
|
||||||
, giflib
|
, giflib
|
||||||
|
@ -21,7 +20,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libjxl";
|
pname = "libjxl";
|
||||||
version = "0.7.0";
|
version = "0.8.1";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
@ -29,20 +28,11 @@ stdenv.mkDerivation rec {
|
||||||
owner = "libjxl";
|
owner = "libjxl";
|
||||||
repo = "libjxl";
|
repo = "libjxl";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-9DBLQ/gMyy2ZUm7PCWYJ7XOzkgQM0cAewJZzMNo8UPs=";
|
hash = "sha256-WWuvUTMrlR6ePbEs01ulLnuMiUqGrh4qELWFh0QMaGU=";
|
||||||
# There are various submodules in `third_party/`.
|
# There are various submodules in `third_party/`.
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# present in master
|
|
||||||
(fetchpatch {
|
|
||||||
name = "fix-test-failure-on-ia64-ppc64-riscv64";
|
|
||||||
url = "https://github.com/libjxl/libjxl/commit/bb8eac5d6acec223e44cf8cc72ae02f0816de311.patch";
|
|
||||||
hash = "sha256-DuUCStWEquhWo7bOss0RgZ7ouYE4FpWrIMFywYR424s=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
gtest
|
gtest
|
||||||
|
@ -99,6 +89,9 @@ stdenv.mkDerivation rec {
|
||||||
# Use our version of highway, though it is still statically linked in
|
# Use our version of highway, though it is still statically linked in
|
||||||
"-DJPEGXL_FORCE_SYSTEM_HWY=ON"
|
"-DJPEGXL_FORCE_SYSTEM_HWY=ON"
|
||||||
|
|
||||||
|
# Use our version of gtest
|
||||||
|
"-DJPEGXL_FORCE_SYSTEM_GTEST=ON"
|
||||||
|
|
||||||
# TODO: Update this package to enable this (overridably via an option):
|
# TODO: Update this package to enable this (overridably via an option):
|
||||||
# Viewer tools for evaluation.
|
# Viewer tools for evaluation.
|
||||||
# "-DJPEGXL_ENABLE_VIEWERS=ON"
|
# "-DJPEGXL_ENABLE_VIEWERS=ON"
|
||||||
|
|
Loading…
Reference in a new issue