[gdal] Fix building for 32bit Android and msvc with poppler (#25190)

* [gdal] Fix building for 32bit Android * [gdal] Adjust poppler version Fixes a compiler error * [gdal] Bump port version
microsoft · Jun 15, 2022 · d2f3f30 · d2f3f30
1 parent 4e443a3
commit d2f3f30
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake
@@ -137,7 +137,7 @@ macro(find_dependency_win)
 
     if("poppler" IN_LIST FEATURES)
         list(APPEND NMAKE_OPTIONS "POPPLER_ENABLED=YES")
-        list(APPEND NMAKE_OPTIONS "POPPLER_MAJOR_VERSION=22" "POPPLER_MINOR_VERSION=1") # Bump as needed
+        list(APPEND NMAKE_OPTIONS "POPPLER_MAJOR_VERSION=22" "POPPLER_MINOR_VERSION=3") # Bump as needed
         list(APPEND NMAKE_OPTIONS "POPPLER_CFLAGS=-I${CURRENT_INSTALLED_DIR}/include -I${CURRENT_INSTALLED_DIR}/include/poppler /std:c++17")
         x_vcpkg_pkgconfig_get_modules(PREFIX POPPLER MODULES --msvc-syntax poppler LIBS)
         list(APPEND NMAKE_OPTIONS_REL "POPPLER_LIBS=${POPPLER_LIBS_RELEASE}")

diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
@@ -288,6 +288,10 @@ else()
         list(APPEND CONF_OPTS "--with-tools=no")
     endif()
 
+    if(VCPKG_TARGET_IS_ANDROID AND (VCPKG_TARGET_ARCHITECTURE MATCHES "x86" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm"))
+        list(APPEND CONF_OPTS --with-unix-stdio-64=no)
+    endif()
+
     vcpkg_configure_make(
         SOURCE_PATH "${SOURCE_PATH}/gdal"
         AUTOCONFIG

diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gdal",
   "version-semver": "3.4.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2458,7 +2458,7 @@
     },
     "gdal": {
       "baseline": "3.4.3",
-      "port-version": 1
+      "port-version": 2
     },
     "gdcm": {
       "baseline": "3.0.12",

diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "509d3e54670e6552cce8d811a329d6c28589392e",
+      "version-semver": "3.4.3",
+      "port-version": 2
+    },
     {
       "git-tree": "8bdf8b8ff951c1ce8719c789e66ac3a166eed063",
       "version-semver": "3.4.3",