[osgearth] update to 3.8.1 and add feature stb - #53239
[osgearth] update to 3.8.1 and add feature stb#53239Jack·Boos·Yu (JackBoosY) wants to merge 25 commits into
Conversation
|
looks like the new version requires lerc which is not in vcpkg. |
|
lerc is in vcpkg. |
|
Reproducing the build issue. |
No idea why this happened. |
|
Basically this should just update to 3.8.1, leave |
Same issue if new dependency is not added. |
|
Well, expanding the list of supported platforms which were deliberately marked as unsupported in the past is a development task, not a version bump task. |
I forgot to revert this changes... |
Billy O'Neal (BillyONeal)
left a comment
There was a problem hiding this comment.
Thanks for the version update!
Some notes from GPT 5.6 Sol:
- The exported
osgEarth::osgEarthImGuitarget publicly linksimgui::imgui(patch), but the installed package configuration does not create that target. Consequently, a consumer using onlyfind_package(osgEarth CONFIG REQUIRED)fails during generation.
That is, we need a missing find_dependency somewhere. That is present in 3.8.0 as well so not a must fix to take the update.
- osgEarth 3.8.1 now compiles its bundled
stb_image_resize2implementation throughImageUtils.cpp. Please devendor this implementation, updating thestbport if necessary, or select a non-stb scaler path so bundled third-party code is not built.
This was introduced in pelicanmapping/osgearth#2977 so it's a new vendored thing.
- The installed TinyXML headers contain a Zlib license and copyright notice (
tinyxml.h), but the port currently installs only osgEarth's root license (portfile.cmake).
Also an existing problem but it's trivial enough to fix that I think it should be.
Request-changes for the new vendored dependency and the license meadata only.
STB is already disabled by default in portfile
Sadly, osgearth modified tinyxml code so we cannot simply use vcpkg installed tinyxml: |
:( They try to put some things in namespaces but not everything. |
They also exported the classes: I think the only thing we can do is keep the embedded tinyxml in osgearth. |
|
My last comment was lost?
Sadly they also export the new class and use it in their code: I think we can only keep using the embedded tinyxml instead of using vcpkg installed tinyxml. |
|
Oh, looks good, I will try feature stb again. |
There's an argument that we should deindex over this but as long as it isn't actively creating problems I'm not going to push too hard to do that. GPT 5.6 Sol notes:
Would you consider JackBoosY#11 which fixes this part?
Should we set |
* [osgearth] fix bundled TinyXML licensing Remove the unused standalone tinyxml dependency while retaining osgEarth's modified bundled implementation. Install the Zlib notice directly from the upstream TinyXML header. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * [osgearth] disable bundled stb resize Retain osgEarth's established OSG/GLU scaling path instead of compiling the newly vendored stb_image_resize2 implementation. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Revert "[osgearth] disable bundled stb resize" Revert commit 3bc7a1d so the resize approach can be discussed with the contributor. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Hope it works🙏 |
./vcpkg x-add-version --alland committing the result.Fixes #53169