diff options
| author | Wolfgang Stöggl <c72578@yahoo.de> | 2020-11-04 08:14:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 23:14:33 -0800 |
| commit | 78ce9413a8cd7df0bac034832c4bbe6b09a28c9b (patch) | |
| tree | 2b20c5b67fcd826a5e0212b5420482f91fbbfd7c | |
| parent | 74ae197d7b333d9e2c19a058f3c88aabffdfdff4 (diff) | |
| download | vcpkg-78ce9413a8cd7df0bac034832c4bbe6b09a28c9b.tar.gz vcpkg-78ce9413a8cd7df0bac034832c4bbe6b09a28c9b.zip | |
[tool-meson] Update to 0.56.0 (#14344)
| -rw-r--r-- | ports/libepoxy/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch | 11 | ||||
| -rw-r--r-- | ports/libepoxy/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/tool-meson/CONTROL | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 4 |
5 files changed, 16 insertions, 4 deletions
diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL index 93d1aede7..1ef7749eb 100644 --- a/ports/libepoxy/CONTROL +++ b/ports/libepoxy/CONTROL @@ -1,6 +1,6 @@ Source: libepoxy Version: 1.5.4 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/anholt/libepoxy Description: Epoxy is a library for handling OpenGL function pointer management for you Build-Depends: tool-meson diff --git a/ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch b/ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch new file mode 100644 index 000000000..850bbe01b --- /dev/null +++ b/ports/libepoxy/libepoxy-1.5.4_meson_c_std.patch @@ -0,0 +1,11 @@ +--- a/meson.build 2019-11-06 00:08:06.000000000 +0100 ++++ b/meson.build 2020-11-03 20:02:08.201459200 +0100 +@@ -1,7 +1,7 @@ + project('libepoxy', 'c', version: '1.5.4', + default_options: [ + 'buildtype=debugoptimized', +- 'c_std=gnu99', ++ 'c_std=c99', + 'warning_level=1', + ], + license: 'MIT', diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index caaa02ab2..07f81a7b7 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES # https://github.com/anholt/libepoxy/pull/220 libepoxy-1.5.4_Add_call_convention_to_mock_function.patch + libepoxy-1.5.4_meson_c_std.patch ) if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) diff --git a/ports/tool-meson/CONTROL b/ports/tool-meson/CONTROL index 2d387c9b2..9eb6d800b 100644 --- a/ports/tool-meson/CONTROL +++ b/ports/tool-meson/CONTROL @@ -1,4 +1,4 @@ Source: tool-meson -Version: 0.55.3 +Version: 0.56.0 Homepage: https://github.com/mesonbuild/meson Description: Meson build system diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 148b15ea8..131e7b4bf 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -246,7 +246,7 @@ function(vcpkg_find_acquire_program VAR) set(NOEXTRACT ON) set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619) elseif(VAR MATCHES "MESON") - set(MESON_VERSION 0.55.3) + set(MESON_VERSION 0.56.0) set(PROGNAME meson) set(REQUIRED_INTERPRETER PYTHON3) set(APT_PACKAGE_NAME "meson") @@ -255,7 +255,7 @@ function(vcpkg_find_acquire_program VAR) set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION}) set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz") set(ARCHIVE "meson-${MESON_VERSION}.tar.gz") - set(HASH afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae) + set(HASH da426e2ac0f657da5672d66143b8f4f45513c269a9a544e8b4c48b4a702743a50d35cbaa37ef4c4fbd7e18b8784c788314927a54faba6a14bb2d468eeaa87607) set(_vfa_SUPPORTED ON) set(VERSION_CMD --version) elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON") |