diff options
| author | codicodi <rob.ceglinski@gmail.com> | 2017-05-10 23:15:02 +0200 |
|---|---|---|
| committer | codicodi <rob.ceglinski@gmail.com> | 2017-05-10 23:15:02 +0200 |
| commit | 78c6e6ab12b5e3a06dd5c09e0a07e6efedf303d6 (patch) | |
| tree | a6ff640b1619b43abcf121f55f38323b0b74b62a | |
| parent | 4e9e62f6ef6a45680a8453c31b39e7504a7a0605 (diff) | |
| download | vcpkg-78c6e6ab12b5e3a06dd5c09e0a07e6efedf303d6.tar.gz vcpkg-78c6e6ab12b5e3a06dd5c09e0a07e6efedf303d6.zip | |
[libepoxy] update to 1.4.2
| -rw-r--r-- | ports/libepoxy/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libepoxy/portfile.cmake | 13 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL index 8306c27be..2f9939ee4 100644 --- a/ports/libepoxy/CONTROL +++ b/ports/libepoxy/CONTROL @@ -1,3 +1,3 @@ Source: libepoxy -Version: 1.4.1-7d58fd3 +Version: 1.4.2 Description: Epoxy is a library for handling OpenGL function pointer management for you diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index 7dc76a50d..27c073786 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -4,13 +4,12 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libepoxy-7d58fd3d47d2d69f2b1b9f08325302e4eeff9ebe) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/anholt/libepoxy/archive/7d58fd3d47d2d69f2b1b9f08325302e4eeff9ebe.zip" - FILENAME "libepoxy-7d58fd3d47d2d69f2b1b9f08325302e4eeff9ebe.zip" - SHA512 7e97a7832ea136565be92d6f6f0afead2fff9ac7b2999ef9e7865ac18dfbeab354e5a652b1a86e982a323dca9a1446df07821c26d315b7da4ca72b5be7345695) - -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO anholt/libepoxy + REF 1.4.2 + SHA512 b94e1fe749c63a82f38369ff62b7d0d8cf1c55884159f030dc2919c17daf5811dd71cfd6a663edb38df66ff4ca53120a6a53501568cc8a582f08d4ae82fe9d89 + HEAD_REF master) # ensure python is on path - not for meson but some source generation scripts vcpkg_find_acquire_program(PYTHON3) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index d6bd34b21..5c8a00ad2 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -80,10 +80,10 @@ function(vcpkg_find_acquire_program VAR) set(PROGNAME meson) set(REQUIRED_INTERPRETER PYTHON3) set(SCRIPTNAME meson.py) - set(PATHS ${DOWNLOADS}/tools/meson/meson-0.38.1) - set(URL "https://github.com/mesonbuild/meson/archive/0.38.1.zip") - set(ARCHIVE "meson-0.38.1.zip") - set(HASH 89642b1d976af7e29e9ca2b1a378510ce286ebd90a8234e898f3dd9dd7151538fdfc61fba770681605dad843b77b344fee94f992f18328655669d5f603c7fee5) + set(PATHS ${DOWNLOADS}/tools/meson/meson-0.40.1) + set(URL "https://github.com/mesonbuild/meson/archive/0.40.1.zip") + set(ARCHIVE "meson-0.40.1.zip") + set(HASH 4c1d07f32d527859f762c34de74d31d569573fc833335ab9652ed38d1f9e64b49869e826527c28a6a07cb8e594fd5c647b34aa95e626236a2707f75df0a2d435) else() message(FATAL "unknown tool ${VAR} -- unable to acquire.") endif() |