From c959dc1b11d6f1d40caa9c04fde23749ef8b32b9 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Fri, 18 Oct 2024 13:44:17 +0200 Subject: [PATCH 1/7] Add python libs - lxml - jinja2 - dateutil - owslib - pytz --- vcpkg/vcpkg.json | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index 68353f8a5ead..07349e4f7706 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -2,14 +2,14 @@ "vcpkg-configuration": { "default-registry": { "kind": "git", - "reference": "7adc2e4d49e8d0efc07a369079faa6bc3dbb90f3", "baseline": "7adc2e4d49e8d0efc07a369079faa6bc3dbb90f3", + "reference": "7adc2e4d49e8d0efc07a369079faa6bc3dbb90f3", "repository": "https://github.com/microsoft/vcpkg" }, "registries": [ { "kind": "git", - "baseline": "ca825c7a82276390809adda410246720e54964c2", + "baseline": "dbfdce706b841fc052edfe4d0296dd4f59fc1dbe", "repository": "https://github.com/open-vcpkg/python-registry", "packages": [ "python3", @@ -64,8 +64,8 @@ "proj", "protobuf", { - "default-features": false, "name": "qca", + "default-features": false, "features": [ "ossl" ] @@ -93,15 +93,19 @@ "python" ] }, + "py-dateutil", + "py-jinja2", + "py-lxml", + "py-markupsafe", + "py-numpy", + "py-owslib", "py-pip", + "py-psycopg2", "py-pyqt6", + "py-pytz", + "py-pyyaml", "py-qscintilla", - "py-numpy", "py-requests", - "py-markupsafe", - "py-pyyaml", - "py-psycopg2", - "py-qgis-requirements", "python3" ] }, From d1effd99be615124e50638545b9acf9fcbd8163d Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 20 Oct 2024 22:53:32 +0200 Subject: [PATCH 2/7] Bump python libs, add six, isort and autopep8 --- .../ports/py-qgis-requirements/portfile.cmake | 18 ------------------ .../py-qgis-requirements/requirements.txt | 9 --------- vcpkg/ports/py-qgis-requirements/vcpkg.json | 16 ---------------- vcpkg/vcpkg.json | 5 ++++- 4 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 vcpkg/ports/py-qgis-requirements/portfile.cmake delete mode 100644 vcpkg/ports/py-qgis-requirements/requirements.txt delete mode 100644 vcpkg/ports/py-qgis-requirements/vcpkg.json diff --git a/vcpkg/ports/py-qgis-requirements/portfile.cmake b/vcpkg/ports/py-qgis-requirements/portfile.cmake deleted file mode 100644 index ff3a4c265213..000000000000 --- a/vcpkg/ports/py-qgis-requirements/portfile.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - -file(MAKE_DIRECTORY "${BUILD_DIR}") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${PYTHON3_SITE}") - -if(VCPKG_TARGET_IS_WINDOWS) - set(PYTHON_EXECUTABLE "${CURRENT_INSTALLED_DIR}/tools/python3/python${VCPKG_HOST_EXECUTABLE_SUFFIX}") -else() - set(PYTHON_EXECUTABLE "${CURRENT_INSTALLED_DIR}/tools/python3/python${PYTHON3_VERSION_MAJOR}.${PYTHON3_VERSION_MINOR}") -endif() - -vcpkg_execute_required_process( - COMMAND "${PYTHON_EXECUTABLE}" "-m" "pip" "install" "-r" "${CURRENT_PORT_DIR}/requirements.txt" "--target" "${CURRENT_PACKAGES_DIR}/${PYTHON3_SITE}" "--no-deps" - WORKING_DIRECTORY "${BUILD_DIR}" - LOGNAME "requirements-install-${TARGET_TRIPLET}-rel" - ) - -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/vcpkg/ports/py-qgis-requirements/requirements.txt b/vcpkg/ports/py-qgis-requirements/requirements.txt deleted file mode 100644 index c9acbc76ceec..000000000000 --- a/vcpkg/ports/py-qgis-requirements/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -isort==5.13.2 -autopep8==2.1.0 -jinja2==3.1.4 -OWSLib==0.31.0 -lxml==5.2.2 -python-dateutil==2.9.0.post0 -six==1.16.0 -pytz==2024.1 -requests==2.32.3 diff --git a/vcpkg/ports/py-qgis-requirements/vcpkg.json b/vcpkg/ports/py-qgis-requirements/vcpkg.json deleted file mode 100644 index c874880aeec0..000000000000 --- a/vcpkg/ports/py-qgis-requirements/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "py-qgis-requirements", - "version-date": "2024-05-14", - "description": "pip installed python requirements", - "dependencies": [ - { - "name": "py-setuptools", - "host": true - }, - { - "name": "py-pip", - "host": true - }, - "python3" - ] -} diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index 07349e4f7706..6e295c95384c 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -9,7 +9,7 @@ "registries": [ { "kind": "git", - "baseline": "dbfdce706b841fc052edfe4d0296dd4f59fc1dbe", + "baseline": "d4bc16c09fae1c10c74827ffe73b6c54b287021d", "repository": "https://github.com/open-vcpkg/python-registry", "packages": [ "python3", @@ -93,7 +93,9 @@ "python" ] }, + "py-autopep8", "py-dateutil", + "py-isort", "py-jinja2", "py-lxml", "py-markupsafe", @@ -106,6 +108,7 @@ "py-pyyaml", "py-qscintilla", "py-requests", + "py-six", "python3" ] }, From 0683659078ecd8aeecfe720a9ed64174121b1159 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 20 Oct 2024 22:54:14 +0200 Subject: [PATCH 3/7] Remove py-qscintilla overlay --- vcpkg/ports/py-qscintilla/fix-static.patch | 29 ---------- vcpkg/ports/py-qscintilla/portfile.cmake | 62 ---------------------- vcpkg/ports/py-qscintilla/vcpkg.json | 22 -------- 3 files changed, 113 deletions(-) delete mode 100644 vcpkg/ports/py-qscintilla/fix-static.patch delete mode 100644 vcpkg/ports/py-qscintilla/portfile.cmake delete mode 100644 vcpkg/ports/py-qscintilla/vcpkg.json diff --git a/vcpkg/ports/py-qscintilla/fix-static.patch b/vcpkg/ports/py-qscintilla/fix-static.patch deleted file mode 100644 index ab1cf546d0fc..000000000000 --- a/vcpkg/ports/py-qscintilla/fix-static.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/qscintilla.pro b/src/qscintilla.pro -index 8d0acd2..2246442 100644 ---- a/src/qscintilla.pro -+++ b/src/qscintilla.pro -@@ -37,13 +37,13 @@ CONFIG(debug, debug|release) { - TARGET = qscintilla2_qt$${QT_MAJOR_VERSION} - } - --macx:!CONFIG(staticlib) { -+macx:!CONFIG(static) { - QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET) - } - - INCLUDEPATH += . ../scintilla/include ../scintilla/lexlib ../scintilla/src - --!CONFIG(staticlib) { -+!CONFIG(static) { - DEFINES += QSCINTILLA_MAKE_DLL - - # Comment this in to build a dynamic library supporting multiple -@@ -86,7 +86,7 @@ qsci.files = ../qsci - INSTALLS += qsci - - features.path = $$[QT_HOST_DATA]/mkspecs/features --CONFIG(staticlib) { -+CONFIG(static) { - features.files = $$PWD/features_staticlib/qscintilla2.prf - } else { - features.files = $$PWD/features/qscintilla2.prf diff --git a/vcpkg/ports/py-qscintilla/portfile.cmake b/vcpkg/ports/py-qscintilla/portfile.cmake deleted file mode 100644 index 7c2ec76ab54b..000000000000 --- a/vcpkg/ports/py-qscintilla/portfile.cmake +++ /dev/null @@ -1,62 +0,0 @@ -vcpkg_download_distfile(ARCHIVE - URLS "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/QScintilla_src-${VERSION}.tar.gz" - FILENAME "QScintilla-${VERSION}.tar.gz" - SHA512 19e2f9e0a14947501c575018df368d24eb7f8c74e74faa5246db36415bf28dc0beee507ed0e73107c02b36a99bbaf55f0ef3349f479d2332e1b92b2c4a32788a -) - -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - fix-static.patch -) - -file(RENAME "${SOURCE_PATH}/Python/pyproject-qt5.toml" "${SOURCE_PATH}/Python/pyproject.toml") - -set(SIPBUILD_ARGS - "--qmake" "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/qmake${VCPKG_HOST_EXECUTABLE_SUFFIX}" - "--api-dir" "${CURRENT_PACKAGES_DIR}/share/Qt6/qsci/api/python" - "--qsci-features-dir" "${SOURCE_PATH}/src/features" - "--qsci-include-dir" "${SITE_PACKAGES}/src" - "--qsci-library-dir" "${SOURCE_PATH}/src" - "--no-make" - "--verbose" - "--build-dir" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - "--target-dir" "${CURRENT_INSTALLED_DIR}/tools/python3/Lib/site-packages/" -) - -# TODO: help it find sip include dirs, manually patched into sipbuild/project.py for now -# "--sip-include-dirs" "${CURRENT_INSTALLED_DIR}/tools/python3/Lib/site-packages/" - -vcpkg_backup_env_variables(VARS PATH) - -vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/Scripts/") - -message(STATUS "Running sipbuild...") -vcpkg_execute_required_process( - COMMAND "${PYTHON3}" "-m" "sipbuild.tools.build" ${SIPBUILD_ARGS} - WORKING_DIRECTORY "${SOURCE_PATH}/Python" - LOGNAME "sipbuild-${TARGET_TRIPLET}" -) -message(STATUS "Running sipbuild...finished.") - -# inventory.txt is consumed by the distinfo tool which is run during make and should be run against the package directory -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) -vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/inventory.txt" - "${CURRENT_INSTALLED_DIR}" - "${CURRENT_PACKAGES_DIR}") - vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/inventory.txt" - "${NATIVE_INSTALLED_DIR}" - "${CURRENT_PACKAGES_DIR}") - -vcpkg_qmake_build(SKIP_MAKEFILE BUILD_LOGNAME "install" TARGETS "install") - -vcpkg_restore_env_variables(VARS PATH) - -vcpkg_python_test_import(MODULE "PyQt6.Qsci") - -vcpkg_copy_pdbs() - - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/vcpkg/ports/py-qscintilla/vcpkg.json b/vcpkg/ports/py-qscintilla/vcpkg.json deleted file mode 100644 index f83167b9637b..000000000000 --- a/vcpkg/ports/py-qscintilla/vcpkg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "py-qscintilla", - "version": "2.14.1", - "description": "Python bindings for QScintilla, which is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)", - "homepage": "https://www.riverbankcomputing.com/software/qscintilla", - "license": "GPL-3.0-or-later", - "supports": "!xbox", - "dependencies": [ - { - "name": "qscintilla" - }, - "py-pyqt6", - { - "name": "vcpkg-python-scripts", - "host": true - }, - { - "name": "vcpkg-qmake", - "host": true - } - ] -} From 061ebf9907ebc290d3e208cf31dc9bde4a9df11f Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 20 Oct 2024 22:59:15 +0200 Subject: [PATCH 4/7] Add .gitkeep --- vcpkg/ports/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 vcpkg/ports/.gitkeep diff --git a/vcpkg/ports/.gitkeep b/vcpkg/ports/.gitkeep new file mode 100644 index 000000000000..e69de29bb2d1 From eb6beec88af9606bea2cc2a1a29ec7ddfa9c8a60 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 21 Oct 2024 22:40:12 +0200 Subject: [PATCH 5/7] Manually copy gdal libs --- vcpkg/ports/gdal/cmake-project-include.cmake | 13 + vcpkg/ports/gdal/find-link-libraries.patch | 109 ++++++ .../gdal/fix-gdal-target-interfaces.patch | 15 + vcpkg/ports/gdal/libkml.patch | 46 +++ vcpkg/ports/gdal/portfile.cmake | 201 +++++++++++ vcpkg/ports/gdal/target-is-valid.patch | 21 ++ vcpkg/ports/gdal/usage | 4 + vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake | 23 ++ vcpkg/ports/gdal/vcpkg.json | 340 ++++++++++++++++++ 9 files changed, 772 insertions(+) create mode 100644 vcpkg/ports/gdal/cmake-project-include.cmake create mode 100644 vcpkg/ports/gdal/find-link-libraries.patch create mode 100644 vcpkg/ports/gdal/fix-gdal-target-interfaces.patch create mode 100644 vcpkg/ports/gdal/libkml.patch create mode 100644 vcpkg/ports/gdal/portfile.cmake create mode 100644 vcpkg/ports/gdal/target-is-valid.patch create mode 100644 vcpkg/ports/gdal/usage create mode 100644 vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake create mode 100644 vcpkg/ports/gdal/vcpkg.json diff --git a/vcpkg/ports/gdal/cmake-project-include.cmake b/vcpkg/ports/gdal/cmake-project-include.cmake new file mode 100644 index 000000000000..409b7b1a6436 --- /dev/null +++ b/vcpkg/ports/gdal/cmake-project-include.cmake @@ -0,0 +1,13 @@ +if(GDAL_USE_KEA) + find_package(Kealib CONFIG REQUIRED) + add_library(KEA::KEA ALIAS Kealib::Kealib) + set(GDAL_CHECK_PACKAGE_KEA_NAMES Kealib CACHE INTERNAL "vcpkg") + set(GDAL_CHECK_PACKAGE_KEA_TARGETS Kealib::Kealib CACHE INTERNAL "vcpkg") +endif() + +if(GDAL_USE_WEBP) + find_package(WebP CONFIG REQUIRED) + add_library(WEBP::WebP ALIAS WebP::webp) + set(GDAL_CHECK_PACKAGE_WebP_NAMES WebP CACHE INTERNAL "vcpkg") + set(GDAL_CHECK_PACKAGE_WebP_TARGETS WebP::webp CACHE INTERNAL "vcpkg") +endif() diff --git a/vcpkg/ports/gdal/find-link-libraries.patch b/vcpkg/ports/gdal/find-link-libraries.patch new file mode 100644 index 000000000000..a802e42645f1 --- /dev/null +++ b/vcpkg/ports/gdal/find-link-libraries.patch @@ -0,0 +1,109 @@ +diff --git a/cmake/modules/packages/FindFreeXL.cmake b/cmake/modules/packages/FindFreeXL.cmake +index 6c86fb8..0634412 100644 +--- a/cmake/modules/packages/FindFreeXL.cmake ++++ b/cmake/modules/packages/FindFreeXL.cmake +@@ -37,7 +37,15 @@ include(SelectLibraryConfigurations) + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_FREEXL QUIET freexl) ++ pkg_check_modules(PC_FREEXL QUIET IMPORTED_TARGET freexl) ++endif() ++if(PC_FREEXL_FOUND) ++ set(FREEXL_INCLUDE_DIR "${PC_FREEXL_INCLUDE_DIRS}" CACHE STRING "") ++ set(FREEXL_LIBRARY "${PC_FREEXL_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET FREEXL::freexl) ++ add_library(FREEXL::freexl INTERFACE IMPORTED) ++ set_target_properties(FREEXL::freexl PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_FREEXL) ++ endif() + endif() + + find_path(FREEXL_INCLUDE_DIR +diff --git a/cmake/modules/packages/FindOpenJPEG.cmake b/cmake/modules/packages/FindOpenJPEG.cmake +index c697484..6e83222 100644 +--- a/cmake/modules/packages/FindOpenJPEG.cmake ++++ b/cmake/modules/packages/FindOpenJPEG.cmake +@@ -32,9 +32,18 @@ endfunction() + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_OPENJPEG QUIET libopenjp2) ++ pkg_check_modules(PC_OPENJPEG QUIET IMPORTED_TARGET libopenjp2) + set(OpenJPEG_VERSION_STRING ${PC_OPENJPEG_VERSION}) + endif() ++if(PC_OPENJPEG_FOUND) ++ set(OPENJPEG_INCLUDE_DIR "${PC_OPENJPEG_INCLUDE_DIRS}" CACHE STRING "") ++ set(OPENJPEG_LIBRARY "${PC_OPENJPEG_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET OPENJPEG::OpenJPEG) ++ add_library(OPENJPEG::OpenJPEG INTERFACE IMPORTED) ++ set_target_properties(OPENJPEG::OpenJPEG PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${PC_OPENJPEG_INCLUDE_DIRS}") ++ set_target_properties(OPENJPEG::OpenJPEG PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_OPENJPEG) ++ endif() ++endif() + + + find_path(OPENJPEG_INCLUDE_DIR opj_config.h +diff --git a/cmake/modules/packages/FindPoppler.cmake b/cmake/modules/packages/FindPoppler.cmake +index 3807ec0..8059eb4 100644 +--- a/cmake/modules/packages/FindPoppler.cmake ++++ b/cmake/modules/packages/FindPoppler.cmake +@@ -42,11 +42,19 @@ This module defines the following variables: + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_Poppler QUIET poppler) ++ pkg_check_modules(PC_Poppler QUIET IMPORTED_TARGET poppler) + if(PC_Poppler_VERSION) + set(Poppler_VERSION_STRING ${PC_Poppler_VERSION}) + endif() + endif() ++if(PC_Poppler_FOUND) ++ find_path(Poppler_INCLUDE_DIR NAMES Object.h PATHS ${PC_Poppler_INCLUDE_DIRS} NO_DEFAULT_PATH) ++ set(Poppler_LIBRARY "${PC_Poppler_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET Poppler::Poppler) ++ add_library(Poppler::Poppler INTERFACE IMPORTED) ++ set_target_properties(Poppler::Poppler PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_Poppler) ++ endif() ++endif() + find_path(Poppler_INCLUDE_DIR NAMES "poppler-config.h" "cpp/poppler-version.h" "qt5/poppler-qt5.h" "qt4/poppler-qt4.h" + "glib/poppler.h" + HINTS ${PC_Poppler_INCLUDE_DIRS} +@@ -77,6 +85,15 @@ endforeach() + foreach(_comp IN LISTS Poppler_known_components) + list(FIND Poppler_FIND_COMPONENTS "${_comp}" _nextcomp) + if(_nextcomp GREATER -1) ++ pkg_check_modules(PC_Poppler_${_comp} QUIET IMPORTED_TARGET ${Poppler_${_comp}_pkg_config}) ++ if(PC_Poppler_${_comp}_FOUND) ++ set(Poppler_${_comp}_INCLUDE_DIR "${PC_Poppler_${_comp}_INCLUDE_DIRS}" CACHE STRING "") ++ set(Poppler_${_comp}_LIBRARY "${PC_Poppler_${_comp}_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET Poppler::Poppler_${_comp}) ++ add_library(Poppler::${_comp} INTERFACE IMPORTED) ++ set_target_properties(Poppler::${_comp} PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_Poppler_${_comp}) ++ endif() ++ endif() + find_path(Poppler_${_comp}_INCLUDE_DIR + NAMES ${Poppler_${_comp}_header} + PATH_SUFFIXES poppler +diff --git a/cmake/modules/packages/FindSPATIALITE.cmake b/cmake/modules/packages/FindSPATIALITE.cmake +index 00612b0..6388719 100644 +--- a/cmake/modules/packages/FindSPATIALITE.cmake ++++ b/cmake/modules/packages/FindSPATIALITE.cmake +@@ -38,9 +38,17 @@ endif() + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_SPATIALITE QUIET spatialite) ++ pkg_check_modules(PC_SPATIALITE QUIET IMPORTED_TARGET spatialite) + set(SPATIALITE_VERSION_STRING ${PC_SPATIALITE_VERSION}) + endif() ++if(PC_SPATIALITE_FOUND) ++ set(SPATIALITE_INCLUDE_DIR "${PC_SPATIALITE_INCLUDE_DIRS}" CACHE STRING "") ++ set(SPATIALITE_LIBRARY "${PC_SPATIALITE_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET SPATIALITE::SPATIALITE) ++ add_library(SPATIALITE::SPATIALITE INTERFACE IMPORTED) ++ set_target_properties(SPATIALITE::SPATIALITE PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_SPATIALITE) ++ endif() ++endif() + + find_path(SPATIALITE_INCLUDE_DIR + NAMES spatialite.h diff --git a/vcpkg/ports/gdal/fix-gdal-target-interfaces.patch b/vcpkg/ports/gdal/fix-gdal-target-interfaces.patch new file mode 100644 index 000000000000..bf159fce593a --- /dev/null +++ b/vcpkg/ports/gdal/fix-gdal-target-interfaces.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/helpers/GdalDriverHelper.cmake b/cmake/helpers/GdalDriverHelper.cmake +index 838f0fd..380e20d 100644 +--- a/cmake/helpers/GdalDriverHelper.cmake ++++ b/cmake/helpers/GdalDriverHelper.cmake +@@ -248,6 +248,10 @@ function(gdal_target_interfaces _TARGET) + if (_res) + target_compile_options(${_TARGET} PRIVATE ${_res}) + endif () ++ get_property(_res TARGET ${_LIB} PROPERTY INTERFACE_LINK_LIBRARIES) ++ if (_res) ++ gdal_target_interfaces(${_TARGET} ${_res}) ++ endif () + endif () + endforeach () + endfunction() diff --git a/vcpkg/ports/gdal/libkml.patch b/vcpkg/ports/gdal/libkml.patch new file mode 100644 index 000000000000..ef25d06de525 --- /dev/null +++ b/vcpkg/ports/gdal/libkml.patch @@ -0,0 +1,46 @@ +diff --git a/cmake/modules/packages/FindLibKML.cmake b/cmake/modules/packages/FindLibKML.cmake +index 9418247..589b83d 100644 +--- a/cmake/modules/packages/FindLibKML.cmake ++++ b/cmake/modules/packages/FindLibKML.cmake +@@ -56,6 +56,8 @@ find_library(LIBKML_BASE_LIBRARY + HINTS ${PC_LIBKML_LIBRARY_DIRS} ) + mark_as_advanced(LIBKML_BASE_LIBRARY) + ++cmake_policy(PUSH) ++cmake_policy(SET CMP0057 NEW) + set(libkml_known_components DOM CONVENIENCE ENGINE REGIONATOR) + foreach(_comp IN LISTS libkml_known_components) + if(${_comp} IN_LIST LibKML_FIND_COMPONENTS) +@@ -99,21 +101,20 @@ find_package_handle_standard_args(LibKML + if(LIBKML_FOUND) + set(LIBKML_INCLUDE_DIRS "${LIBKML_INCLUDE_DIR}") + set(LIBKML_LIBRARIES "${LIBKML_BASE_LIBRARY}") ++ find_package(LibKML CONFIG REQUIRED) + if(NOT TARGET LIBKML::LibKML) +- add_library(LIBKML::LibKML UNKNOWN IMPORTED) ++ add_library(LIBKML::LibKML INTERFACE IMPORTED) + set_target_properties(LIBKML::LibKML PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${LIBKML_INCLUDE_DIR}" +- IMPORTED_LINK_INTERFACE_LANGUAGES "C++" +- IMPORTED_LOCATION "${LIBKML_BASE_LIBRARY}") ++ INTERFACE_LINK_LIBRARIES kmlbase) + endif() + foreach(_comp IN LISTS libkml_known_components) + if(${_comp} IN_LIST LibKML_FIND_COMPONENTS) ++ string(TOLOWER ${_comp} _name) + list(APPEND LIBKML_LIBRARIES "${LIBKML_${_comp}_LIBRARY}") + if(NOT TARGET LIBKML::${_comp}) +- add_library(LIBKML::${_comp} UNKNOWN IMPORTED) ++ add_library(LIBKML::${_comp} INTERFACE IMPORTED) + set_target_properties(LIBKML::${_comp} PROPERTIES +- IMPORTED_LINK_INTERFACE_LANGUAGES "C++" +- IMPORTED_LOCATION "${LIBKML_${_comp}_LIBRARY}") ++ INTERFACE_LINK_LIBRARIES kml${_name}) + endif() + endif() + endforeach() +@@ -129,3 +130,4 @@ if(LIBKML_FOUND) + endif() + endforeach() + endif() ++cmake_policy(POP) diff --git a/vcpkg/ports/gdal/portfile.cmake b/vcpkg/ports/gdal/portfile.cmake new file mode 100644 index 000000000000..0dd156ffe70f --- /dev/null +++ b/vcpkg/ports/gdal/portfile.cmake @@ -0,0 +1,201 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OSGeo/gdal + REF "v${VERSION}" + SHA512 e625ed1736f16bdcb0608fc251f238128e11a3384808764cf82b64243e79a4711f53b8fedb82bd8d992057ed94d426eda764096679cfc348c7341327c0bddcb6 + HEAD_REF master + PATCHES + find-link-libraries.patch + fix-gdal-target-interfaces.patch + libkml.patch + target-is-valid.patch +) +# `vcpkg clean` stumbles over one subdir +file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") + +# Avoid abseil, no matter if vcpkg or system +vcpkg_replace_string("${SOURCE_PATH}/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h" [[__has_include("absl/strings/string_view.h")]] "(0)") + +# Cf. cmake/helpers/CheckDependentLibraries.cmake +# The default for all `GDAL_USE_` dependencies is `OFF`. +# Here, we explicitly control dependencies provided via vpcpkg. +# "core" is used for a dependency which must be enabled to avoid vendored lib. +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cfitsio GDAL_USE_CFITSIO + curl GDAL_USE_CURL + expat GDAL_USE_EXPAT + freexl GDAL_USE_FREEXL + geos GDAL_USE_GEOS + core GDAL_USE_GEOTIFF + gif GDAL_USE_GIF + hdf5 GDAL_USE_HDF5 + iconv GDAL_USE_ICONV + jpeg GDAL_USE_JPEG + core GDAL_USE_JSONC + kea GDAL_USE_KEA + lerc GDAL_USE_LERC + libkml GDAL_USE_LIBKML + lzma GDAL_USE_LIBLZMA + libxml2 GDAL_USE_LIBXML2 + mysql-libmariadb GDAL_USE_MYSQL + netcdf GDAL_USE_NETCDF + odbc GDAL_USE_ODBC + openjpeg GDAL_USE_OPENJPEG + openssl GDAL_USE_OPENSSL + pcre2 GDAL_USE_PCRE2 + png GDAL_USE_PNG + poppler GDAL_USE_POPPLER + postgresql GDAL_USE_POSTGRESQL + qhull GDAL_USE_QHULL + #core GDAL_USE_SHAPELIB # https://github.com/OSGeo/gdal/issues/5711, https://github.com/microsoft/vcpkg/issues/16041 + core GDAL_USE_SHAPELIB_INTERNAL + libspatialite GDAL_USE_SPATIALITE + sqlite3 GDAL_USE_SQLITE3 + core GDAL_USE_TIFF + webp GDAL_USE_WEBP + core GDAL_USE_ZLIB + zstd GDAL_USE_ZSTD + python BUILD_PYTHON_BINDINGS + tools BUILD_APPS + INVERTED_FEATURES + libspatialite CMAKE_DISABLE_FIND_PACKAGE_SPATIALITE +) +if(GDAL_USE_ICONV AND VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS -D_ICONV_SECOND_ARGUMENT_IS_NOT_CONST=ON) +endif() + +# Compatibility with older Android versions https://github.com/OSGeo/gdal/pull/5941 +if(VCPKG_TARGET_IS_ANDROID AND ANRDOID_PLATFORM VERSION_LESS 24 AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) + list(APPEND FEATURE_OPTIONS -DBUILD_WITHOUT_64BIT_OFFSET=ON) +endif() + +string(REPLACE "dynamic" "" qhull_target "Qhull::qhull${VCPKG_LIBRARY_LINKAGE}_r") + +if(VCPKG_TARGET_IS_WINDOWS) + set(GDAL_PYTHON_INSTALL_PREFIX "${CURRENT_PACKAGES_DIR}/${PYTHON3_SITE}/../../") +else() + set(GDAL_PYTHON_INSTALL_PREFIX "${CURRENT_PACKAGES_DIR}/${PYTHON3_SITE}/../../../") +endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} # for host pkgconf in PATH + ${FEATURE_OPTIONS} + -DBUILD_DOCS=OFF + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_CSharp=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Java=ON + -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON +# -DCMAKE_DISABLE_FIND_PACKAGE_SWIG=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Arrow=ON + -DGDAL_USE_INTERNAL_LIBS=OFF + -DGDAL_USE_EXTERNAL_LIBS=OFF + -DGDAL_BUILD_OPTIONAL_DRIVERS=ON + -DOGR_BUILD_OPTIONAL_DRIVERS=ON + -DFIND_PACKAGE2_KEA_ENABLED=OFF + -DGDAL_CHECK_PACKAGE_MySQL_NAMES=unofficial-libmariadb + -DGDAL_CHECK_PACKAGE_MySQL_TARGETS=unofficial::libmariadb + -DMYSQL_LIBRARIES=unofficial::libmariadb + -DGDAL_CHECK_PACKAGE_NetCDF_NAMES=netCDF + -DGDAL_CHECK_PACKAGE_NetCDF_TARGETS=netCDF::netcdf + -DGDAL_CHECK_PACKAGE_QHULL_NAMES=Qhull + "-DGDAL_CHECK_PACKAGE_QHULL_TARGETS=${qhull_target}" + "-DQHULL_LIBRARY=${qhull_target}" + "-DSWIG_DIR=${CURRENT_HOST_INSTALLED_DIR}/tools/swig" + "-DSWIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/swig/swig${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-DGDAL_PYTHON_INSTALL_PREFIX=${GDAL_PYTHON_INSTALL_PREFIX}" + -DONLY_GENERATE_FOR_NON_DEBUG=ON # Python bindings only for release + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + OPTIONS_DEBUG + -DBUILD_APPS=OFF + "-DGDAL_DEBUG_POSTFIX=" + MAYBE_UNUSED_VARIABLES + QHULL_LIBRARY +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gdal) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdal/GDALConfig.cmake" + "include(CMakeFindDependencyMacro)" + "include(CMakeFindDependencyMacro) +# gdal needs a pkg-config tool. A host dependency provides pkgconf. +get_filename_component(vcpkg_host_prefix \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}\" ABSOLUTE) +list(APPEND CMAKE_PROGRAM_PATH \"\${vcpkg_host_prefix}/tools/pkgconf\")" +) + +if (BUILD_APPS) + vcpkg_copy_tools( + TOOL_NAMES + gdal_contour + gdal_create + gdal_footprint + gdal_grid + gdal_rasterize + gdal_translate + gdal_viewshed + gdaladdo + gdalbuildvrt + gdaldem + gdalenhance + gdalinfo + gdallocationinfo + gdalmanage + gdalmdiminfo + gdalmdimtranslate + gdalsrsinfo + gdaltindex + gdaltransform + gdalwarp + gnmanalyse + gnmmanage + nearblack + ogr2ogr + ogrinfo + ogrlineref + ogrtindex + sozip + AUTO_CLEAN + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/gdal-config" "${CURRENT_PACKAGES_DIR}/debug/bin/gdal-config") + +file(GLOB bin_files "${CURRENT_PACKAGES_DIR}/bin/*") +if(NOT bin_files) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +if("python" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_OSX) + file(GLOB_RECURSE macho_files LIST_DIRECTORIES FALSE "${CURRENT_PACKAGES_DIR}/*") + list(FILTER macho_files INCLUDE REGEX "\.so$") + foreach(macho_file IN LISTS macho_files) + # Required for testing, as it needs to be able load shared libs from the package (not yet installed) path + # Will be overwritten by z_vcpkg_fixup_rpath_macho + execute_process( + COMMAND install_name_tool -add_rpath "${CURRENT_PACKAGES_DIR}/lib" "${macho_file}" + OUTPUT_QUIET + ERROR_VARIABLE set_rpath_error + ) + endforeach() + elseif(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/swig/python/osgeo" DESTINATION "${CURRENT_PACKAGES_DIR}/${PYTHON3_SITE}") + endif() + vcpkg_python_test_import(MODULE "osgeo.gdal") +endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDAL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT") diff --git a/vcpkg/ports/gdal/target-is-valid.patch b/vcpkg/ports/gdal/target-is-valid.patch new file mode 100644 index 000000000000..c7acf739064a --- /dev/null +++ b/vcpkg/ports/gdal/target-is-valid.patch @@ -0,0 +1,21 @@ +diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake +index f5c920a..53494c9 100644 +--- a/cmake/helpers/CheckDependentLibraries.cmake ++++ b/cmake/helpers/CheckDependentLibraries.cmake +@@ -41,6 +41,7 @@ endif() + # https://github.com/OSGeo/gdal/issues/5324 + function (gdal_check_target_is_valid target res_var) + get_target_property(_interface_include_directories ${target} "INTERFACE_INCLUDE_DIRECTORIES") ++ get_target_property(_type ${target} "TYPE") + if(_interface_include_directories) + foreach(_dir IN LISTS _interface_include_directories) + if(NOT EXISTS "${_dir}") +@@ -54,7 +55,7 @@ function (gdal_check_target_is_valid target res_var) + # property, but a GeoTIFF_INCLUDE_DIRS variable. + set_target_properties(${target} PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${GeoTIFF_INCLUDE_DIRS}") +- else() ++ elseif(NOT _type STREQUAL "INTERFACE" AND _type STREQUAL "ALIAS") + message(WARNING "Target ${target} has no INTERFACE_INCLUDE_DIRECTORIES property. Ignoring that target.") + set(${res_var} FALSE PARENT_SCOPE) + return() diff --git a/vcpkg/ports/gdal/usage b/vcpkg/ports/gdal/usage new file mode 100644 index 000000000000..6982a9a24259 --- /dev/null +++ b/vcpkg/ports/gdal/usage @@ -0,0 +1,4 @@ +The package GDAL provides CMake targets: + + find_package(GDAL CONFIG REQUIRED) + target_link_libraries(main PRIVATE GDAL::GDAL) diff --git a/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake b/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000000..5b70b673b097 --- /dev/null +++ b/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,23 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) + +list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE") +list(APPEND ARGS "CONFIG") +# The current port version should satisfy GDAL 3.0 ... 3.5 +list(GET ARGS 1 vcpkg_gdal_maybe_version) +if(vcpkg_gdal_maybe_version MATCHES "(^3\$|^3[.][0-5])") + list(REMOVE_AT ARGS "1") +endif() +unset(vcpkg_gdal_maybe_version) +_find_package(${ARGS} CONFIG) +if(GDAL_FOUND) + get_filename_component(vcpkg_gdal_prefix "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) + set(GDAL_INCLUDE_DIR "${vcpkg_gdal_prefix}/include" CACHE INTERNAL "") + set(GDAL_INCLUDE_DIRS "${GDAL_INCLUDE_DIR}") + set(GDAL_LIBRARY GDAL::GDAL CACHE INTERNAL "") + set(GDAL_LIBRARIES "${GDAL_LIBRARY}") + unset(vcpkg_gdal_prefix) +endif() + +cmake_policy(POP) diff --git a/vcpkg/ports/gdal/vcpkg.json b/vcpkg/ports/gdal/vcpkg.json new file mode 100644 index 000000000000..e0cbea9f0d64 --- /dev/null +++ b/vcpkg/ports/gdal/vcpkg.json @@ -0,0 +1,340 @@ +{ + "name": "gdal", + "version-semver": "3.9.2", + "port-version": 1, + "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", + "homepage": "https://gdal.org", + "license": null, + "supports": "!uwp", + "dependencies": [ + "json-c", + "libgeotiff", + { + "name": "pkgconf", + "host": true + }, + { + "name": "proj", + "default-features": false, + "features": [ + "tiff" + ] + }, + { + "name": "tiff", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + }, + "zlib" + ], + "default-features": [ + "default-features" + ], + "features": { + "aws-ec2-windows": { + "description": "Optimized detection of AWS EC2 Windows hosts", + "dependencies": [ + "atl" + ] + }, + "cfitsio": { + "description": "Enable cfitsio support", + "dependencies": [ + "cfitsio" + ] + }, + "curl": { + "description": "Enable CURL network support", + "dependencies": [ + { + "name": "curl", + "default-features": false + } + ] + }, + "default-features": { + "description": "Default set of features, including recommended features", + "dependencies": [ + { + "name": "gdal", + "default-features": false, + "features": [ + "gif", + "iconv", + "libkml", + "libxml2", + "lzma", + "openjpeg", + "openssl", + "pcre2", + "recommended-features", + "webp", + "zstd" + ] + }, + { + "name": "gdal", + "default-features": false, + "features": [ + "libspatialite", + "postgresql" + ], + "platform": "!uwp" + }, + { + "name": "gdal", + "default-features": false, + "features": [ + "hdf5", + "netcdf" + ], + "platform": "!uwp & !(windows & arm64) & !android & !ios" + } + ] + }, + "expat": { + "description": "Use EXPAT library", + "dependencies": [ + "expat" + ] + }, + "freexl": { + "description": "Enable FREEXL support", + "dependencies": [ + "freexl" + ] + }, + "geos": { + "description": "Enable GEOS support", + "dependencies": [ + "geos" + ] + }, + "gif": { + "description": "Enable GIF support", + "dependencies": [ + "giflib" + ] + }, + "hdf5": { + "description": "Enable HDF5 support", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "cpp" + ] + } + ] + }, + "iconv": { + "description": "Use iconv library", + "dependencies": [ + "libiconv" + ] + }, + "jpeg": { + "description": "Use JPEG compression library", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "kea": { + "description": "Enable KEA driver", + "dependencies": [ + { + "name": "gdal", + "default-features": false, + "features": [ + "hdf5" + ] + }, + "kealib" + ] + }, + "lerc": { + "description": "Enable LERC support", + "dependencies": [ + "lerc" + ] + }, + "libkml": { + "description": "Enable the LibKML driver", + "dependencies": [ + "libkml" + ] + }, + "libspatialite": { + "description": "Create or update SpatiaLite databases using libspatialite", + "dependencies": [ + "libspatialite" + ] + }, + "libxml2": { + "description": "Use LibXML2 library", + "dependencies": [ + "libxml2" + ] + }, + "lzma": { + "description": "Use LZMA library", + "dependencies": [ + "liblzma" + ] + }, + "mysql-libmariadb": { + "description": "Add mysql support using libmariadb", + "dependencies": [ + "libmariadb" + ] + }, + "netcdf": { + "description": "Enable NetCDF support", + "dependencies": [ + { + "name": "netcdf-c", + "default-features": false + } + ] + }, + "openjpeg": { + "description": "Use OpenJPEG library", + "dependencies": [ + "openjpeg" + ] + }, + "openssl": { + "description": "Use OpenSSL library", + "dependencies": [ + "openssl" + ] + }, + "pcre2": { + "description": "Enable PCRE2 support for sqlite3", + "dependencies": [ + "pcre2" + ] + }, + "png": { + "description": "Use PNG compression library", + "dependencies": [ + "libpng" + ] + }, + "poppler": { + "description": "Enable PDF reading support via poppler", + "dependencies": [ + { + "name": "poppler", + "default-features": false, + "features": [ + "private-api" + ] + } + ] + }, + "postgresql": { + "description": "Enable PostgreSQL support", + "dependencies": [ + "libpq" + ] + }, + "python": { + "description": "Build python bindings", + "dependencies": [ + "py-numpy", + { + "name": "py-setuptools", + "host": true + }, + "python3", + { + "name": "swig", + "host": true + }, + { + "name": "vcpkg-python-scripts", + "host": true + } + ] + }, + "qhull": { + "description": "Use QHULL library", + "dependencies": [ + "qhull" + ] + }, + "recommended-features": { + "description": "Features that are explicity marked as recommended by GDAL.", + "dependencies": [ + { + "name": "gdal", + "default-features": false, + "features": [ + "curl", + "expat", + "geos", + "jpeg", + "lerc", + "png", + "qhull", + "sqlite3" + ] + } + ] + }, + "sqlite3": { + "description": "Enable SQLite3 support", + "dependencies": [ + { + "name": "sqlite3", + "features": [ + "rtree" + ] + } + ] + }, + "supported-default-features": { + "description": "This feature is an alias for default-features. It is retained for compatibility.", + "dependencies": [ + { + "name": "gdal", + "features": [ + "default-features" + ] + } + ] + }, + "system-libraries": { + "$supports": "!windows", + "description": "This feature does nothing. It is retained for compatibility." + }, + "tools": { + "description": "Builds gdal and ogr executables" + }, + "webp": { + "description": "Enable WEBP support", + "dependencies": [ + "libwebp" + ] + }, + "zstd": { + "description": "Use ZSTD library", + "dependencies": [ + "zstd" + ] + } + } +} From b15d796b7ade676ffb0c1b4793652c3becd50010 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 21 Oct 2024 23:15:53 +0200 Subject: [PATCH 6/7] GDAL 3.9.3 --- vcpkg/ports/gdal/portfile.cmake | 2 +- vcpkg/ports/gdal/vcpkg.json | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/vcpkg/ports/gdal/portfile.cmake b/vcpkg/ports/gdal/portfile.cmake index 0dd156ffe70f..699142fb6a30 100644 --- a/vcpkg/ports/gdal/portfile.cmake +++ b/vcpkg/ports/gdal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 e625ed1736f16bdcb0608fc251f238128e11a3384808764cf82b64243e79a4711f53b8fedb82bd8d992057ed94d426eda764096679cfc348c7341327c0bddcb6 + SHA512 fccdcf484bdc833dc5f0d6ad1fce9d152fa8b861cf23b634400d8bf7fd97d2c33a6b87050538c5a6c896d4ba870469134521cc44fdad3e071adffbf29329cb9b HEAD_REF master PATCHES find-link-libraries.patch diff --git a/vcpkg/ports/gdal/vcpkg.json b/vcpkg/ports/gdal/vcpkg.json index e0cbea9f0d64..f5f885296654 100644 --- a/vcpkg/ports/gdal/vcpkg.json +++ b/vcpkg/ports/gdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdal", - "version-semver": "3.9.2", - "port-version": 1, + "version-semver": "3.9.3", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, @@ -277,7 +276,7 @@ ] }, "recommended-features": { - "description": "Features that are explicity marked as recommended by GDAL.", + "description": "Features that are explicitly marked as recommended by GDAL.", "dependencies": [ { "name": "gdal", From a255a56b4d6e21b843730e00521728309e1344fc Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 22 Oct 2024 07:43:08 +0200 Subject: [PATCH 7/7] remove lxml for now --- vcpkg/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index 6e295c95384c..b2716078a9cc 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -97,7 +97,6 @@ "py-dateutil", "py-isort", "py-jinja2", - "py-lxml", "py-markupsafe", "py-numpy", "py-owslib",