Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[vcpkg-tool-meson] Update to 1.6.0 #41395

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+16 −10
Open

[vcpkg-tool-meson] Update to 1.6.0 #41395

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f0e365
[vcpkg-tool-meson] Update to 1.6.0rc1
dg0yt Oct 7, 2024
e19d9f3
[vcpkg-tool-meson] Update to 1.6.0rc2
dg0yt Oct 14, 2024
db30b35
[vcpkg-tool-meson] Update to 1.6.0
dg0yt Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ports/vcpkg-tool-meson/adjust-args.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
diff --git a/mesonbuild/cmake/toolchain.py b/mesonbuild/cmake/toolchain.py
index abf2cf6..477629e 100644
index 7d73a7c..564e6de 100644
--- a/mesonbuild/cmake/toolchain.py
+++ b/mesonbuild/cmake/toolchain.py
@@ -204,6 +204,6 @@ class CMakeToolchain:
@@ -196,7 +196,7 @@ class CMakeToolchain:
@staticmethod
def is_cmdline_option(compiler: 'Compiler', arg: str) -> bool:
if compiler.get_argument_syntax() == 'msvc':
- return arg.startswith('/')
+ return arg.startswith(('/','-'))
else:
return arg.startswith('-')
if compiler.exelist[0] == 'zig' and arg in {'ar', 'cc', 'c++', 'dlltool', 'lib', 'ranlib', 'objcopy', 'rc'}:
return True
8 changes: 4 additions & 4 deletions ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index ebe0d92..904090b 100644
index 1bdf829..5f1bfd9 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -693,6 +693,9 @@ class PkgConfigModule(NewExtensionModule):
@@ -701,6 +701,9 @@ class PkgConfigModule(NewExtensionModule):
pcfile = filebase + '.pc'
pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
if pkgroot is None:
+ pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('libdir'))), 'pkgconfig')
+ pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('libdir'))), 'pkgconfig')
+ pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
+ elif False:
if mesonlib.is_freebsd():
pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig')
pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'libdata', 'pkgconfig')
pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
4 changes: 2 additions & 2 deletions ports/vcpkg-tool-meson/vcpkg-port-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ set(meson_short_hash @MESON_SHORT_HASH@)

# Setup meson:
set(program MESON)
set(program_version @VERSION@)
set(program_version @VERSION@rc1)
set(program_name meson)
set(search_names meson meson.py)
set(ref "${program_version}")
set(path_to_search "${DOWNLOADS}/tools/meson-${program_version}-${meson_short_hash}")
set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz")
set(download_filename "meson-${ref}.tar.gz")
set(download_sha512 54c6611dd95caaffa216f03d0b96b44c86d5452f54e1282234a4646f8e50f75ea0185a1611a4c078c888154bd4e2d917c4d075de3e7577440a925f72f6152a4f)
set(download_sha512 5043388c9ce95c000d8b06322277688a6ce68b94dbefae1a577dcbb41fb8f0b22acbfdf08d136aa869c425112d5b4a90dcd3fb9708d4959d7991b7cd5c596188)

find_program(SCRIPT_MESON NAMES ${search_names} PATHS "${path_to_search}" NO_DEFAULT_PATH) # NO_DEFAULT_PATH due top patching

Expand Down
2 changes: 1 addition & 1 deletion ports/vcpkg-tool-meson/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vcpkg-tool-meson",
"version": "1.5.2",
"version": "1.6.0",
dg0yt marked this conversation as resolved.
Show resolved Hide resolved
"description": "Meson build system",
"homepage": "https://github.com/mesonbuild/meson",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9333,7 +9333,7 @@
"port-version": 1
},
"vcpkg-tool-meson": {
"baseline": "1.5.2",
"baseline": "1.6.0",
"port-version": 0
},
"vcpkg-tool-mozbuild": {
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vcpkg-tool-meson.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "afeb3b9604f859980464d5f300b13e3702ddd2fd",
"version": "1.6.0",
"port-version": 0
},
{
"git-tree": "43ebfc9a69d8e47fdfbe68b6f79a02d2b5f50e6e",
"version": "1.5.2",
Expand Down