[libwebp] Update to 1.3.0, misc changes #29165

dg0yt · 2023-01-25T08:24:59Z

Misc changes:

Add explicit usage file. (With a fifth exported target, the heuristics started to omit one.)
Minimize patches.
Fix tool and feature configuration (tested locally: linux, osx, mingw with core, default and all).
Consistently depend on libjpeg-turbo, libpng, tiff for all features that could pick up these modules.
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 with libwebp[some tools].
Disable debug build of the tools.
Not installed anyways. (Some tools are not installed even for release config...)

_

Changes comply with the maintainer guide
SHA512s are updated for each updated download
The "supports" clause reflects platforms that may be fixed by this new version
Any fixed CI baseline entries are removed from that file.
Any patches that are no longer applied are deleted from the port's directory.
The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
Only one version is added to each modified port's versions file.

Neumann-A · 2023-01-25T08:37:53Z

ports/libwebp/vcpkg.json

          ],
-          "platform": "!osx"
+          "platform": "!osx & !static"


why did you add all the !static?

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.

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.

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.

... and CMake reordering libraries due to mix of targets and filepaths.

dg0yt · 2023-01-25T11:30:11Z

opencv:x64-windows: Fails to find webpmux

mapnik:x64-windows: Could NOT find WebP (missing: WebP_LIBRARY) (found version "1.3.0")
in vendored cmake/FindWebP.cmake

dg0yt · 2023-01-25T20:51:13Z

Upstream changed the output name of the libraries on windows. They added the lib prefix:

-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

ports/qt5-imageformats/portfile.cmake

This reverts commit 42e0273.

# Conflicts: # ports/mapnik/vcpkg.json # versions/baseline.json # versions/m-/mapnik.json

BillyONeal · 2023-01-27T03:53:28Z

Feature testing:

libwebp[anim,cwebp,dwebp,extras,gif2webp,img2webp,info,libwebpmux,mux,nearlossless,simd,all,swap16bitcsp,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,gif2webp,img2webp,info,libwebpmux,mux,nearlossless,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,cwebp,dwebp,extras,gif2webp,img2webp,info,libwebpmux,mux,nearlossless,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,dwebp,extras,gif2webp,img2webp,info,libwebpmux,mux,nearlossless,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,extras,gif2webp,img2webp,info,libwebpmux,mux,nearlossless,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,gif2webp,img2webp,info,libwebpmux,mux,nearlossless,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,img2webp,info,libwebpmux,mux,nearlossless,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,gif2webp,info,libwebpmux,mux,nearlossless,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,gif2webp,img2webp,libwebpmux,mux,nearlossless,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,gif2webp,img2webp,info,mux,nearlossless,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,gif2webp,img2webp,info,libwebpmux,nearlossless,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,gif2webp,img2webp,info,libwebpmux,mux,simd,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,gif2webp,img2webp,info,libwebpmux,mux,nearlossless,unicode,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,gif2webp,img2webp,info,libwebpmux,mux,nearlossless,simd,vwebp,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,gif2webp,img2webp,info,libwebpmux,mux,nearlossless,simd,unicode,vwebp-sdl]:x64-windows pass
libwebp[core,anim,cwebp,dwebp,extras,gif2webp,img2webp,info,libwebpmux,mux,nearlossless,simd,unicode,vwebp]:x64-windows pass

BillyONeal · 2023-01-27T04:08:21Z

Sorry I'm fixing the patch now...

BillyONeal · 2023-01-27T04:16:29Z

It looks like the patch added to mapnik is no longer necessary so I'm just reverting those changes.

github-actions

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***

BillyONeal · 2023-01-27T04:19:49Z

@dg0yt Please confirm that the merge I did looks OK to you :)

dg0yt · 2023-01-27T06:06:46Z

Okay.
Mapnik switch from a vendored CMake Find module to pkg-config (via CMake's FindPkgConfig.cmake). This works as good or as bad as anything else.

BillyONeal · 2023-01-27T06:51:01Z

Thanks!

Neumann-A reviewed Jan 25, 2023

View reviewed changes

github-actions bot previously approved these changes Jan 25, 2023

View reviewed changes

dg0yt added 7 commits January 26, 2023 09:18

[libwebp] Update to 1.3.0

c4d24cb

Fix [core] on x64-osx

a4600a3

Fix features and dependencies

c14ddac

Cleanup tool installation

885bf8f

Usage

5f7311a

Lift restriction for vwebp tool

42e0273

[mapnik] Fix libwebp

df70120

dg0yt dismissed GitHub Actions’s stale review via df70120 January 26, 2023 08:19

dg0yt force-pushed the libwebp branch from 2c1e62e to df70120 Compare January 26, 2023 08:19

github-actions bot previously approved these changes Jan 26, 2023

View reviewed changes

[qt5-imageformats] Use libwebp pc files

e12a028

dg0yt dismissed GitHub Actions’s stale review via e12a028 January 26, 2023 10:11

github-actions bot previously approved these changes Jan 26, 2023

View reviewed changes

Neumann-A reviewed Jan 26, 2023

View reviewed changes

ports/qt5-imageformats/portfile.cmake Show resolved Hide resolved

Neumann-A reviewed Jan 26, 2023

View reviewed changes

ports/qt5-imageformats/portfile.cmake Show resolved Hide resolved

dg0yt added 2 commits January 26, 2023 16:32

Revert "Lift restriction for vwebp tool"

b8012b5

This reverts commit 42e0273.

[gdal] Use upstream WebP config

78bbfee

dg0yt dismissed GitHub Actions’s stale review via 78bbfee January 26, 2023 15:59

github-actions bot previously approved these changes Jan 26, 2023

View reviewed changes

BillyONeal added info:reviewed Pull Request changes follow basic guidelines requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function labels Jan 27, 2023

BillyONeal previously approved these changes Jan 27, 2023

View reviewed changes

Merge remote-tracking branch 'origin/master' into HEAD

1f143ef

# Conflicts: # ports/mapnik/vcpkg.json # versions/baseline.json # versions/m-/mapnik.json

BillyONeal dismissed stale reviews from GitHub Actions and themself via 1f143ef January 27, 2023 03:41

github-actions bot previously approved these changes Jan 27, 2023

View reviewed changes

BillyONeal removed the requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function label Jan 27, 2023

BillyONeal added 2 commits January 26, 2023 20:17

Merge remote-tracking branch 'origin/master' into HEAD

4e66512

Revert no longer necessary changes to mapnik.

f890638

BillyONeal dismissed GitHub Actions’s stale review via f890638 January 27, 2023 04:18

github-actions bot requested changes Jan 27, 2023

View reviewed changes

Remove unnecessary patch that git checkout didn't remove.

109aa1d

BillyONeal approved these changes Jan 27, 2023

View reviewed changes

github-actions bot approved these changes Jan 27, 2023

View reviewed changes

BillyONeal added requires:author-response category:port-update The issue is with a library, which is requesting update new revision labels Jan 27, 2023

BillyONeal removed the requires:author-response label Jan 27, 2023

BillyONeal merged commit 91dd61b into microsoft:master Jan 27, 2023

dg0yt deleted the libwebp branch January 27, 2023 19:36

LilyWangLL mentioned this pull request Feb 7, 2023

[sdl2-image] Bump to 2.6.3 #29485

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[libwebp] Update to 1.3.0, misc changes #29165

[libwebp] Update to 1.3.0, misc changes #29165

dg0yt commented Jan 25, 2023

Neumann-A Jan 25, 2023

dg0yt Jan 25, 2023

Neumann-A Jan 25, 2023

dg0yt Jan 25, 2023

dg0yt Jan 26, 2023

dg0yt Jan 26, 2023

dg0yt commented Jan 25, 2023

dg0yt commented Jan 25, 2023 •

edited

Loading

BillyONeal commented Jan 27, 2023

BillyONeal commented Jan 27, 2023

BillyONeal commented Jan 27, 2023

github-actions bot left a comment

BillyONeal commented Jan 27, 2023

dg0yt commented Jan 27, 2023

BillyONeal commented Jan 27, 2023

[libwebp] Update to 1.3.0, misc changes #29165

[libwebp] Update to 1.3.0, misc changes #29165

Conversation

dg0yt commented Jan 25, 2023

Neumann-A Jan 25, 2023

Choose a reason for hiding this comment

dg0yt Jan 25, 2023

Choose a reason for hiding this comment

Neumann-A Jan 25, 2023

Choose a reason for hiding this comment

dg0yt Jan 25, 2023

Choose a reason for hiding this comment

dg0yt Jan 26, 2023

Choose a reason for hiding this comment

dg0yt Jan 26, 2023

Choose a reason for hiding this comment

dg0yt commented Jan 25, 2023

dg0yt commented Jan 25, 2023 • edited Loading

BillyONeal commented Jan 27, 2023

BillyONeal commented Jan 27, 2023

BillyONeal commented Jan 27, 2023

github-actions bot left a comment

Choose a reason for hiding this comment

BillyONeal commented Jan 27, 2023

dg0yt commented Jan 27, 2023

BillyONeal commented Jan 27, 2023

dg0yt commented Jan 25, 2023 •

edited

Loading