cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libtiff: 4.2.0 -> 4.3.0; adopt; improve meta

Browse source 
Tested by viewing a TIFF file in imv.
This commit is contained in:
Alyssa Ross 2021-07-08 20:46:22 +00:00
parent df4f7d0155
commit 666c01d977
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/libtiff/default.nix
View file

@ -12,11 +12,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libtiff"; pname = "libtiff";
version = "4.2.0"; version = "4.3.0";
src = fetchurl { src = fetchurl {
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; sha256 = "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf";
}; };
cmakeFlags = if stdenv.isDarwin then [ cmakeFlags = if stdenv.isDarwin then [
@ -47,7 +47,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Library and utilities for working with the TIFF image file format"; description = "Library and utilities for working with the TIFF image file format";
homepage = "http://download.osgeo.org/libtiff"; homepage = "https://libtiff.gitlab.io/libtiff";
changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html";
maintainers = with maintainers; [ qyliss ];
license = licenses.libtiff; license = licenses.libtiff;
platforms = platforms.unix; platforms = platforms.unix;
}; };

25
pkgs/development/libraries/libtiff/headers.patch
View file

@ -1,13 +1,14 @@
diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt diff --git i/libtiff/CMakeLists.txt w/libtiff/CMakeLists.txt
--- a/libtiff/CMakeLists.txt 2019-05-31 13:05:22.849705817 +0000 index 90105b28..340c75cf 100755
+++ b/libtiff/CMakeLists.txt 2020-11-27 21:50:03.527831837 +0000 --- i/libtiff/CMakeLists.txt
@@ -42,6 +42,9 @@ +++ w/libtiff/CMakeLists.txt
libtiffxx.map) @@ -31,6 +31,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tiffconf.h.cmake.in
@ONLY)
set(tiff_HEADERS set(tiff_public_HEADERS
+ tiffiop.h + tiffiop.h
+ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h + ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h
+ tif_dir.h + tif_dir.h
tiff.h tiff.h
tiffio.h tiffio.h
tiffvers.h) tiffvers.h