libtiff: Add LERC support #290556
libtiff: Add LERC support #290556
Conversation
There was a problem hiding this comment.
I confirm this PR is adding LERC support for gdal.
nix-build -A gdal
./result/bin/gdal_create -outsize 10 10 -co COMPRESS=LERC_DEFLATE test.tif
./result/bin/gdalinfo test.tif
Driver: GTiff/GeoTIFF
Files: test.tif
Size is 10, 10
Image Structure Metadata:
COMPRESSION=LERC_DEFLATE
INTERLEAVE=BAND
LERC_VERSION=2.4
Corner Coordinates:
Upper Left ( 0.0, 0.0)
Lower Left ( 0.0, 10.0)
Upper Right ( 10.0, 0.0)
Lower Right ( 10.0, 10.0)
Center ( 5.0, 5.0)
Band 1 Block=10x10 Type=Byte, ColorInterp=Gray
| @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| # TODO: opengl support (bogus configure detection) | |||
| propagatedBuildInputs = [ | |||
| lerc | |||
There was a problem hiding this comment.
Why does it need to be propagated?
There was a problem hiding this comment.
It wasn't clear to us as well.
From GDAL documentation
"""
LERC and LERC_DEFLATE are available only when using internal libtiff for GDAL < 3.3.0. Since GDAL 3.3.0, LERC compression is also available when building GDAL against external libtiff >= 4.3.0, built itself against https://github.com/esri/lerc
"""
There was a problem hiding this comment.
I assumed that since all the other libraries were already propagated, this one would have to be. It took a long time to build libtiff.passthru.tests, and it worked, so I didn't try anything else.
As for which libraries need propagating, why would any of them need to be? I can try changing the whole list to buildInputs.
There was a problem hiding this comment.
I'm not sure why the current list is propagated, but we shouldn't add new propagated inputs without having a good reason.
There was a problem hiding this comment.
True, I understand what you are saying now.
There was a problem hiding this comment.
With
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 1614748afcb1..e087e861a06b 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config sphinx ];
# TODO: opengl support (bogus configure detection)
- propagatedBuildInputs = [
+ buildInputs = [
lerc
libdeflate
libjpeg
build of libgeotiff fails with
configure: error: cannot find zlib.h, bailing out
There was a problem hiding this comment.
If I add zlib in to libgeotiff nativeBuildInputs
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 9b160e6b29e8..bf2d6a42dbc3 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
pkg-config
+ zlib
];
buildInputs = [ libtiff proj ];
build of libgeotiff will finish successfully.
@alyssais Looks like confirmation of negative impact of propagatedBuildInputs in libtiff which we should fix.
There was a problem hiding this comment.
Actually, zlib should go to buildInputs of libgeotiff.
There was a problem hiding this comment.
Draft PR to fix propagation of libtiff build inputs created #291657
There was a problem hiding this comment.
I've changed Does it make sense to merge this before #292568, or should they go in together?lerc to a buildInput.
l0b0
force-pushed
the
libtiff-lerc-support
branch
2 times, most recently
from
767b3d0
to
8a61a55
Compare
Can be reverted when <NixOS/nixpkgs#290556> is in unstable <https://nixpk.gs/pr-tracker.html?pr=290556>.
Can be reverted when <NixOS/nixpkgs#290556> is in unstable <https://nixpk.gs/pr-tracker.html?pr=290556>.
Can be reverted when <NixOS/nixpkgs#290556> is in unstable <https://nixpk.gs/pr-tracker.html?pr=290556>.
Can be reverted when <NixOS/nixpkgs#290556> is in unstable <https://nixpk.gs/pr-tracker.html?pr=290556>.
Can be reverted when <NixOS/nixpkgs#290556> is in unstable <https://nixpk.gs/pr-tracker.html?pr=290556>.
l0b0
force-pushed
the
libtiff-lerc-support
branch
from
8a61a55
to
ad60aa5
Compare
There was a problem hiding this comment.
I re-tested current state of this PR (with lerc added to buildInputs) and I confirm that it works for adding LERC support for GDAL
nix-build -A gdal
./result/bin/gdal_create -outsize 10 10 -co COMPRESS=LERC_DEFLATE test.tif
./result/bin/gdalinfo test.tif | grep LERC
COMPRESSION=LERC_DEFLATE
LERC_VERSION=2.4
I think this PR is good to be merged and is a low risk to all libtiff reverse dependencies.
Remove and bump nixpkgs once <NixOS/nixpkgs#290556> is at least in master, ideally in nixos-unstable <https://nixpk.gs/pr-tracker.html?pr=290556>.
Remove and bump nixpkgs once <NixOS/nixpkgs#290556> is at least in master, ideally in nixos-unstable <https://nixpk.gs/pr-tracker.html?pr=290556>.
Description of changes
Fixes #238882.
Based on Improve build doc when building gdal with LERC lib and the GDAL GeoTIFF docs.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 馃憤 reaction to pull requests you find important.