-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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: Fix conflicts #22204
Gdal: Fix conflicts #22204
Conversation
I detected other pull requests that are modifying gdal/pre_3.5.0 recipe: This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
with libgeotiff, libtiff, proj
The build is now finished. You can take a look at the results here |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
@uilianries it's ready for review |
to reduce the scope of the change, the potential for regression, and ease review
@uilianries @RubenRBS I simplified this PR by not migrating to f-strings. Is it possible to get a review ? |
The build is now finished. You can take a look at the results here |
This comment has been minimized.
This comment has been minimized.
@jcar87 how can we make progress on this one ? is the description clear enough ? is the change ok ? |
The pdal package uses the removed version 3.4.1: https://github.com/conan-io/conan-center-index/blob/master/recipes/pdal/all/conanfile.py#L74 |
Yes, bus as it's conan 1 only, and not touched in the last 2 years, it'll need an important refactoring anyway |
@uilianries I restored 3.4.1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good, only a small comment.
Co-authored-by: Uilian Ries <uilianries@gmail.com>
The build is now finished. You can take a look at the results here |
Conan v1 pipeline ✔️All green in build 12 (
Conan v2 pipeline ✔️
All green in build 12 ( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thank you for the approvals, it's been a long one ! |
Specify library name and version: gdal/*
It's just not possible to build the current gdal recipe, cf https://github.com/eirikb/proof-of-conan/actions/runs/8718677788
the conflicts are:
libgeotiff/1.7.1->libtiff/4.6.0, gdal/3.4.3->libtiff/4.5.1.
libtiff/4.6.0->libdeflate/1.19, gdal/3.4.3->libdeflate/1.18.
libgeotiff/1.7.1->proj/9.3.1, gdal/3.4.3->proj/9.2.1.
proj/9.3.1->sqlite3/3.44.2, gdal/3.4.3->sqlite3/3.42.0.
also, libpq/14.5 and openssl/1.1.1u are not maintained on CCI any more
The other requirements modification are the transition to ranges for zlib, libpng and libcurl
Also, drop dead code, and 3.4.1 and 3.3.3 which are not used