From af55822ea1d8b1cc8ff7daf4d4b0850405f12e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Mon, 28 Oct 2019 23:47:40 +0100 Subject: [PATCH] mesonbuild - Update to 0.52.0 (#8639) * mesonbuild - Update to 0.52.0 * [tool-meson] Add package to represent dependency on Meson build-system --- ports/fribidi/CONTROL | 3 ++- ports/libepoxy/CONTROL | 3 ++- ports/tool-meson/CONTROL | 3 +++ ports/tool-meson/portfile.cmake | 5 +++++ scripts/cmake/vcpkg_find_acquire_program.cmake | 8 ++++---- 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 ports/tool-meson/CONTROL create mode 100644 ports/tool-meson/portfile.cmake diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL index e493429d4a..771c4716ef 100644 --- a/ports/fribidi/CONTROL +++ b/ports/fribidi/CONTROL @@ -1,3 +1,4 @@ Source: fribidi -Version: 2019-02-04-1 +Version: 2019-02-04-2 Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi) +Build-Depends: tool-meson diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL index 9b2e967175..f19def9433 100644 --- a/ports/libepoxy/CONTROL +++ b/ports/libepoxy/CONTROL @@ -1,4 +1,5 @@ Source: libepoxy -Version: 1.5.3-1 +Version: 1.5.3-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/tool-meson/CONTROL b/ports/tool-meson/CONTROL new file mode 100644 index 0000000000..600baf27dd --- /dev/null +++ b/ports/tool-meson/CONTROL @@ -0,0 +1,3 @@ +Source: tool-meson +Version: 0.52.0 +Description: Meson build system diff --git a/ports/tool-meson/portfile.cmake b/ports/tool-meson/portfile.cmake new file mode 100644 index 0000000000..ad32823bde --- /dev/null +++ b/ports/tool-meson/portfile.cmake @@ -0,0 +1,5 @@ +# This port represents a dependency on the Meson build system. +# In the future, it is expected that this port acquires and installs Meson. +# Currently is used in ports that call vcpkg_find_acquire_program(MESON) in order to force rebuilds. + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index b5af58cc26..b4672a2457 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -169,10 +169,10 @@ function(vcpkg_find_acquire_program VAR) else() set(SCRIPTNAME meson) endif() - set(PATHS ${DOWNLOADS}/tools/meson/meson-0.51.0) - set(URL "https://github.com/mesonbuild/meson/archive/0.51.0.zip") - set(ARCHIVE "meson-0.51.0.zip") - set(HASH bf1df65cde7e0e0a44e4b4be7d68de9897a77c4ea4c694f1d77fe82cd3c7e7818dc034a3313ce885ba6883b4ba6d282b7a589f665fa499d9eb79fc7a23e415cc) + set(PATHS ${DOWNLOADS}/tools/meson/meson-0.52.0) + set(URL "https://github.com/mesonbuild/meson/archive/0.52.0.zip") + set(ARCHIVE "meson-0.52.0.zip") + set(HASH 2f2657599f19933c02be2a1faa508d5b2d137fba1ccc9d68a6b6d04b8d21163c33220c673643fa444fa86e94ba010cf8a851b9e6abc096559a7c735f5099a180) elseif(VAR MATCHES "FLEX") if(CMAKE_HOST_WIN32) set(PROGNAME win_flex)