(#8635) gdal: add 3.2.3 & 3.4.1 + keep last patch version of each min…

…or version + modernize * bump dependencies * keep last patch of each minor version * add GDAL_DATA to runenv_info and buildenv_info * support compiler=msvc in profile * add gdal/3.4.1 * bump proj & geos * bump dependencies * relocatable shared lib on macOS * add FIXME for all shared on macOS * fix all shared on macOS
conan-io · Feb 28, 2022 · 3b60dc1 · 3b60dc1
1 parent 32ed381
commit 3b60dc1
Show file tree

Hide file tree

Showing 12 changed files with 494 additions and 518 deletions.
diff --git a/recipes/gdal/all/conandata.yml b/recipes/gdal/all/conandata.yml
@@ -1,42 +1,36 @@
 sources:
+  "3.4.1":
+    url: "https://github.com/OSGeo/gdal/releases/download/v3.4.1/gdal-3.4.1.tar.gz"
+    sha256: "e360387bc25ec24940f46afbeada48002d72c74aaf9eccf2a40e8d74e711a2e4"
   "3.3.3":
     url: "https://github.com/OSGeo/gdal/releases/download/v3.3.3/gdal-3.3.3.tar.gz"
     sha256: "28925ea4717b02185ee208bfc121a94fa0bc1dfe9cb862fd3868c2a0394d605a"
-  "3.3.1":
-    url: "https://github.com/OSGeo/gdal/releases/download/v3.3.1/gdal-3.3.1.tar.gz"
-    sha256: "6c3c2422d129a9fef030d6aaa5bd3dd45ee798808953099313ffd36ab2945055"
-  "3.2.1":
-    url: "https://github.com/OSGeo/gdal/releases/download/v3.2.1/gdal-3.2.1.tar.gz"
-    sha256: "43d40ba940e3927e38f9e98062ff62f9fa993ceade82f26f16fab7e73edb572e"
+  "3.2.3":
+    url: "https://github.com/OSGeo/gdal/releases/download/v3.2.3/gdal-3.2.3.tar.gz"
+    sha256: "86a35aad60a1eb87c2c0c145f9bccd83a47c4781254544ed5246f64d55ee1f18"
   "3.1.4":
     url: "https://github.com/OSGeo/gdal/releases/download/v3.1.4/gdal-3.1.4.tar.gz"
     sha256: "5f09ea6ca797e296b608d261e08e18ffa43a12fa28d460ae139d2a026ee2b0c0"
-  "3.1.2":
-    url: "https://github.com/OSGeo/gdal/releases/download/v3.1.2/gdal-3.1.2.tar.gz"
-    sha256: "39713b8af4e4dcd5e0d2d84a7f94660da59bb710cca80bcac07e719435add6dc"
-  "3.1.0":
-    url: "https://github.com/OSGeo/gdal/releases/download/v3.1.0/gdal-3.1.0.tar.gz"
-    sha256: "6793ddb2b1ca042494d938ac82c71d06b9125bbb00c9bb9414a7c5e3a707c639"
 patches:
-  "3.3.3":
-    - patch_file: "patches/3.3.x/fix-autotools-3.3.3.patch"
+  "3.4.1":
+    - patch_file: "patches/3.4.x/fix-autotools.patch"
       base_path: "source_subfolder"
-    - patch_file: "patches/3.3.x/fix-nmake.patch"
+    - patch_file: "patches/3.4.x/fix-nmake.patch"
       base_path: "source_subfolder"
-    - patch_file: "patches/3.3.x/fix-include-jsonc.patch"
+    - patch_file: "patches/3.4.x/fix-include-jsonc.patch"
       base_path: "source_subfolder"
-    - patch_file: "patches/3.3.x/fix-include-xerces.patch"
+    - patch_file: "patches/3.4.x/fix-include-xerces.patch"
       base_path: "source_subfolder"
-  "3.3.1":
-    - patch_file: "patches/3.3.x/fix-autotools-3.3.1.patch"
+  "3.3.3":
+    - patch_file: "patches/3.3.x/fix-autotools-3.3.3.patch"
       base_path: "source_subfolder"
     - patch_file: "patches/3.3.x/fix-nmake.patch"
       base_path: "source_subfolder"
     - patch_file: "patches/3.3.x/fix-include-jsonc.patch"
       base_path: "source_subfolder"
     - patch_file: "patches/3.3.x/fix-include-xerces.patch"
       base_path: "source_subfolder"
-  "3.2.1":
+  "3.2.3":
     - patch_file: "patches/3.2.x/fix-autotools.patch"
       base_path: "source_subfolder"
     - patch_file: "patches/3.2.x/fix-nmake.patch"
@@ -45,8 +39,6 @@ patches:
       base_path: "source_subfolder"
     - patch_file: "patches/3.2.x/fix-include-xerces.patch"
       base_path: "source_subfolder"
-    - patch_file: "patches/3.2.x/fix-ogrelasticlayer-gcc-less-5.patch"
-      base_path: "source_subfolder"
   "3.1.4":
     - patch_file: "patches/3.1.x/fix-autotools-3.1.4.patch"
       base_path: "source_subfolder"
@@ -60,33 +52,3 @@ patches:
       base_path: "source_subfolder"
     - patch_file: "patches/3.1.x/fix-include-xerces-3.1.2.patch"
       base_path: "source_subfolder"
-  "3.1.2":
-    - patch_file: "patches/3.1.x/fix-autotools-3.1.0.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/fix-nmake-common.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/fix-nmake-opt-3.1.2.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/fix-import-dll-msvc.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/fix-include-jsonc.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/fix-include-xerces-3.1.2.patch"
-      base_path: "source_subfolder"
-  "3.1.0":
-    - patch_file: "patches/3.1.x/fix-autotools-3.1.0.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/fix-nmake-common.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/fix-nmake-opt-3.1.0.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/fix-import-dll-msvc.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/ogrflatgeobuflayer-stdexcept.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/makefile-mitigate-long-line.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/fix-include-jsonc.patch"
-      base_path: "source_subfolder"
-    - patch_file: "patches/3.1.x/fix-include-xerces-3.1.0.patch"
-      base_path: "source_subfolder"