[gdal] Update to 3.4.0, minor adjustments

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
 

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 ---------------------------------------------------------------------------

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
@@ -15,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}
 )
@@ -61,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
         )
 

ports/gdal/vcpkg.json

@@ -1,10 +1,9 @@
 {
   "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",
+  "supports": "!(arm & windows)",
   "dependencies": [
     "curl",
     "expat",

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",

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",