-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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
[libwebp] Update to 1.3.0, misc changes #29165
Conversation
], | ||
"platform": "!osx" | ||
"platform": "!osx & !static" |
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.
why did you add all the !static
?
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.
Upstream. The vwebp
tools aren't available in static builds:
https://github.com/webmproject/libwebp/blob/b54d21a01d975c9a5681e8d3db6e0f55265ea5bb/CMakeLists.txt#L55-L65
Unless we generally disable WEBP_LINK_STATIC
which seems to have no positive effect in vcpkg context anyways.
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.
Hmm in that case I am less interested in what upstream says (because obviously they don't have a clue) but what the actual error is.
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.
Me too.
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.
Neither port freeglut nor port sdl1 provide their complete static link libraries for x64-linux. As usual, this isn't caught in CI because vcpkg doesn't build executables.
The lack of vwebp[_sdl] on static triplets isn't a regression, so I will probably not fix it at this point.
I should revert the manifest changes, so that other people can look into this with --allow-unsupported
. i.e. this a suitable test port to fix those ports. If someone cares about sdl1.
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.
... and CMake reordering libraries due to mix of targets and filepaths.
opencv:x64-windows: Fails to find webpmux mapnik:x64-windows: Could NOT find WebP (missing: WebP_LIBRARY) (found version "1.3.0") |
Upstream changed the output name of the libraries on windows. They added the -libwebp:x64-windows:/bin/webp.dll
-libwebp:x64-windows:/bin/webp.pdb
-libwebp:x64-windows:/bin/webpdecoder.dll
-libwebp:x64-windows:/bin/webpdecoder.pdb
-libwebp:x64-windows:/bin/webpdemux.dll
-libwebp:x64-windows:/bin/webpdemux.pdb
-libwebp:x64-windows:/bin/webpmux.dll
-libwebp:x64-windows:/bin/webpmux.pdb
-libwebp:x64-windows:/lib/webp.lib
-libwebp:x64-windows:/lib/webpdecoder.lib
-libwebp:x64-windows:/lib/webpdemux.lib
-libwebp:x64-windows:/lib/webpmux.lib
+libwebp:x64-windows:/bin/libsharpyuv.dll
+libwebp:x64-windows:/bin/libsharpyuv.pdb
+libwebp:x64-windows:/bin/libwebp.dll
+libwebp:x64-windows:/bin/libwebp.pdb
+libwebp:x64-windows:/bin/libwebpdecoder.dll
+libwebp:x64-windows:/bin/libwebpdecoder.pdb
+libwebp:x64-windows:/bin/libwebpdemux.dll
+libwebp:x64-windows:/bin/libwebpdemux.pdb
+libwebp:x64-windows:/bin/libwebpmux.dll
+libwebp:x64-windows:/bin/libwebpmux.pdb
+libwebp:x64-windows:/lib/libsharpyuv.lib
+libwebp:x64-windows:/lib/libwebp.lib
+libwebp:x64-windows:/lib/libwebpdecoder.lib
+libwebp:x64-windows:/lib/libwebpdemux.lib
+libwebp:x64-windows:/lib/libwebpmux.lib |
This reverts commit 42e0273.
# Conflicts: # ports/mapnik/vcpkg.json # versions/baseline.json # versions/m-/mapnik.json
1f143ef
Feature testing:
|
Sorry I'm fixing the patch now... |
It looks like the patch added to mapnik is no longer necessary so I'm just reverting those changes. |
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.
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 mapnik have changed but the version was not updated
version: 2023-01-17
old SHA: 6fc189206b9c2055b544278ede1ce5be2e0f48ff
new SHA: 7edf56f41dd09aba37d31f34e1952ea32f0a56b3
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
@dg0yt Please confirm that the merge I did looks OK to you :) |
Okay. |
Thanks! |
Misc changes:
core
, default andall
).These dependencies are used only by (some) tools, and they already existed for some features.
There is one caveat:
tiff[webp]
cannot be installed together withlibwebp[some tools]
.Not installed anyways. (Some tools are not installed even for release config...)
_
./vcpkg x-add-version --all
and committing the result.