Commit Graph

17 Commits

Author SHA1 Message Date
Kai Pastor
fde6eac0a7
[vcpkg-tool-meson] Update to 1.5.1 (#40138) 2024-07-29 23:03:10 -07:00
Alexander Neumann
1b72637922
[scripts] Fix wasm builds (#39106) 2024-06-28 17:28:34 -07:00
gerard-ryan-immersaview
6db51d86a9
[vcpkg_replace_string] warn unchanged by call (#34719)
If a call to `vcpkg_replace_string` makes no changes i.e doesn't
effectively replace a string, A warning is logged.

This should also help identify ports that no longer need these calls to
fix things in `.pc` files etc.
2024-06-19 14:07:05 -07:00
Kai Pastor
47633daa65
[vcpkg-scripts] Catch use of ambiguous cmake vars (#34546)
Avoid wrong use of popular but ambiguous variables (`WIN32` etc.) in
scripts and portfiles by detection in CI.

Sometimes the variables are used wrongly, and sometimes this isn't
caught in PR review. This PR tries to catch those variables (when in the
active code path in script mode). [This can happen to every
contributor](https://github.com/microsoft/vcpkg/pull/34356#discussion_r1360074122),
even if he/she knows the rules ... vcpkg is raising the bar higher than
usual, having to deal with targets and hosts even in script mode.

(`b2-options.cmake` (boost fragment) shows where we get if we don't pay
attention: the same code being used in script mode (`WIN32` meaning
host) and in project mode (`WIN32` meaning target).)

The new check doesn't break any user builds because it relies on command
line options. However it changes the ABI hashes.
2024-06-14 11:40:01 -07:00
Alexander Neumann
02745e0f47
[vcpkg-tool-meson] Refactor cmd line args generation (#38901)
introduce `vcpkg_generate_meson_cmd_args` to generate the command line
args vcpkg calls meson with. This needed to be factored out since it
allows calling the meson-py backend of setuptools with the same
arguments as calling meson manually within vcpkg.

additionally:
- fixed `CMAKE_BUILD_TYPE` (var `buildconfig` does not exist)
- add `ADDITIONAL_PROPERTIES` option
- removed a lot of stuff being added to PATH unnecessarily 
- added option `--pkgconfig.relocatable` (probably not necessary but we
want this any way.)
- added option `--pkg-config-path` with correct paths (allows removing
the env variables for it)
2024-06-13 20:21:59 -07:00
Kai Pastor
bce0dd5af2
[vcpkg-tool-meson] Fix downstream --only-downloads (#39202) 2024-06-11 14:07:15 -07:00
Kai Pastor
b4b8719ccf
[vcpkg-tool-meson] Fix warnings, cmake, llvm 18 (#38796)
Cherry-picked and extended from
https://github.com/microsoft/vcpkg/pull/38658.
And a minor refactoring for easier management of patches.
llvm 18 changes for https://github.com/microsoft/vcpkg/pull/37599,
squashed from
https://github.com/microsoft/vcpkg/pull/37599#issuecomment-2112721881.
2024-05-22 19:21:52 -07:00
Alexander Neumann
30822b6c4c
[vcpkg-tool-meson] Reorder code to allow download mode (#37768) 2024-03-28 12:52:56 -07:00
Billy O'Neal
936588e231
Fix vcpkg-tool-meson clobbering the tools directory. (#37585) 2024-03-21 13:19:13 -07:00
Alexander Neumann
a664e41ee5
[vcpkg-tool-meson] Update meson to 1.3.2 (#28084) 2024-03-11 14:09:15 -07:00
Kai Pastor
70fd6a9409
[vcpkg-tool-meson] Fix installation (#35957) 2024-01-03 17:37:29 -08:00
Alonso Schaich
ff68673745
[vcpkg-tool-meson] fix pkgconfig data file installation on FreeBSD (#35003)
* [fontconfig] fix pkgconfig file installation (microsoft/vcpkg#35002)

move pkgconfig script into the path indicated by the diagnositic emitted by
vcpkg (see comment 1 of microsoft/vcpkg#35002).

* [fontconfig] force installation of pc files (microsoft/vcpkg#35002)

Undo the last commit and patch meson to force the pc file installation paths
demanded by `vcpkg_fixup_pkgconfig`

* [fontconfig] bump portrevision (microsoft/vcpkg#35002)

* [fontconfig] regenerate versions (microsoft/vcpkg#35002)

* Revert "[fontconfig] regenerate versions (microsoft/vcpkg#35002)"

This reverts commit 8daf0e15a67c376779631442ce926236ba2ed2e4.

* Revert "[fontconfig] bump portrevision (microsoft/vcpkg#35002)"

This reverts commit a9727bc32325238565428e3497ae564d2d255b86.

* Revert "[fontconfig] force installation of pc files (microsoft/vcpkg#35002)"

This reverts commit c0c6e017c7ab255e5532428e68f9d7c6e1ae8aad.

* Revert "[fontconfig] fix pkgconfig file installation (microsoft/vcpkg#35002)"

This reverts commit 616d4ce83e091cd128f4d896fcff81a1de4ed1b9.

* [vcpkg-tool-meson] fix pc-file installation paths on FreeBSD (microsoft#35002)

* [vcpkg-tool-meson] bump portversion (microsoft/vcpkg#35002)

* [vcpkg-tool-meson] regenerate versions (microsoft/vcpkg#35002)

* [vcpkg-tool-meson] Use vcpkg_from_github to obtain source (microsoft/vcpkg#35002)

* [vcpkg-tool-meson] Regenerate versions (microsoft/vcpkg#35002)

* [vcpkg-tool-meson] Use adverticed version of meson (microsoft/vcpkg#35002)

vcpkg@ce9f50f7 has bumped vcpkg-tool-meson's adverticed version to 0.63, but
not updated the `ref` variable, which still points to 0.62.1.

Update meson to 0.63 and use ${VERSION} to avoid similar issues in the future,
and regenerate patches/hashes accordingly.

* [vcpkg-tool-meson] regenerate versions (microsoft/vcpkg#35002)

* Revert "[vcpkg-tool-meson] regenerate versions (microsoft/vcpkg#35002)"

This reverts commit e9a424ef16.

* Revert "[vcpkg-tool-meson] Use adverticed version of meson (microsoft/vcpkg#35002)"

Meson 0.63 can't build gobject-introspection on a tier 1 supported target.

Upgrading meson to 0.63 and handling regressions of that update is out of
scope of #35002 anyways, and should be handled either on it's own PR,
microsoft/vcpkg#28084 or microsoft/vcpkg#35348 .
2023-12-13 03:02:35 -08:00
japm48
ce9f50f7ac
[meson] update to version 0.63 (#25811)
* meson: update to version 0.63

* meson: update version file
2022-07-20 15:17:31 -07:00
Alexander Neumann
f4de177097
[vcpkg-tool-meson] update meson to 0.62.1 (#23717)
* update meson and see what breaks

* include patch again.

* update meson to 0.62.1

* remove old patch

* move to 64bit since 32bit not longer exists.

* fix gobject-introspection

* v db

* revert nasm changes

* set MESON_SCRIPT instead of MESON.

* v db

* apply CR

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* v db

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2022-05-25 13:44:12 -07:00
Stefano Sinigardi
401578455f
[OpenCV] upgrade to v4.5.5 (#22801)
* [OpenCV4] update to v4.5.5

* [OpenCV] bump version

* [gstreamer] fix build for opencv

* fix references

* [vcpkg-tool-meson] fix nuget packaging

* fix references

* [gstreamer] fix references

* [ogre] update vcpkg tools

* fix references

* [OpenCV4] fixes from CI runs

* fix references

* [OpenCV4] force python module also in debug builds

* fix references

* [harfbuzz] fix cmake config

* harfbuzz fixes

* fix references

* [OpenCV4] remove unnecessary lines from patches

* fix references

* fix references

* [harfbuzz] bump version

* [harfbuzz] fix for single config builds

* fix references

* freetype fixes

* fix references

* fix ogre references

* fix references, again

* python when building static windows opencv libraries is unsupported

* fix references

* fix

* refs

* use required when necessary

* fix references

* do not use config for hdf5, use internal module

* fix references

* use proper spelling for freetype config cmake

* fix references

* [OpenCV] restore versions after merge

* fix references

* [leptonica] fix building

* fix references

* do not require package in optional features

* £fix references

* fix python feat

* update version

* update version

* [ffmpeg] remove opengl feat on arm64-windows

* format manifest

* fix references

* fix cuda/nvidia features compatibility matrix

* fix manifest

* fix

* fix

* fix references

* fix references, again

* move CONTROL to manifest

* [gstreamer] bump versions

* fix references

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
2022-02-23 11:57:13 -08:00
Alexander Neumann
8060230922
[meson] fix windows linker detection (#22032)
* fix meson linker detection .....

* bit of code cleanup in vcpkg_configure_meson

* forgot the version stuff

* put cmake back on path because meson is buggy as hell
2021-12-16 22:47:16 -08: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