Unverified Commit c0449976 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #261791: libtiff: 4.5.1 -> 4.6.0 

...into staging
parents 586ab0a9 0a74a54a

pkgs/development/libraries/libtiff/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 


stdenv.mkDerivation rec {

  pname = "libtiff";

  version = "4.5.1";

  version = "4.6.0";



  src = fetchFromGitLab {

    owner = "libtiff";

    repo = "libtiff";

    rev = "v${version}";

    hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E=";

    hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw=";

  };



  patches = [

pkgs/development/libraries/libtiff/headers.patch

+2 −3
Original line number Diff line number Diff line 
diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am

index 44522b62..d66e5948 100644

export private headers for freeimage

--- i/libtiff/Makefile.am

+++ w/libtiff/Makefile.am

@@ -36,8 +36,12 @@ EXTRA_DIST = \

 	tiffconf.h.cmake.in

 	tif_win32_versioninfo.rc



 libtiffinclude_HEADERS = \

+	tif_config.h \

pkgs/development/libraries/libtiff/rename-version.patch

+9 −8
Original line number Diff line number Diff line 
fix case-insensitive build

--- a/Makefile.am

+++ b/Makefile.am

@@ -34,7 +34,7 @@ docfiles = \
@@ -8,13 +9,13 @@ 
+	VERSION.txt

 

 EXTRA_DIST = \

 	cmake \

@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc



 	placeholder.h \

@@ -68,7 +68,7 @@ NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d")

 release:

	(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)

 	@(echo --- Setting release date to $(NEW_LIBTIFF_RELEASE_DATE) and release version to $(LIBTIFF_VERSION) ---)

 	(rm -f $(top_srcdir)/RELEASE-DATE && echo $(NEW_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),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h)

+	(rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt)

 	(rm -f $(top_builddir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(NEW_LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_builddir)/libtiff/tiffvers.h && sed -i 's,@,,g' $(top_builddir)/libtiff/tiffvers.h)

 

 pkgconfigdir = $(libdir)/pkgconfig