libtiff: update to 4.6.0

Author: bgilbert

releases.json

@@ -1482,6 +1482,7 @@
       "libtiff-4"
     ],
     "versions": [
+      "4.6.0-1",
       "4.5.1-1",
       "4.5.0-3",
       "4.5.0-2",

subprojects/libtiff.wrap

@@ -1,8 +1,8 @@
 [wrap-file]
-directory = tiff-4.5.1
-source_url = https://download.osgeo.org/libtiff/tiff-4.5.1.tar.xz
-source_filename = tiff-4.5.1.tar.gz
-source_hash = 3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a
+directory = tiff-4.6.0
+source_url = https://download.osgeo.org/libtiff/tiff-4.6.0.tar.xz
+source_filename = tiff-4.6.0.tar.gz
+source_hash = e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2
 patch_directory = libtiff
 
 [provide]

subprojects/packagefiles/libtiff/libtiff/meson.build

@@ -12,6 +12,13 @@ configure_file(
   configuration: cdata,
 )
 
+tiffvers_h = configure_file(
+  input: 'tiffvers.h.cmake.in',
+  output: 'tiffvers.h',
+  format: 'cmake@',
+  configuration: cdata,
+)
+
 sources = files(
   'tif_aux.c',
   'tif_close.c',
@@ -76,6 +83,6 @@ tiff4_lib = library(
 install_headers(
   'tiff.h',
   'tiffio.h',
-  'tiffvers.h',
   tiffconf_h,
+  tiffvers_h,
 )

subprojects/packagefiles/libtiff/meson.build

@@ -6,7 +6,7 @@ project(
 )
 # calculate library version from configure.ac values
 libtiff_current = 6
-libtiff_revision = 1
+libtiff_revision = 2
 libtiff_age = 0
 library_version = '@0@.@1@.@2@'.format(
     libtiff_current - libtiff_age,
@@ -75,12 +75,16 @@ cdata.set('HAVE_JBG_NEWLEN', jbig_dep.found())
 cdata.set10('HAVE_DECL_OPTARG', cc.has_header_symbol('unistd.h', 'optarg'))
 cdata.set10('HAVE_GETOPT', cc.has_header_symbol('getopt.h', 'getopt'))
 
-cdata.set('PACKAGE_BUGREPORT', 'tiff@lists.maptools.org')
+cdata.set('PACKAGE_BUGREPORT', 'tiff@lists.osgeo.org')
 cdata.set('PACKAGE_NAME', 'LibTIFF Software')
-cdata.set('PACKAGE_STRING', '@0@ @1@'.format(cdata.get('PACKAGE_NAME'), meson.project_version()))
 cdata.set('PACKAGE_TARNAME', meson.project_name())
 cdata.set('PACKAGE_URL', 'https://gitlab.com/libtiff/libtiff')
-cdata.set('PACKAGE_VERSION', meson.project_version())
+
+cdata.set('LIBTIFF_VERSION', meson.project_version())
+cdata.set('LIBTIFF_MAJOR_VERSION', meson.project_version().split('.')[0])
+cdata.set('LIBTIFF_MINOR_VERSION', meson.project_version().split('.')[1])
+cdata.set('LIBTIFF_MICRO_VERSION', meson.project_version().split('.')[2])
+cdata.set('LIBTIFF_RELEASE_DATE', import('fs').read('RELEASE-DATE').strip())
 
 cdata.set('CCITT_SUPPORT', true)
 cdata.set('PACKBITS_SUPPORT', true)