From c867e68ca880feb5fd01f65c39657b64084b2c2a Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Thu, 10 Jun 2021 00:17:07 +0200
Subject: [szip, hdf5] Fix mingw import lib names, control linkage (#17941)

* Format manifest, make port version explicit

* Use standard mingw import lib names

* Choose either static or shared binaries

* Insert macro for dynamic linkage

* Add szip pc file

* Quote path expressions

* Port away from deprecated cmake functions

* x-add-version

* Begin of hdf5 changes

* Remove obsolete variables (complements 23eadeae)

* Fix indentation and quoting expressions

* Handle single-linkage szip configuration

* Use mingw import lib names for hdf5

* Move dependencies to Requires in pc file

* Port away from deprecated cmake functions

* x-add-version hdf5

* Apply szip review comments

* Update version

* Improve pkgconfig patch to handle lists

* Update git-tree
---
 versions/baseline.json | 6 +++---
 versions/h-/hdf5.json  | 5 +++++
 versions/s-/szip.json  | 5 +++++
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'versions')

diff --git a/versions/baseline.json b/versions/baseline.json
index 024d2dfa4..d6c4bb086 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2470,7 +2470,7 @@
     },
     "hdf5": {
       "baseline": "1.12.0",
-      "port-version": 2
+      "port-version": 3
     },
     "healpix": {
       "baseline": "1.12.10",
@@ -6041,8 +6041,8 @@
       "port-version": 0
     },
     "szip": {
-      "baseline": "2.1.1-6",
-      "port-version": 0
+      "baseline": "2.1.1",
+      "port-version": 7
     },
     "tabulate": {
       "baseline": "2019-01-06",
diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json
index 2bbc3d737..72096684e 100644
--- a/versions/h-/hdf5.json
+++ b/versions/h-/hdf5.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0a7e8bbf885fa0b111c3041102cb2c9adb45f5c3",
+      "version": "1.12.0",
+      "port-version": 3
+    },
     {
       "git-tree": "6b0acb92d47724ab485e478e8f9e83067eea77be",
       "version": "1.12.0",
diff --git a/versions/s-/szip.json b/versions/s-/szip.json
index 5bb734831..83945853f 100644
--- a/versions/s-/szip.json
+++ b/versions/s-/szip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f810fcedf9469940a80e5c343d983a55134332b",
+      "version": "2.1.1",
+      "port-version": 7
+    },
     {
       "git-tree": "bcd8fca84e0acd4d6be162e857379ef3b74fe213",
       "version-string": "2.1.1-6",
-- 
cgit v1.2.3