From f9ba49d0058d5b35ab86579f2323fa8074991508 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Thu, 4 Nov 2021 17:47:55 +0000 Subject: [PATCH 1/6] Make gdal available on arm (except windows) --- ports/gdal/portfile.cmake | 2 -- ports/gdal/vcpkg.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 3221ba4c43d24a..0d9a695631b131 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm") - set(GDAL_PATCHES 0001-Fix-debug-crt-flags.patch 0002-Fix-build.patch diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 676590760c73f8..7d423ddc30cf0d 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -4,7 +4,7 @@ "port-version": 3, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", - "supports": "!arm", + "supports": "!(arm & windows)", "dependencies": [ "curl", "expat", From 89dcf7d1a45da7dfcd408fa1f29d50a0d49ce805 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 7 Nov 2021 21:51:03 +0100 Subject: [PATCH 2/6] Update to 3.4.0, revise patches --- ports/gdal/0005-Fix-configure.patch | 10 +++++----- ports/gdal/0007-Control-tools.patch | 4 ++-- ports/gdal/portfile.cmake | 4 ++-- ports/gdal/vcpkg.json | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ports/gdal/0005-Fix-configure.patch b/ports/gdal/0005-Fix-configure.patch index 2669510589c94a..771f2c3d3fc588 100644 --- a/ports/gdal/0005-Fix-configure.patch +++ b/ports/gdal/0005-Fix-configure.patch @@ -1,17 +1,17 @@ diff --git a/gdal/configure.ac b/gdal/configure.ac -index 1f88370..1098b39 100644 +index 30cd613..43f1daf 100644 --- a/gdal/configure.ac +++ b/gdal/configure.ac -@@ -45,6 +45,8 @@ dnl Compute the canonical host-system (the system we are building for) +@@ -48,6 +48,8 @@ dnl Compute the canonical host-system (the system we are building for) dnl type variable $host AC_CANONICAL_HOST +PKG_PROG_PKG_CONFIG([0.21]) + dnl Enable as much warnings as possible - AX_CFLAGS_WARN_ALL(C_WFLAGS) - AX_CXXFLAGS_WARN_ALL(CXX_WFLAGS) -@@ -1343,12 +1345,15 @@ AC_MSG_CHECKING([for libtiff]) + AC_LANG_PUSH([C]) + AX_COMPILER_VENDOR +@@ -1336,12 +1338,15 @@ AC_MSG_CHECKING([for libtiff]) if test "x${with_libtiff}" = "xyes" -o "x${with_libtiff}" = "x" ; then diff --git a/ports/gdal/0007-Control-tools.patch b/ports/gdal/0007-Control-tools.patch index b4e708c6d5de8e..fd1f5c9a35ecf7 100644 --- a/ports/gdal/0007-Control-tools.patch +++ b/ports/gdal/0007-Control-tools.patch @@ -78,6 +78,6 @@ index 1098b39..e4d985e 100644 +fi +AC_SUBST(BUILD_TOOLS,$BUILD_TOOLS) + - AC_OUTPUT(GDALmake.opt) + AC_CONFIG_FILES([GDALmake.opt]) + AC_OUTPUT - dnl --------------------------------------------------------------------------- diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 0d9a695631b131..5e66885b54e6ac 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -13,8 +13,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF 348075f26f8e4c200a34818123beeb4abe53c876 # 3.3.2 - SHA512 84bd7c74a079c4aa8cbefbbb1c4ab782e74a85d37d4c875a203760939f4f7c9175c40abc5184d8c1c521fd3b37bb90bc7bf046021ade22e510810535e3f61bd2 + REF d699b38a744301368070ef780f797340da4a9c3c # 3.4.0 + SHA512 709523740a51a0a2a144debcfa5fbc5a5b3d93cc3632856cfbc37f7ca52f2e83f4942d9a27d4c723ee19d2397cc91a4b1ba4543547afdfefb3980a7ba6684bd7 HEAD_REF master PATCHES ${GDAL_PATCHES} ) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 7d423ddc30cf0d..1ef68a5919a4d1 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdal", - "version-semver": "3.3.2", - "port-version": 3, + "version-semver": "3.4.0", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!(arm & windows)", From a0611ee0821d7d060424f396d3941c39135b26ff Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 8 Nov 2021 19:26:21 +0100 Subject: [PATCH 3/6] Stop importing legacy PROJ --- ports/gdal/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 5e66885b54e6ac..e67faf1be83355 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -59,7 +59,6 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) "PNGDIR=${PNG_INCLUDE_DIR}" "ZLIB_INC=-I${ZLIB_INCLUDE_DIR}" ZLIB_EXTERNAL_LIB=1 - ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 MSVC_VER=1900 ) From 8eec2597372cd29648e5eef5e5a204dcdb09d620 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 8 Nov 2021 19:37:59 +0100 Subject: [PATCH 4/6] Update versions --- versions/baseline.json | 4 ++-- versions/g-/gdal.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 3843ced9080503..e07946ea935f40 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2349,8 +2349,8 @@ "port-version": 1 }, "gdal": { - "baseline": "3.3.2", - "port-version": 3 + "baseline": "3.4.0", + "port-version": 0 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 47900288a77ea3..a81976bb4a081d 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8719e60405e2cdba0ce340f3916b648ec9ef6ee", + "version-semver": "3.4.0", + "port-version": 0 + }, { "git-tree": "5173c609fafae13d948b1417064517be5bd78c7f", "version-semver": "3.3.2", From 8d8449e762ed904b37805bb24997f1a7eb9ca951 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 13 Nov 2021 15:09:06 +0100 Subject: [PATCH 5/6] Export json-c dependency for mingw --- ports/gdal/vcpkg-cmake-wrapper.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 772f5b9c530b96..28a1750fedddda 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -82,7 +82,7 @@ if(GDAL_FOUND) _gdal_add_dependency(GEOS::geos_c geos CONFIG) _gdal_add_dependency(GIF::GIF GIF) _gdal_add_dependency(hdf5::hdf5 hdf5 CONFIG) - if(NOT WIN32) + if(NOT WIN32 OR MINGW) _gdal_add_dependency(json-c::json-c json-c CONFIG) endif() _gdal_add_dependency(geotiff_library GeoTIFF CONFIG) From 868f9fb30a8c2df7f4825244abfb255ce8dd1d6d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 13 Nov 2021 15:10:04 +0100 Subject: [PATCH 6/6] Update versions --- versions/baseline.json | 4 ++-- versions/g-/gdal.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 0caeab705254ab..984f80c62eb3d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2353,8 +2353,8 @@ "port-version": 1 }, "gdal": { - "baseline": "3.3.2", - "port-version": 4 + "baseline": "3.4.0", + "port-version": 0 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 7f2784588f3ec7..8db1fba51f3eac 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "097ed3ccdf77735c5b36e354138da35cfd642bcc", + "version-semver": "3.4.0", + "port-version": 0 + }, { "git-tree": "a9ec2540fda2dfe657e004b70d5ca5a1cc7a2db8", "version-semver": "3.3.2",