From 46e6bad823b02b2afd067b114fe52957dacc8af2 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 2 Dec 2020 02:01:02 +0800 Subject: [gdal] Fix build errors on linux and osx (#14866) --- ports/gdal/CONTROL | 1 + ports/gdal/portfile.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 00177bc06..36944edce 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,5 +1,6 @@ Source: gdal Version: 3.1.3 +Port-Version: 1 Homepage: https://gdal.org/ Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib, libgeotiff, cfitsio, json-c (!windows) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 8675d8ced..c1fca47a8 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -186,6 +186,7 @@ else() set(CONF_OPTS --enable-shared=${BUILD_DYNAMIC} --enable-static=${BUILD_STATIC}) list(APPEND CONF_OPTS --with-proj=${CURRENT_INSTALLED_DIR} --with-libjson-c=${CURRENT_INSTALLED_DIR}) + list(APPEND CONF_OPTS --without-jasper) vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3