Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gdal] Update to v3.5.2 #26676

Merged
merged 14 commits into from
Sep 26, 2022
Merged

[gdal] Update to v3.5.2 #26676

merged 14 commits into from
Sep 26, 2022

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Sep 4, 2022

@dg0yt
Copy link
Contributor Author

dg0yt commented Sep 4, 2022

The osg:arm64-windows error is unrelated. osg fails to find cmake package OpenEXR. Given a number of warnings, some of openexr's dependencies may need pkg-config/pkgconf. This problem could have been hidden by installation order in the recent openexr update.

@LilyWangLL LilyWangLL added the category:port-update The issue is with a library, which is requesting update new revision label Sep 5, 2022
@dg0yt dg0yt changed the title [gdal] Prepare update to v3.5.2 [gdal] Update to v3.5.2 Sep 12, 2022
@dg0yt dg0yt marked this pull request as ready for review September 13, 2022 11:42
@JackBoosY JackBoosY self-assigned this Sep 15, 2022
github-actions[bot]
github-actions bot previously approved these changes Sep 15, 2022
JackBoosY
JackBoosY previously approved these changes Sep 15, 2022
@JonLiu1993
Copy link
Member

@dg0yt , when I tested the features by command ./vcpkg install gdal[*]:x86-windows but failed,
I got this error, please take a look:

-- Could NOT find MSSQL_ODBC (missing: MSSQL_ODBC_LIBRARY MSSQL_ODBC_INCLUDE_DIR MSSQL_ODBC_VERSION) 
-- Could NOT find MySQL (missing: MYSQL_LIBRARY) 
CMake Error at cmake/helpers/CheckDependentLibraries.cmake:178 (message):
  Configured to use MYSQL, but not found
Call Stack (most recent call first):
  cmake/helpers/CheckDependentLibraries.cmake:260 (gdal_check_package)
  gdal.cmake:254 (include)
  CMakeLists.txt:218 (include)

@JonLiu1993 JonLiu1993 added requires:author-response requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function labels Sep 15, 2022
github-actions[bot]
github-actions bot previously approved these changes Sep 15, 2022
@dg0yt
Copy link
Contributor Author

dg0yt commented Sep 15, 2022

@JonLiu1993 Please test again.

@JonLiu1993
Copy link
Member

JonLiu1993 commented Sep 15, 2022

@dg0yt , when I tested the features by command ./vcpkg install gdal[*]:x86-windows but failed,
I got this error, please take a look:

-- Could NOT find MRSID (missing: MRSID_LIBRARY MRSID_INCLUDE_DIR) 
-- Could NOT find Armadillo (missing: ARMADILLO_INCLUDE_DIR) 
CMake Error at cmake/helpers/CheckDependentLibraries.cmake:178 (message):
  Configured to use CFITSIO, but not found
Call Stack (most recent call first):
  cmake/helpers/CheckDependentLibraries.cmake:601 (gdal_check_package)
  gdal.cmake:254 (include)
  CMakeLists.txt:218 (include)

github-actions[bot]
github-actions bot previously approved these changes Sep 19, 2022
@dg0yt
Copy link
Contributor Author

dg0yt commented Sep 19, 2022

@JonLiu1993 Fixed bug in port lerc.

@JonLiu1993
Copy link
Member

JonLiu1993 commented Sep 20, 2022

@JonLiu1993 Fixed bug in port lerc.

@dg0yt , I tested again and the error persists

CMake Error at scripts/cmake/vcpkg_execute_build_process.cmake:129 (message):
    Command failed: F:/Feature-test/gdal/vcpkg/downloads/tools/cmake-3.24.0-windows/cmake-3.24.0-windows-i386/bin/cmake.exe --build . --config Release --target install -- -v -j9
    Working Directory: F:/Feature-test/gdal/vcpkg/buildtrees/gdal/x64-windows-static-rel
    See logs for more information:
      F:\Feature-test\gdal\vcpkg\buildtrees\gdal\install-x64-windows-static-rel-out.log

Call Stack (most recent call first):
  installed/x64-windows/share/vcpkg-cmake/vcpkg_cmake_build.cmake:74 (vcpkg_execute_build_process)
  installed/x64-windows/share/vcpkg-cmake/vcpkg_cmake_install.cmake:16 (vcpkg_cmake_build)
  ports/gdal/portfile.cmake:94 (vcpkg_cmake_install)
  scripts/ports.cmake:147 (include)

F:\Feature-test\gdal\vcpkg\buildtrees\gdal\install-x64-windows-static-rel-out.log:

install-x64-windows-static-rel-out.log

@dg0yt
Copy link
Contributor Author

dg0yt commented Sep 20, 2022

I tested again and the error persists

I will try to make a separate lerc update to 4.0. It will fix static builds, cf. Esri/lerc@384465e

@JackBoosY JackBoosY added depends:different-pr This PR or Issue depends on a PR which has been filed and removed requires:author-response labels Sep 20, 2022
github-actions[bot]
github-actions bot previously approved these changes Sep 21, 2022
@JackBoosY JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Sep 21, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for lerc have changed but the version was not updated
version: 4.0
old SHA: 9fce90d3d96f4afb8ffcf1b2e7484ee75aa78ed2
new SHA: 8f17f219451d5e3b4243b40a1ad6695cc98e469b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

github-actions[bot]
github-actions bot previously approved these changes Sep 21, 2022
@dg0yt
Copy link
Contributor Author

dg0yt commented Sep 21, 2022

Stop pushing non-sense to my branch. CI for x64-linux is broken.

@JonLiu1993
Copy link
Member

All features are tested successfully in the folllowing triplet:

  • x86-windows
  • x64-windows
  • x64-windows-static

@JonLiu1993 JonLiu1993 removed the requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function label Sep 21, 2022
@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Sep 22, 2022
@dan-shaw dan-shaw merged commit 1ea1da7 into microsoft:master Sep 26, 2022
@dg0yt dg0yt deleted the gdal-3.5.2 branch September 26, 2022 06:46
jorisvandenbossche added a commit to geopandas/pyogrio that referenced this pull request Oct 16, 2022
Updating GDAL to the latest version in vcpkg (microsoft/vcpkg#26676). 

Summary of the related changes:

- GDAL is updated to version 3.5.2
- GDAL is now built using its new CMake build config (microsoft/vcpkg#22392) 
- Using GDAL's cmake build, this now correctly includes GEOS also on Linux and MacOS
  - Using pyogrio (including GEOS) and shapely together fails on MacOS when using a different GEOS version and if pyogrio is imported first (this is because shapely (specifically for MacOS) will use an already loaded GEOS for ctypes, while its cython code still uses the GEOS included in the wheel, giving a GEOS version mismatch _within_ different parts of shapely itself) -> avoid this issue by trying to import shapely first in our `__init__.py`
- Further, the vcpkg setup of which GDAL dependencies are used has changed a bit in the refactor of the port to use GDAL's cmake build. This has some influence on which libraries are included (eg libxml2 and iconv are no longer included), see #161 (comment) for more details.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Undefined reference to pcre2 with qtbase and gdal in combination
5 participants