aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Stöggl <c72578@yahoo.de>2020-05-20 19:10:59 +0200
committerGitHub <noreply@github.com>2020-05-20 10:10:59 -0700
commita29e5b6d5d4cda3f6bc315bc51ff010958b88213 (patch)
tree066f1814a3aa1f7af3af37f0f26c02ab8b8ca9a7
parent9d9a50bc9823ca1673019aa18f23d28c7a1d2ff9 (diff)
downloadvcpkg-a29e5b6d5d4cda3f6bc315bc51ff010958b88213.tar.gz
vcpkg-a29e5b6d5d4cda3f6bc315bc51ff010958b88213.zip
[tool-meson] Update to 0.54.2 (#11380)
* [tool-meson] Update to 0.54.2 - Release notes: https://mesonbuild.com/Release-notes-for-0-54-0.html - Homepage added to CONTROL file * Re-trigger CI test Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
-rw-r--r--ports/fribidi/CONTROL2
-rw-r--r--ports/fribidi/portfile.cmake2
-rw-r--r--ports/libepoxy/CONTROL2
-rw-r--r--ports/libepoxy/portfile.cmake3
-rw-r--r--ports/tool-meson/CONTROL3
-rw-r--r--scripts/cmake/vcpkg_find_acquire_program.cmake8
6 files changed, 10 insertions, 10 deletions
diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL
index 52d351727..edfb9c777 100644
--- a/ports/fribidi/CONTROL
+++ b/ports/fribidi/CONTROL
@@ -1,4 +1,4 @@
Source: fribidi
-Version: 1.0.9
+Version: 1.0.9-1
Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)
Build-Depends: tool-meson
diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake
index 6c0c98ef2..342b4d3c5 100644
--- a/ports/fribidi/portfile.cmake
+++ b/ports/fribidi/portfile.cmake
@@ -30,4 +30,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
endif()
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file
diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL
index 2ff219a8f..2e8395539 100644
--- a/ports/libepoxy/CONTROL
+++ b/ports/libepoxy/CONTROL
@@ -1,5 +1,5 @@
Source: libepoxy
-Version: 1.5.3-3
+Version: 1.5.3-4
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/portfile.cmake b/ports/libepoxy/portfile.cmake
index e578dd659..137ae1913 100644
--- a/ports/libepoxy/portfile.cmake
+++ b/ports/libepoxy/portfile.cmake
@@ -70,5 +70,4 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig)
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/tool-meson/CONTROL b/ports/tool-meson/CONTROL
index 4d0473c72..483508089 100644
--- a/ports/tool-meson/CONTROL
+++ b/ports/tool-meson/CONTROL
@@ -1,3 +1,4 @@
Source: tool-meson
-Version: 0.53.2
+Version: 0.54.2
+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 cd5277be9..c86eee3eb 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -232,10 +232,10 @@ function(vcpkg_find_acquire_program VAR)
else()
set(SCRIPTNAME meson)
endif()
- set(PATHS ${DOWNLOADS}/tools/meson/meson-0.53.2)
- set(URL "https://github.com/mesonbuild/meson/archive/0.53.2.zip")
- set(ARCHIVE "meson-0.53.2.zip")
- set(HASH 86c3347395528d2358c9514a76ec8a60908f8abadece5ecb9bac633ea735d4b40a27683002db017f06fa48ec68ea1bfe64d216fa17a54d6d42c8bc45f55606b2)
+ set(PATHS ${DOWNLOADS}/tools/meson/meson-0.54.2)
+ set(URL "https://github.com/mesonbuild/meson/archive/0.54.2.zip")
+ set(ARCHIVE "meson-0.54.2.zip")
+ set(HASH 8d19110bad3e6a223d1d169e833b746b884ece9cd23d2539ec02dccb5cd0c56542414b7afc0f7f2adcec9d957e4120d31f41734397aa0a7ee7f9c29ebdc9eb4c)
elseif(VAR MATCHES "FLEX")
if(CMAKE_HOST_WIN32)
set(PROGNAME win_flex)