uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov
Alan Daniels
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
53
pkgs/development/libraries/libtiff/aarch64-darwin.nix
Normal file
53
pkgs/development/libraries/libtiff/aarch64-darwin.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
|
||||
, pkg-config
|
||||
, cmake
|
||||
|
||||
, libdeflate
|
||||
, libjpeg
|
||||
, xz
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtiff";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
|
||||
sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b";
|
||||
};
|
||||
|
||||
cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_SKIP_BUILD_RPATH=OFF";
|
||||
|
||||
# FreeImage needs this patch
|
||||
patches = [ ./headers-cmake.patch ];
|
||||
|
||||
outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
|
||||
|
||||
postFixup = ''
|
||||
moveToOutput include/tif_dir.h $dev_private
|
||||
moveToOutput include/tif_config.h $dev_private
|
||||
moveToOutput include/tiffiop.h $dev_private
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
|
||||
|
||||
buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs.
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckTarget = "test";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library and utilities for working with the TIFF image file format";
|
||||
homepage = "https://libtiff.gitlab.io/libtiff";
|
||||
changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html";
|
||||
license = licenses.libtiff;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
135
pkgs/development/libraries/libtiff/default.nix
Normal file
135
pkgs/development/libraries/libtiff/default.nix
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
|
||||
, libdeflate
|
||||
, libjpeg
|
||||
, xz
|
||||
, zlib
|
||||
|
||||
# for passthru.tests
|
||||
, libgeotiff
|
||||
, python3Packages
|
||||
, imagemagick
|
||||
, graphicsmagick
|
||||
, gdal
|
||||
, openimageio
|
||||
, freeimage
|
||||
, imlib
|
||||
}:
|
||||
|
||||
#FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtiff";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
|
||||
sha256 = "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# FreeImage needs this patch
|
||||
./headers.patch
|
||||
# libc++abi 11 has an `#include <version>`, this picks up files name
|
||||
# `version` in the project's include paths
|
||||
./rename-version.patch
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-22844.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64.patch";
|
||||
sha256 = "0cfih55f5qpc84mvlwsffik80bgz6drkflkhrdyqq8m84jw3mbwb";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-0561.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch";
|
||||
sha256 = "0m57fdxyvhhr9cc260lvkkn2g4zr4n4v9nricc6lf9h6diagd7mk";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-0562.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/561599c99f987dc32ae110370cfdd7df7975586b.patch";
|
||||
sha256 = "0ycirjjc1vigj03kwjb92n6jszsl9p17ccw5hry7lli9gxyyr0an";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-0891.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/46dc8fcd4d38c3b6f35ab28e532aee80e6f609d6.patch";
|
||||
sha256 = "1zn2pgsmbrjx3g2bpdggvwwbp6i348mikwlx4ws482h2379vmyj1";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-0865.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/5e18004500cda10d9074bdb6166b054e95b659ed.patch";
|
||||
sha256 = "131b9ial6avl2agwk31wp2jkrx59955f4r0dikx1jdaywqb7zhd1";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-0924.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/408976c44ef0aad975e0d1b6c6dc80d60f9dc665.patch";
|
||||
sha256 = "1aqaynp74ijxr3rizvbyz23ncs71pbbcw5src1zv46473sy55s8p";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-0907.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/f2b656e2e64adde07a6cffd5c8e96bd81a850fea.patch";
|
||||
sha256 = "0nsplq671qx0f35qww9mx27raqp3nvslz8iv7f3hxdgldylmh2vs";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-0909.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/f8d0f9aa1ba04c9ae3bfe869a18141a8b8117ad7.patch";
|
||||
sha256 = "1plhk6ildl16bp0k3wvzfd4a97hqfqfbbn7vjinsaasf4v0x3q5j";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-0908.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/a95b799f65064e4ba2e2dfc206808f86faf93e85.patch";
|
||||
sha256 = "0i61kkjaixdn2p933lpma9s6i0772vhxjxxcwyqagw96lmszrcm7";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-1354.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/87f580f39011109b3bb5f6eca13fac543a542798.patch";
|
||||
sha256 = "0171c662xiv3295x4wsq6qq0v90js51j54vsl7wm043kjkrp1fsb";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-1355.patch";
|
||||
url = "https://gitlab.com/libtiff/libtiff/-/commit/c1ae29f9ebacd29b7c3e0c7db671af7db3584bc2.patch";
|
||||
sha256 = "1y75c72s41pl39d5zr5pmkiyfrancllv8fbl10zvc67pg3qjq4v8";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
mv VERSION VERSION.txt
|
||||
'';
|
||||
|
||||
outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
|
||||
|
||||
postFixup = ''
|
||||
moveToOutput include/tif_dir.h $dev_private
|
||||
moveToOutput include/tif_config.h $dev_private
|
||||
moveToOutput include/tiffiop.h $dev_private
|
||||
'';
|
||||
|
||||
# If you want to change to a different build system, please make
|
||||
# sure cross-compilation works first!
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
|
||||
|
||||
buildInputs = [ libdeflate ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage imlib;
|
||||
inherit (python3Packages) pillow imread;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library and utilities for working with the TIFF image file format";
|
||||
homepage = "https://libtiff.gitlab.io/libtiff";
|
||||
changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html";
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
license = licenses.libtiff;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
13
pkgs/development/libraries/libtiff/headers-cmake.patch
Normal file
13
pkgs/development/libraries/libtiff/headers-cmake.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
|
||||
--- a/libtiff/CMakeLists.txt 2019-05-31 13:05:22.849705817 +0000
|
||||
+++ b/libtiff/CMakeLists.txt 2020-11-27 21:50:03.527831837 +0000
|
||||
@@ -42,6 +42,9 @@
|
||||
libtiffxx.map)
|
||||
|
||||
set(tiff_HEADERS
|
||||
+ tiffiop.h
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h
|
||||
+ tif_dir.h
|
||||
tiff.h
|
||||
tiffio.h
|
||||
tiffvers.h)
|
||||
16
pkgs/development/libraries/libtiff/headers.patch
Normal file
16
pkgs/development/libraries/libtiff/headers.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am
|
||||
index 44522b62..d66e5948 100644
|
||||
--- i/libtiff/Makefile.am
|
||||
+++ w/libtiff/Makefile.am
|
||||
@@ -36,8 +36,11 @@ EXTRA_DIST = \
|
||||
tiffconf.h.cmake.in
|
||||
|
||||
libtiffinclude_HEADERS = \
|
||||
+ tif_config.h \
|
||||
+ tif_dir.h \
|
||||
tiff.h \
|
||||
tiffio.h \
|
||||
+ tiffiop.h \
|
||||
tiffvers.h
|
||||
|
||||
if HAVE_CXX
|
||||
20
pkgs/development/libraries/libtiff/rename-version.patch
Normal file
20
pkgs/development/libraries/libtiff/rename-version.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -34,7 +34,7 @@ docfiles = \
|
||||
README.md \
|
||||
RELEASE-DATE \
|
||||
TODO \
|
||||
- VERSION
|
||||
+ VERSION.txt
|
||||
|
||||
EXTRA_DIST = \
|
||||
cmake \
|
||||
@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test man html
|
||||
|
||||
release:
|
||||
(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
|
||||
- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION)
|
||||
+ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt)
|
||||
(rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h)
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
Loading…
Add table
Add a link
Reference in a new issue