23 Commits

Author SHA1 Message Date
Vitalii Koshura
c0a4611383
[gdk-pixbuf] Enable other loaders, which are weakly maintained (ani, bmp, icns, ico, pnm, qtif, tga, xbm, xpm) (#40086)
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
2024-07-26 13:55:31 -07:00
Alonso Schaich
f5cab8282d
[gdk-pixbuf] Update to 2.42.12 (#38789)
Fixes #38788 

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
2024-05-17 11:57:48 -07:00
Kai Pastor
3d5961e8c0
[gdk-pixbuf] jpeg and tiff support windows (#38369)
Amends https://github.com/microsoft/vcpkg/pull/38033.
Fixes #38360.
2024-05-01 19:46:26 -07:00
Kai Pastor
7e840a5658
[gdk-pixbuf] Fix features and deps (#38272)
Amends #38033.
Fixes #38270.
2024-04-22 10:25:38 -04:00
JonLiu1993
dda6ab70d6
[gdk-pixbuf] Convert option to feature (#38033)
Fixes #37974
png, jpeg and tiff support are [optional in
gdk-pixbuf](0edaedc560/meson_options.txt (L5)),
however [vcpkg has them
hard-wired](c5da4bafbd/ports/gdk-pixbuf/portfile.cmake (L37)).

Turn `png`,` jpeg` and `tiff` into features, and enable those 3 by
default to preserve compatibility.
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [ ] ~~SHA512s are updated for each updated download.~~
- [ ] ~~The "supports" clause reflects platforms that may be fixed by
this new version.~~
- [ ] ~~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~~
- [ ] ~~Any patches that are no longer applied are deleted from the
port's directory.~~
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

---------

Co-authored-by: Jon <v-zhli17@microsoft.com>
2024-04-18 19:41:05 -04:00
Alexander Neumann
a664e41ee5
[vcpkg-tool-meson] Update meson to 1.3.2 (#28084) 2024-03-11 14:09:15 -07:00
Lily Wang
500700a90c
[atk/gdk-pixbuf/gtk/gtk3/harfbuzz/pango] Fix dependency gobject-instrospection of feature instrospection (#33792)
* [atk/gdk-pixbuf/gtk/gtk3/harfbuzz/pango] Fix dependency gobject-instrospection of feature instrospection

* update version
2023-09-18 09:52:14 -07:00
Chuck Walbourn
5d2a0a9814
Update xbox supports expressions for failing ports with copyleft licenses (#31770)
* Xbox triplets should not support ports with only copyleft licenses

* Reverted ports that build with xbox currently

* Fix conflict and rebase

* Update baseline

* Update baseline
2023-06-15 14:49:00 -07:00
Alonso Schaich
d50425b118
[gdk-pixbuf] update to 2.42.10 (#30849)
* update to 2.42.10 (microsoft#30848)

* regenerate version registries (microsoft#30848)
2023-04-14 23:37:06 -07:00
Max Khon
ae826fceaa
Introspection support (#28662) 2023-01-17 11:44:20 -08:00
Kai Pastor
b93bc1b81e
[tiff] Fix zstd plus minor changes (#28530)
* Use official zstd config

* Require packages for features

* Test zstd in CI

* Enable libtiffxx on arm

* Update versions

* Assume ZSTD_decompressStream

* Don't put targets into TIFF_LIBRARIES

* [qt5-imageformats] Use libtiff-4.pc

* [zstd] Revise thread lib export

* Mark link libs with LINK_ONLY

* Revert "[zstd] Revise thread lib export"

This reverts commit a99e6378a67adc68e9e43e6e193206a5ddcba60e.

* [qt5-imageformats] Get all tiff lflags

* [gdk-pixbuf] Use libtiff-4 pc file for msvc

* [qtimageformat] Workaround for QTBUG-95052
2022-12-31 01:30:53 -08:00
Billy O'Neal
e79c0d2b5d
Add vcpkg_minimum_required before using VERSION. (#27598)
* When @BillyONeal started being the on-call vcpkg maintainer on 2022-10-17, he started applying use of the "embedded VERSION" feature https://github.com/microsoft/vcpkg-tool/pull/717 to PRs on merge.

@dg0yt points out that this use should be accompanied by a call to vcpkg_minimum_required, in https://github.com/microsoft/vcpkg/pull/27594/files#r1010641672

This is an audit of everything merged in that time and whether it needs to gain that.

https://github.com/microsoft/vcpkg/pull/27561 No VERSION
https://github.com/microsoft/vcpkg/pull/27525 No VERSION
https://github.com/microsoft/vcpkg/pull/27554 Already has vcpkg_minimum_required
https://github.com/microsoft/vcpkg/pull/27536 No VERSION
https://github.com/microsoft/vcpkg/pull/27562 No VERSION
https://github.com/microsoft/vcpkg/pull/24914 Fixed here
https://github.com/microsoft/vcpkg/pull/27547 No VERSION
https://github.com/microsoft/vcpkg/pull/27502 No VERSION
https://github.com/microsoft/vcpkg/pull/27497 No VERSION
https://github.com/microsoft/vcpkg/pull/27317 No VERSION
https://github.com/microsoft/vcpkg/pull/27288 No VERSION
https://github.com/microsoft/vcpkg/pull/27509 No VERSION
https://github.com/microsoft/vcpkg/pull/27504 No VERSION
https://github.com/microsoft/vcpkg/pull/27514 No VERSION
https://github.com/microsoft/vcpkg/pull/27501 No VERSION
https://github.com/microsoft/vcpkg/pull/27495 No VERSION
https://github.com/microsoft/vcpkg/pull/27488 No VERSION
https://github.com/microsoft/vcpkg/pull/27499 No VERSION
https://github.com/microsoft/vcpkg/pull/27378 No VERSION
https://github.com/microsoft/vcpkg/pull/27376 Fixed here
https://github.com/microsoft/vcpkg/pull/27373 No VERSION
https://github.com/microsoft/vcpkg/pull/27045 No VERSION
https://github.com/microsoft/vcpkg/pull/27521 No VERSION
https://github.com/microsoft/vcpkg/pull/27453 No VERSION
https://github.com/microsoft/vcpkg/pull/27481 No VERSION
https://github.com/microsoft/vcpkg/pull/27511 No VERSION
https://github.com/microsoft/vcpkg/pull/27490 No VERSION
https://github.com/microsoft/vcpkg/pull/27510 No VERSION
https://github.com/microsoft/vcpkg/pull/27496 No VERSION
https://github.com/microsoft/vcpkg/pull/27503 No VERSION
https://github.com/microsoft/vcpkg/pull/27485 No VERSION
https://github.com/microsoft/vcpkg/pull/27484 No VERSION
https://github.com/microsoft/vcpkg/pull/27483 No VERSION
https://github.com/microsoft/vcpkg/pull/27459 No VERSION
https://github.com/microsoft/vcpkg/pull/27369 No VERSION
https://github.com/microsoft/vcpkg/pull/27489 No VERSION
https://github.com/microsoft/vcpkg/pull/26594 No VERSION
https://github.com/microsoft/vcpkg/pull/27465 No VERSION
https://github.com/microsoft/vcpkg/pull/27456 No VERSION
https://github.com/microsoft/vcpkg/pull/27425 No VERSION
https://github.com/microsoft/vcpkg/pull/27464 Fixed here
https://github.com/microsoft/vcpkg/pull/27406 No VERSION
https://github.com/microsoft/vcpkg/pull/27398 No VERSION
https://github.com/microsoft/vcpkg/pull/27240 No VERSION
https://github.com/microsoft/vcpkg/pull/27450 No VERSION
https://github.com/microsoft/vcpkg/pull/27463 No VERSION
https://github.com/microsoft/vcpkg/pull/27462 No VERSION
https://github.com/microsoft/vcpkg/pull/27448 No VERSION
https://github.com/microsoft/vcpkg/pull/27440 No VERSION
https://github.com/microsoft/vcpkg/pull/27435 No VERSION
https://github.com/microsoft/vcpkg/pull/27424 No VERSION
https://github.com/microsoft/vcpkg/pull/27414 No VERSION
https://github.com/microsoft/vcpkg/pull/27412 No VERSION
https://github.com/microsoft/vcpkg/pull/27380 No VERSION
https://github.com/microsoft/vcpkg/pull/27343 No VERSION
https://github.com/microsoft/vcpkg/pull/27342 No VERSION
https://github.com/microsoft/vcpkg/pull/27367 No VERSION
https://github.com/microsoft/vcpkg/pull/27226 No VERSION
https://github.com/microsoft/vcpkg/pull/27320 No VERSION
https://github.com/microsoft/vcpkg/pull/26923 No VERSION
https://github.com/microsoft/vcpkg/pull/27284 No VERSION
https://github.com/microsoft/vcpkg/pull/27433 No VERSION
https://github.com/microsoft/vcpkg/pull/27314 VERSION got *removed*
https://github.com/microsoft/vcpkg/pull/27335 No VERSION
https://github.com/microsoft/vcpkg/pull/27370 No VERSION
https://github.com/microsoft/vcpkg/pull/27324 No VERSION
https://github.com/microsoft/vcpkg/pull/27391 No VERSION
https://github.com/microsoft/vcpkg/pull/27388 No VERSION
https://github.com/microsoft/vcpkg/pull/27396 No VERSION
https://github.com/microsoft/vcpkg/pull/27404 No VERSION
https://github.com/microsoft/vcpkg/pull/27413 No VERSION
https://github.com/microsoft/vcpkg/pull/27417 No VERSION
https://github.com/microsoft/vcpkg/pull/27427 No VERSION
https://github.com/microsoft/vcpkg/pull/27428 No VERSION
https://github.com/microsoft/vcpkg/pull/27368 No VERSION
https://github.com/microsoft/vcpkg/pull/27307 No VERSION
https://github.com/microsoft/vcpkg/pull/27415 Fixed here.
https://github.com/microsoft/vcpkg/pull/27371 Fixed here.
https://github.com/microsoft/vcpkg/pull/27323 No VERSION
https://github.com/microsoft/vcpkg/pull/27352 No VERSION
https://github.com/microsoft/vcpkg/pull/27347 No VERSION
https://github.com/microsoft/vcpkg/pull/27366 No VERSION
https://github.com/microsoft/vcpkg/pull/27361 No VERSION
https://github.com/microsoft/vcpkg/pull/27359 No VERSION
https://github.com/microsoft/vcpkg/pull/27358 No VERSION
https://github.com/microsoft/vcpkg/pull/27355 No VERSION
https://github.com/microsoft/vcpkg/pull/27331 No VERSION
https://github.com/microsoft/vcpkg/pull/24615 No VERSION
https://github.com/microsoft/vcpkg/pull/27325 No VERSION
https://github.com/microsoft/vcpkg/pull/24861 No VERSION
https://github.com/microsoft/vcpkg/pull/27354 No VERSION
https://github.com/microsoft/vcpkg/pull/27346 No VERSION
https://github.com/microsoft/vcpkg/pull/27345 No VERSION
https://github.com/microsoft/vcpkg/pull/27218 No VERSION
https://github.com/microsoft/vcpkg/pull/27329 No VERSION
https://github.com/microsoft/vcpkg/pull/27326 No VERSION
https://github.com/microsoft/vcpkg/pull/27321 No VERSION
https://github.com/microsoft/vcpkg/pull/27312 No VERSION
https://github.com/microsoft/vcpkg/pull/27297 No VERSION
https://github.com/microsoft/vcpkg/pull/27336 No VERSION
https://github.com/microsoft/vcpkg/pull/27225 No VERSION
https://github.com/microsoft/vcpkg/pull/27339 No VERSION
https://github.com/microsoft/vcpkg/pull/27302 No VERSION
https://github.com/microsoft/vcpkg/pull/27295 No VERSION
https://github.com/microsoft/vcpkg/pull/27233 No VERSION
https://github.com/microsoft/vcpkg/pull/27313 No VERSION
https://github.com/microsoft/vcpkg/pull/27237 No VERSION
https://github.com/microsoft/vcpkg/pull/27250 No VERSION
https://github.com/microsoft/vcpkg/pull/27263 No VERSION
https://github.com/microsoft/vcpkg/pull/27266 No VERSION
https://github.com/microsoft/vcpkg/pull/27272 No VERSION
https://github.com/microsoft/vcpkg/pull/27287 No VERSION
https://github.com/microsoft/vcpkg/pull/27282 No VERSION
https://github.com/microsoft/vcpkg/pull/27294 No VERSION
https://github.com/microsoft/vcpkg/pull/27228 No VERSION
https://github.com/microsoft/vcpkg/pull/27163 No VERSION
https://github.com/microsoft/vcpkg/pull/26817 No VERSION
https://github.com/microsoft/vcpkg/pull/27286 No VERSION
https://github.com/microsoft/vcpkg/pull/27274 No VERSION
https://github.com/microsoft/vcpkg/pull/27276 No VERSION
https://github.com/microsoft/vcpkg/pull/27232 No VERSION
https://github.com/microsoft/vcpkg/pull/27221 No VERSION
https://github.com/microsoft/vcpkg/pull/27215 No VERSION
https://github.com/microsoft/vcpkg/pull/27166 No VERSION
https://github.com/microsoft/vcpkg/pull/27239 No VERSION
https://github.com/microsoft/vcpkg/pull/27246 No VERSION
https://github.com/microsoft/vcpkg/pull/27268 No VERSION
https://github.com/microsoft/vcpkg/pull/27259 No VERSION
https://github.com/microsoft/vcpkg/pull/27238 No VERSION
https://github.com/microsoft/vcpkg/pull/27224 No VERSION
https://github.com/microsoft/vcpkg/pull/27203 No VERSION
https://github.com/microsoft/vcpkg/pull/27124 No VERSION

* Also add libcanberra
2022-11-08 14:49:28 -08:00
Kai Pastor
94bc827441
[vcpkg baseline][gdk-pixbuf] Fix build issues, license, cleanup (#27371)
* Minor changes

* Shortcut loaders.cache generation

With -Dbuiltin-loaders=all, the cache file contains nothing but comment lines.
However, the generation is flaky on windows in vcpkg CI.

* Revise tool fixup (fixes mingw cross builds)

* Update versions
2022-10-24 12:09:25 -07:00
Hesham Essam
24b59b94ab
[gdk-pixbuf]: fix pkgconfig tools path (#26744)
* [gdk-pixbuf]: fix pkgconfig tools path

* gdk_pixbuf binary dir was actually correct

* Update version database
2022-09-13 16:49:19 -07:00
Alonso Schaich
87ed56ca34
[gdk-pixbuf] update to 2.42.9 (#26534)
* [gdk-pixbuf] update to 2.42.9 (microsoft#26533)

* [gdk-pixbuf] don't build the test suite (microsoft#26533)

We're not running nor installing the test suite, so there's no
point in building it, either

* [gdk-pixbuf] Blacklist x64-windows-static (microsoft#26533)

Fails to build over here. In fact, 2.42.8 also fails over here,
so it's probably not a regression.

* [gdk-pixbuf] Regenerate version registries (microsoft#26533)
2022-08-31 13:36:38 -07:00
Jamlys Lee
c05e96fe7e
[gdk-pixbuf] fix bug for cross build (#25689)
* Fix build failure for cross-compiling

* update port version database

* Fix build failure for windows.

* update port version

* update port version database

* Adjust logic to remove gdk-pixbuf-thumbnailer.

* update port version database

* [gtk] Fix build failure for windows

* update port version database

* ci's down, just force it to rerun.

* Revert "ci's down, just force it to rerun."

This reverts commit 6d1040207f93869598019aef7cba4e49a1168efd.

* Update gdk-pixbuf.json

* overwrite port version

* update port version database

* Update gdk-pixbuf.json

Co-authored-by: Jamlys Lee <jamlys_lee@163.com>
Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
2022-07-14 14:27:57 -07:00
Billy O'Neal
309f985971
[atk,gdk-pixbuf,glib] Use vcpkg_from_gitlab. (#24541)
* [atk,gdk-pixbuf,glib] Use vcpkg_from_gitlab.

* Add quotes and licenses.
2022-05-06 11:20:25 -07:00
talregev
370272f169
Add ipv6 source code source (#24516) 2022-05-04 18:37:00 -07:00
Alonso Schaich
d1904c8625
[gdk-pixbuf] update to 2.42.8 (#24427)
* [gdk-pixbuf] Update to 2.42.8 (microsoft#24426)

* [gdk-pixbuf] Regenerate patch (microsoft#24426)

* [gdk-pixbuf] Use enabled/disabled for features (microsoft#24426)

* [gdk-pixbuf] Add glib-compile-resources to the used binary list
(microsoft#24426)

* [gdk-pixbuf] Remove obsolete patch (microsoft#24426)

* [gdk-pixbuf] regenerate version registries (microsoft#24426)
2022-04-28 15:53:44 -07:00
Alexander Neumann
163065a352
Update meson to 0.60.2 (#21542)
* update meson to 0.60.1

* add port vcpkg-tool-meson for consistency deprecate usage of tool-meson

* [skip actions] make every port using meson depend on vcpkg-tool-meson
(except pkgconf for now.)

* fix subtle bugs in vcpkg_find_acquire_program
make the port install meson if the system does not provide it.

* make pkgconf depend on meson

* restore old vcpkg_find_acquire_program behavior for versioning

* Update ports/gstreamer/vcpkg.json

remove duplicated dependency

* remove invalid option in glib

* [skip actions] fix ci failures?

* remove invalid option in gstreamer

* try without cmake

* get more logs from meson configure.

* update glib to 2.70.1

* fix typo

* fix pc file of flac

* update meson to 0.60.2

* try the patch from the other pr.

* patch meson .....

* version stuff

* fix port version

* fix gstreamer version

* remove version

* format-manifest

* version stuff

* format manifest again

* revert version stuff

* remove outdated gtk options

* version stuff

* pango version stuff

* correct baseline lost in merge

* Fix fontconfig version db

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-12-02 15:48:34 -08:00
Phoebe
e01bb32836
[vcpkg baseline][gdk-pixbuf] Fix build error on windows (#17528)
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
2021-04-28 12:06:01 -07:00
Alexander Neumann
546813ae7b
[glib up to gtk] update and make it work with meson (#13100)
* update glib to meson

* update ci baseline

* update glib to 2.66.3
remove cmakelists

* fix some minor meson issue but meson is still a mess

* add_bin_to_path to vcpkg_install_meson

* regen docs

* try fixing/touching all glib dependent ports

* fix libsigcpp-3 version

* fix glibmm

* fix gmime

* fix libcroco

* update libnice

* fix atk build

* update harfbuzz

* fix few builds

* update libxmlpp

* fix gdk-pixbuf

* fix gts

* gts add patch

* remove old libsigcpp

* add missing comma

* fix supports logic

* fix name mismatch

* restore original ci baseline.

* fix a lot of small details.
increment controls.

* fix harfbuzz & glib

* bump port version

* update port_versions

* fix version field

* update versions

* fix glib in harfbuzz

* update port versions

* silly uppercase type

* update port-versions

* fix cairo build

* update version

* fix atk

* update atk port-verisons

* fix gts public includes

* update versions

* fix cairomm

* fix pango

* fix ignition

* update versions.

* fix gtk

* fix librsvg

* update versions

* fix atk linux

* fix libgpod

* update versions

* fix lcm

* fix librsvg

* update pango and pangomm

* update pango to meson

* more updates

* update pixman

* fix cairo

* fix cairo

* some fixes

* reorder meson a bit

* add none.txt for meson

* fix x86_x64 to x86 "cross" builds

* add tiff pkgconfig

* update gdk-pixbuf

* fix tiff and jpeg

* add graphene

* fix gdk-pixbuf

* add sassc

* update gtk

* fix cairo complete build

* add harfbuzz inlcude in pango since meson does not add it into pkgconfig.

* fix gtk build. Remaining issue fix install script.

* fix gtk build

* fix io2d

* add supports field

* fix cartographer?

* fix librsvg build

* fix gtk build

* fix cartographer

* fix sassc on linux

* fix tiff and libjpeg pc files

* fix pixman x86

* _isnanf is undefined on arm-

* merge fix for make on arm64

* fix gdk-pixbuf on arm64-windows

* pixman remove test/demos.
should fix it on osx.

* [vcpkg_install_meson] add bin to path to run code generators

* [vcpkg_configure_meson]
deactivate native compiler in cross builds
make x86 on x86_x64 a native instead of a cross build
(as long as we are not building for UWP)

* pixman reenable UWP support.

* pixman reenable arm support

* add pixman:arm-uwp=fail to baseline

* update gtkmm

* remove double whitespaces

* gtk baseline
gtk dependency on cairo x11
remove double spaces in flags

* fix linux build

* native none again

* cairo fix cairo-script.pc

* comment out patch since the cairo changes should have fixed it.

* disable wayland backend in GTK since CI is missing system packages

* silly typo in cairo pc file correction
install lzo pc on windows

* remove double spaces in _FLAGS
remove unnecessary comments

* actually disabling wayland backend

* fix glib codegen issue having the wrong path

* try to fix paths in glib codegen

* integrate changes form #12860

* add the uwp patch back in

* deactivate extra harfbuzz shapers.

* vcpkg x-add-version --all --overwrite-version

* remove patches in tesseract.

* fix version

* rerun add-version

* add libgpod:x64-linux=fail to baseline due to missing system tools/libraries

* change regex to take double - into account.

* run x-add-version

* run format-manifest

* add missing removal of multiple spaces back into the regex

* remove ws diff change

* fix gtkmm the upstream way

* remove ws to reduce diff

* make glib build on osx

* format manifest

* run x-add-version

* add pthread dependency

* update baseline due to glib compiling on osx now.

* add meson as a dep to glib

* - add glib host dependencies
- switch to manifest of touched ports

* switch to manifest.

* [libxml2] add gnuinstalldirs

* [libxml2] add missing include of GNUInstallDirs

* add version info

* add include dir to pc files ....

* update version

* add UWP as crosscompiling target

* Apply suggestions from code review

* trying to fix cairo pthread detection on osx.

* fix libmicrohttpd by adding the required system frameworks on osx

* fix poppler by not removing the CXX standard

* fix missing coretext header from harfbuzz in pano

* fix formating issues

* fix librsvg on osx

* revert version changes

* bump version

* version stuff.

* fix graphene version stuff

* fix version stuff

* removing ports from ci baseline to cause me pain

* move cairomm:x64-linux=fail
to gtkmm:x64-linx=fail
remove pangomm:x64-osx=fail

* fix typo

* revert ws changes to vcpkg_install_meson

* update port version after merge

* version stuff

* fix fluidsynth by adding vcpkg_check_features

* move cairo to ci baseline on osx

* version stuff

* fluidsynth corrections

* more version stuff

* apply code review changes

* clean version stuff.

* update version stuff

* code review cleanup

* version stuff

* formating

* update version stuff again

* remove gdi again

* version stuff

* version stuff

* version baseline

* Apply strega-nil suggestions from code review

* run x-add-version

* reset versions to upstream/master

* v8 CONTROL -> json

* reset fluidsynth to upstream/master

* first batch of version-string -> version conversion

* second and last batch of version-string -> version conversions

* update version stuff

* disable gdi feature in harfbuzz (missing user32 linkage in qt5-base)

* version stuff

* Apply suggestions from code review

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* more CR stuff

* update versions

* back out provision changes so that pr can be merged.

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
2021-04-26 10:28:21 -07:00
nicole mazzuca
68a74950d0
[vcpkg] Rename port_versions to versions (#15784) 2021-01-21 09:53:22 -08:00