sdl: bump deps and modernize more for conan v2 #20381
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- bump dependencies - use `<host_version>` for wayland in build requirements - sort method by order of execution - use version range for cmake - fix several access to informations of dependencies (self.dependencies instead of self.options, or robust collection of info in dependencies with components) - remove `PKG_CONFIG_PATH` workaround since required_conan_version is greater than 1.55.0 now
3 tasks
This was referenced Oct 5, 2023
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.
AbrilRBS
previously approved these changes
Oct 6, 2023
|
Missing package for pkgconf/2.0.3 in v2 - that's totally unexpected, will check |
AbrilRBS
added
the
Missing dependencies
|
using this PR to rebuild pkgconf, will retrigger once it finishes |
ghost
mentioned this pull request
|
Would it be possible to cherry-pick and include this commit from #19679 in this patch? |
conan-center-bot
removed
the
Missing dependencies
This comment has been minimized.
This comment has been minimized.
Hooks produced the following warnings for commit e5d53fdsdl/2.24.1@#83a681210a34a1b0c85f3a9297422b3e |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Hooks produced the following warnings for commit c65671bsdl/2.28.2@#5e55dc09099262acc66c565516abd271sdl/2.26.5@#60c529f3cb1398fc44731576304895d8sdl/2.26.1@#0ba3bb768020ea27286481539edae869sdl/2.24.0@#3c7db4af2e2917a56ac82e6f00250dae |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Hooks produced the following warnings for commit 6de71cesdl/2.28.3@#8021c5aa40db727fed9c0f019904ea37sdl/2.28.2@#a5c8f6d670c21dd996cce9a7ef82e31esdl/2.26.5@#e2cacc9adaa5b76ccf1c916dddc7e225sdl/2.24.1@#98abd50ed484b544d6ce0acfc690f8a7 |
This was referenced Nov 7, 2023
Closed
This comment has been minimized.
This comment has been minimized.
Conan v1 pipeline ✔️All green in build 17 (
Conan v2 pipeline ✔️
All green in build 17 ( |
Hooks produced the following warnings for commit d3021absdl/2.28.5@#34469a5ba01fc912203cfbc90e059837sdl/2.26.5@#7de518e6c41a87e0e3b0f1fe22590a84sdl/2.24.1@#ca67605d96b16180a87c9aa4f202ca82sdl/2.28.3@#ce2b8aced9ab6d0e7c029fe0e4cc2c9fsdl/2.28.2@#62ccb40f667e013a9ad06d5e29f21bf3 |
jwillikers
approved these changes
Mar 22, 2024
valgur
reviewed
Mar 22, 2024
| # If using conan-provided iconv, search for the symbol "libiconv_open" | ||
| replace_check = "check_library_exists(iconv libiconv_open" | ||
| else: | ||
| # When no tusing conan-provided icon, don't check for iconv at all |
There was a problem hiding this comment.
Suggested change
| # When no tusing conan-provided icon, don't check for iconv at all | |
| # When not using conan-provided iconv, don't check for iconv at all |
valgur
reviewed
Mar 22, 2024
|
|
||
| def _patch_sources(self): | ||
| cmakelists = os.path.join(self.source_folder, "CMakeLists.txt") | ||
| if self.settings.os == "Macos": |
There was a problem hiding this comment.
Suggested change
| if self.settings.os == "Macos": | |
| if is_apple_os(self): |
Can be generalized to other Apple OS-s, perhaps.
valgur
reviewed
Mar 22, 2024
| def package_id(self): | ||
| if Version(self.version) < "2.0.22": | ||
| del self.info.options.sdl2main | ||
|
|
||
| def build_requirements(self): | ||
| if self.settings.os == "Macos" and cross_building(self): |
There was a problem hiding this comment.
Suggested change
| if self.settings.os == "Macos" and cross_building(self): | |
| if is_apple_os(self) and cross_building(self): |
valgur
approved these changes
Mar 22, 2024
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
<host_version>for wayland in build requirementsself.dependencies[foo].optionsinstead ofself.options[foo], or robust collection of cpp_info in dependencies with components)PKG_CONFIG_PATHworkaround sincerequired_conan_versionis greater than 1.55.0 now