From c79c94dc5c61794ecc35a06c42364e90cef7d33f Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 15 Apr 2022 20:18:51 +0200 Subject: [PATCH 001/383] [qt-advanced-docking-system] Remove directory license (#24151) * Update to 3.8.2 * version * version --- .../config_changes.patch | 4 ++-- ports/qt-advanced-docking-system/portfile.cmake | 15 +++++++++------ versions/q-/qt-advanced-docking-system.json | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ports/qt-advanced-docking-system/config_changes.patch b/ports/qt-advanced-docking-system/config_changes.patch index 3ee543de47f8cc..106ba1c8e66508 100644 --- a/ports/qt-advanced-docking-system/config_changes.patch +++ b/ports/qt-advanced-docking-system/config_changes.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0bd721d..4848c5f 100644 +index 49cd799..6535465 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -52,7 +52,7 @@ if (UNIX) +@@ -54,7 +54,7 @@ if (UNIX AND NOT APPLE) set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS}) set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS}) endif() diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index 03551d572070fa..a369b9a80316d9 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DADS_VERSION=3.8.2 @@ -17,9 +17,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/gnu-lgpl-v2.1.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/license) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_cmake_config_fixup(PACKAGE_NAME qtadvanceddocking CONFIG_PATH lib/cmake/qtadvanceddocking) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/license") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/license") + +file(INSTALL "${SOURCE_PATH}/gnu-lgpl-v2.1.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json index f219e69524d82f..9924a66032a420 100644 --- a/versions/q-/qt-advanced-docking-system.json +++ b/versions/q-/qt-advanced-docking-system.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6340fe5a7da92b20bff09455503e08510d1124f6", + "git-tree": "faedc79b62016f2cfc3c47ecc16db714448daa48", "version": "3.8.2", "port-version": 0 }, From 72910aae4ffacd391a366436f17da83fcafd930b Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 15 Apr 2022 22:28:03 +0200 Subject: [PATCH 002/383] [nanoflann] Update to 1.4.2 (#24158) * [nanoflann] Update to 1.4.2 * version --- ports/nanoflann/portfile.cmake | 14 +++++++++----- ports/nanoflann/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/n-/nanoflann.json | 5 +++++ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ports/nanoflann/portfile.cmake b/ports/nanoflann/portfile.cmake index cd295d76d8ec38..81a9fd1120a272 100644 --- a/ports/nanoflann/portfile.cmake +++ b/ports/nanoflann/portfile.cmake @@ -1,19 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jlblancoc/nanoflann - REF v1.3.2 - SHA512 937D3787DF389EFE530060CD2723130251E2CA7937B10F8D770C7B0D21FFD972E6DA21B2B9E655C5740D57B4AF8F76F0CC6D9AE39527C440BE8863BE0DEAA7ED + REF v1.4.2 + SHA512 2a400725940868473d376635f67aac4402046d771ecceec547442dd653f0a00e38e340e4ac0a98620ddf3927845df18b6cfd644982f073d26c7864bed2de96ca HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNANOFLANN_BUILD_EXAMPLES=OFF + -DNANOFLANN_BUILD_TESTS=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/${PORT}/cmake") +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() diff --git a/ports/nanoflann/vcpkg.json b/ports/nanoflann/vcpkg.json index cdf0b0cf0220be..c24954f2160272 100644 --- a/ports/nanoflann/vcpkg.json +++ b/ports/nanoflann/vcpkg.json @@ -1,9 +1,9 @@ { "name": "nanoflann", - "version": "1.3.2", - "port-version": 1, + "version": "1.4.2", "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).", "homepage": "https://github.com/jlblancoc/nanoflann", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index dc7d7dda60fe02..6e5da63137d20e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4741,8 +4741,8 @@ "port-version": 6 }, "nanoflann": { - "baseline": "1.3.2", - "port-version": 1 + "baseline": "1.4.2", + "port-version": 0 }, "nanogui": { "baseline": "2019-09-23", diff --git a/versions/n-/nanoflann.json b/versions/n-/nanoflann.json index cda02d8a58aaaa..6145f412d8a35f 100644 --- a/versions/n-/nanoflann.json +++ b/versions/n-/nanoflann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59c3e1998e35dcf6648c1775b19e40c5017b2c84", + "version": "1.4.2", + "port-version": 0 + }, { "git-tree": "481ec544fb82ec73f6f0e01d1333f412d3e82d2d", "version": "1.3.2", From 94c2aed904810b4488a78eb6cf5b884f7906e9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20C=2E=20S=C3=A1nchez?= Date: Fri, 15 Apr 2022 16:29:29 -0400 Subject: [PATCH 003/383] [mongo-cxx-driver] set c++17 for std::experimental build (#24083) * [mongo-cxx-driver] set c++17 for std::experimental build fixes #21877 * update version * update git-tree * add license * overwrite version Co-authored-by: FrankXie --- ports/mongo-cxx-driver/portfile.cmake | 3 +++ ports/mongo-cxx-driver/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/m-/mongo-cxx-driver.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index 1b208519e96988..4b03c74d336ac6 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -2,6 +2,7 @@ set(VERSION_MAJOR 3) set(VERSION_MINOR 6) set(VERSION_PATCH 5) set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) +set(BSONCXX_STANDARD 11) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -29,6 +30,7 @@ elseif ("boost" IN_LIST FEATURES) set(BSONCXX_POLY BOOST) elseif("std-experimental" IN_LIST FEATURES) set(BSONCXX_POLY STD_EXPERIMENTAL) + set(BSONCXX_STANDARD 17) else() if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(BSONCXX_POLY BOOST) @@ -43,6 +45,7 @@ vcpkg_cmake_configure( -DMONGOCXX_HEADER_INSTALL_DIR=include -DBSONCXX_HEADER_INSTALL_DIR=include -DBSONCXX_POLY_USE_${BSONCXX_POLY}=1 + -DCMAKE_CXX_STANDARD=${BSONCXX_STANDARD} -DBUILD_VERSION=${VERSION_FULL} ) diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index 6b0216a30fa6cc..c76a2a49a2b36a 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mongo-cxx-driver", "version": "3.6.5", - "port-version": 2, + "port-version": 3, "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", + "license": "Apache-2.0", "dependencies": [ "boost-optional", "boost-smart-ptr", diff --git a/versions/baseline.json b/versions/baseline.json index 6e5da63137d20e..41fd03f7643f78 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4578,7 +4578,7 @@ }, "mongo-cxx-driver": { "baseline": "3.6.5", - "port-version": 2 + "port-version": 3 }, "mongoose": { "baseline": "7.5", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index 4510acc815992e..38482de4ae784c 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "732830e44f7d4c9c31025d6c77e7d40220abef38", + "version": "3.6.5", + "port-version": 3 + }, { "git-tree": "2c9183634ff53b6e76b201ad39abf63b5d26bc8a", "version": "3.6.5", From 05bcc5fca4ec1bd11a1e1a655ff37752dc5737f8 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 15 Apr 2022 22:44:08 +0200 Subject: [PATCH 004/383] [sdl2-image] Features must use sdl2[x11] on Linux (#23725) * Fix shared libs suffix * Remove version-string * version * Use cmake version of shared lib suffix * version * Remove old feature processing * version * Real fix * [sdl2] Fix x11 feature * format * version * Fix suffix again * version * Fix external dependencies * version * Fix WebP linkage * version * Fix PNG linkage * version * Mark everything as default feature for testing * version * Trigger rebuild of sdl2pp * version * congig file * Fix flags * version * Fix flags * version * Disable UWP warnings for TIFF * version * Fix CXX * version * revert cmake version * version * Fix config * version * Revert sdl2pp * Fix config * version * Create config.cmake.in file * version --- ports/sdl2-image/CMakeLists.txt | 94 +++++++-------------- ports/sdl2-image/portfile.cmake | 26 ++---- ports/sdl2-image/sdl2-image-config.cmake.in | 6 ++ ports/sdl2-image/vcpkg.json | 29 ++++++- ports/sdl2/portfile.cmake | 6 +- ports/sdl2/vcpkg.json | 5 +- versions/baseline.json | 4 +- versions/s-/sdl2-image.json | 5 ++ versions/s-/sdl2.json | 5 ++ 9 files changed, 88 insertions(+), 92 deletions(-) create mode 100644 ports/sdl2-image/sdl2-image-config.cmake.in diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt index cc37ad122bc7fc..deb52114e525b9 100644 --- a/ports/sdl2-image/CMakeLists.txt +++ b/ports/sdl2-image/CMakeLists.txt @@ -3,27 +3,14 @@ project(SDL2_image C) ### configuration ### -list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/libwebp") # enable all file formats which are supported natively set(SUPPORTED_FORMATS BMP GIF LBM PCX PNM TGA XPM XCF XV SVG) # enable all file formats which are supported through external dependencies -# first try to load them statically (lib file in vcpkg installation) -# if this fails try to make them a dynamic dependency (dll will be loaded at runtime) if possible. vcpkg cannot resolve these dependencies! -# else do not support this file format at all - -# Can be explicitly enabled or disabled via USE_XYZ -set(DEPENDENCIES PNG JPEG TIFF WEBP) - -# patch library names for preprocessor flags -set(JPEG_FLAG JPG) -set(TIFF_FLAG TIF) - -# names of potentially dynamically loaded libraries -set(JPEG_DYNAMIC \"libjpeg-9.dll\") -set(PNG_DYNAMIC \"libpng16-16.dll\") -set(TIFF_DYNAMIC \"libtiff-5.dll\") -set(WEBP_DYNAMIC \"libwebp-4.dll\") +option(USE_WEBP "Enable support for WebP format" OFF) +option(USE_PNG "Enable support for PNG format" OFF) +option(USE_JPEG "Enable support for JPEG format" OFF) +option(USE_TIFF "Enable support for TIFF format" OFF) ### implementation ### @@ -74,33 +61,34 @@ include_directories(${CMAKE_SOURCE_DIR}) target_link_libraries(SDL2_image SDL2::SDL2) # external dependencies -foreach(DEPENDENCY IN LISTS DEPENDENCIES) - if(NOT USE_${DEPENDENCY}) - continue() - endif() - find_package(${DEPENDENCY}) - - if(NOT DEFINED ${DEPENDENCY}_FLAG) - set(${DEPENDENCY}_FLAG ${DEPENDENCY}) - endif() +if(USE_WEBP) + find_package(WebP CONFIG REQUIRED) + add_definitions(-DLOAD_WEBP) + target_link_libraries(SDL2_image PRIVATE WebP::webp) +endif() - add_definitions(-DLOAD_${${DEPENDENCY}_FLAG}) - if(${DEPENDENCY}_FOUND) - message(STATUS " --> linking statically.") - target_link_libraries(SDL2_image ${${DEPENDENCY}_LIBRARIES}) - elseif(DEFINED ${DEPENDENCY}_DYNAMIC) - message(STATUS " --> linking dynamically.") - add_definitions(-DLOAD_${${DEPENDENCY}_FLAG}_DYNAMIC=${${DEPENDENCY}_DYNAMIC}) - set(RUNTIME_DEPENDENCIES ON) - else() - message(STATUS " --> skipping.") - endif() -endforeach(DEPENDENCY) +if(USE_PNG) + find_package(libpng REQUIRED) + add_definitions(-DLOAD_PNG) + target_link_libraries(SDL2_image PRIVATE png) +endif() -if(DEFINED RUNTIME_DEPENDENCIES) - include_directories(VisualC/external/include) +if(USE_JPEG) + find_package(JPEG REQUIRED) + add_definitions(-DLOAD_JPG) + target_link_libraries(SDL2_image PRIVATE ${JPEG_LIBRARIES}) endif() +if(USE_TIFF) + find_package(TIFF REQUIRED) + add_definitions(-DLOAD_TIF) + target_link_libraries(SDL2_image PRIVATE TIFF::TIFF) + + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") + endif() +endif() install(TARGETS SDL2_image EXPORT SDL2_image @@ -110,11 +98,10 @@ install(TARGETS SDL2_image install(FILES SDL_image.h DESTINATION include/SDL2 CONFIGURATIONS Release) -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sdl2-image-config.cmake" -[[include(CMakeFindDependencyMacro) -find_dependency(SDL2 CONFIG) -include("${CMAKE_CURRENT_LIST_DIR}/sdl2-image-targets.cmake") -]]) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sdl2-image-config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/sdl2-image-config.cmake" @ONLY + INSTALL_DESTINATION "share/sdl2-image") + set(prefix "") set(exec_prefix [[${prefix}]]) set(libdir [[${prefix}/lib]]) @@ -141,20 +128,3 @@ install(EXPORT SDL2_image FILE sdl2-image-targets.cmake NAMESPACE SDL2:: ) - -message(STATUS "Link-time dependencies:") -message(STATUS " " SDL2::SDL2) -foreach(DEPENDENCY ${DEPENDENCIES}) - if(${DEPENDENCY}_FOUND) - message(STATUS " " ${DEPENDENCY}) - endif() -endforeach(DEPENDENCY) - -if(DEFINED RUNTIME_DEPENDENCIES) - message(STATUS "Run-time dependencies:") - foreach(DEPENDENCY ${DEPENDENCIES}) - if(NOT ${DEPENDENCY}_FOUND AND DEFINED ${DEPENDENCY}_DYNAMIC) - message(STATUS " " ${${DEPENDENCY}_DYNAMIC}) - endif() - endforeach(DEPENDENCY) -endif() diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake index 4f82650cecdcf6..cede4e4161e314 100644 --- a/ports/sdl2-image/portfile.cmake +++ b/ports/sdl2-image/portfile.cmake @@ -15,30 +15,20 @@ vcpkg_extract_source_archive_ex( ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/sdl2-image-config.cmake.in" DESTINATION "${SOURCE_PATH}") -set(USE_JPEG OFF) -if("libjpeg-turbo" IN_LIST FEATURES) - set(USE_JPEG ON) -endif() - -set(USE_TIFF OFF) -if("tiff" IN_LIST FEATURES) - set(USE_TIFF ON) -endif() - -set(USE_WEBP OFF) -if("libwebp" IN_LIST FEATURES) - set(USE_WEBP ON) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libjpeg-turbo USE_JPEG + tiff USE_TIFF + libwebp USE_WEBP +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}" -DUSE_PNG=ON - -DUSE_JPEG=${USE_JPEG} - -DUSE_TIFF=${USE_TIFF} - -DUSE_WEBP=${USE_WEBP} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/sdl2-image/sdl2-image-config.cmake.in b/ports/sdl2-image/sdl2-image-config.cmake.in new file mode 100644 index 00000000000000..d69bc6a49c3c74 --- /dev/null +++ b/ports/sdl2-image/sdl2-image-config.cmake.in @@ -0,0 +1,6 @@ +include(CMakeFindDependencyMacro) +find_dependency(SDL2 CONFIG) +if(@USE_WEBP@) + find_dependency(WebP CONFIG) +endif() +include("${CMAKE_CURRENT_LIST_DIR}/sdl2-image-targets.cmake") diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json index a57f936726e08a..48df1caa2d8a09 100644 --- a/ports/sdl2-image/vcpkg.json +++ b/ports/sdl2-image/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-image", - "version-string": "2.0.5", - "port-version": 4, + "version": "2.0.5", + "port-version": 5, "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV", "homepage": "https://www.libsdl.org/projects/SDL_image", "dependencies": [ @@ -20,18 +20,39 @@ "libjpeg-turbo": { "description": "Support for JPEG image format", "dependencies": [ - "libjpeg-turbo" + "libjpeg-turbo", + { + "name": "sdl2", + "features": [ + "x11" + ], + "platform": "!windows" + } ] }, "libwebp": { "description": "Support for WEBP image format.", "dependencies": [ - "libwebp" + "libwebp", + { + "name": "sdl2", + "features": [ + "x11" + ], + "platform": "!windows" + } ] }, "tiff": { "description": "Support for TIFF image format", "dependencies": [ + { + "name": "sdl2", + "features": [ + "x11" + ], + "platform": "!windows" + }, "tiff" ] } diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 67c43d4bbb146b..11fe9cb9b4610a 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -26,9 +26,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) if ("x11" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Feature x11 only support UNIX.") - endif() message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") endif() @@ -84,7 +81,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_IS_M endforeach() endif() -configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() set(DYLIB_COMPATIBILITY_VERSION_REGEX "set\\(DYLIB_COMPATIBILITY_VERSION (.+)\\)") @@ -100,3 +96,5 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") endif() vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index af004284078537..613f4626edcc62 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2", "version": "2.0.20", - "port-version": 1, + "port-version": 2, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "dependencies": [ @@ -19,7 +19,8 @@ "description": "Vulkan functionality for SDL" }, "x11": { - "description": "Dynamically load X11 support" + "description": "Dynamically load X11 support", + "supports": "!windows" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 41fd03f7643f78..37298dfa76f8e9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6370,7 +6370,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 1 + "port-version": 2 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -6378,7 +6378,7 @@ }, "sdl2-image": { "baseline": "2.0.5", - "port-version": 4 + "port-version": 5 }, "sdl2-mixer": { "baseline": "2.0.4", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index 9e0ed9100fcdd1..0e2c4254b7e078 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "623548e8c929f2160320bf9644e2cd5a75d4a608", + "version": "2.0.5", + "port-version": 5 + }, { "git-tree": "9042c449fc4c728c5b428332e09bc6d21a2acf34", "version-string": "2.0.5", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 16b746b1f06cf3..e5e456632f8c56 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abf71c19917402dddef261e80d55c8ec04e9bf54", + "version": "2.0.20", + "port-version": 2 + }, { "git-tree": "9900463f2847ed86e25bac1688c527ae3486a024", "version": "2.0.20", From 2437383eb0ce6e72383a30303392c385b27440f3 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Fri, 15 Apr 2022 14:52:48 -0700 Subject: [PATCH 005/383] [baseline] skip directsdk:x64-windows-static-md (#24167) Co-authored-by: nicole mazzuca --- scripts/ci.baseline.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 164b254ab53e1c..06fec8dbd41411 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -215,6 +215,7 @@ devicenameresolver:x64-windows-static=fail # legacy directxsdk which conflicts with dxsdk-d3dx directxsdk:x86-windows=skip directxsdk:x64-windows=skip +directxsdk:x64-windows-static-md=skip discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail @@ -1422,4 +1423,4 @@ dimcli:x64-windows-static=fail # ZeroC doesn't provide ARM tagets in project files. zeroc-ice:arm64-windows=fail zeroc-ice:arm-uwp=fail -zeroc-ice:x64-uwp=fail \ No newline at end of file +zeroc-ice:x64-uwp=fail From aebb363eaa0b658beb19cbefdd5aa2f9cbc14f1e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 15 Apr 2022 15:33:07 -0700 Subject: [PATCH 006/383] Update VMs for April Patch Tuesday (#24131) * Update VM base tools: * Intel OneAPI updated * Powershell Updated * VS updated to install current Windows SDKs, and atlmfc for arm, and CMake/ninja * Update pools. * Remove passing-remove-from-fail list port. --- scripts/azure-pipelines/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 | 2 +- scripts/azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- .../azure-pipelines/windows/deploy-visual-studio.ps1 | 10 +++++++--- scripts/ci.baseline.txt | 2 -- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 4ef04aa9b3f414..7061cfb8c2cd3c 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2022-03-09-1' - linux-pool: 'PrLin-2022-03-09-1' + windows-pool: 'PrWin-2022-04-13' + linux-pool: 'PrLin-2022-04-13' osx-pool: 'PrOsx-2022-02-04' jobs: diff --git a/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 b/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 index a0b32cebb7ee72..5b58b7eb4676fa 100644 --- a/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 +++ b/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 @@ -7,7 +7,7 @@ # Seems like only the HPC kit is really needed? #$oneAPIBaseUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe' -$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe' +$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18578/w_HPCKit_p_2022.1.3.145_offline.exe' # Possible oneAPI Base components: #intel.oneapi.win.vtune 2021.1.1-68 true IntelĀ® VTune(TM) Profiler diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 332d68f92162d9..4707808edadf8c 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 2567d4c11d6ed3..96021bd1dd6f64 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -14,14 +14,18 @@ $Workloads = @( 'Microsoft.VisualStudio.Component.VC.Tools.ARM64', 'Microsoft.VisualStudio.Component.VC.ATL', 'Microsoft.VisualStudio.Component.VC.ATLMFC', - 'Microsoft.VisualStudio.Component.Windows10SDK.18362', - 'Microsoft.VisualStudio.Component.Windows10SDK.19041', + 'Microsoft.VisualStudio.Component.VC.ATL.ARM', + 'Microsoft.VisualStudio.Component.VC.ATL.ARM64', + 'Microsoft.VisualStudio.Component.VC.MFC.ARM', + 'Microsoft.VisualStudio.Component.VC.MFC.ARM64', + 'Microsoft.VisualStudio.Component.Windows10SDK', 'Microsoft.Net.Component.4.8.SDK', 'Microsoft.Net.Component.4.7.2.TargetingPack', 'Microsoft.Component.NetFX.Native', 'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset', 'Microsoft.VisualStudio.Component.VC.Llvm.Clang', - 'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools' + 'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools', + 'Microsoft.VisualStudio.Component.VC.CMake.Project' ) <# diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 06fec8dbd41411..ad9a3206299a94 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -47,8 +47,6 @@ # other ports # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail -# Requires ATL for ARM64 to be installed in CI -azure-storage-cpp:arm64-windows=fail aubio:arm-uwp=fail aubio:x64-uwp=fail From f0aa678b7471497f1adedcc99f40e1599ad22f69 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Mon, 18 Apr 2022 09:49:16 -0700 Subject: [PATCH 007/383] [opentelemetry-cpp] update version to 1.3.0 (#24170) --- ports/opentelemetry-cpp/portfile.cmake | 4 ++-- ports/opentelemetry-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opentelemetry-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index aead2761e630e2..b8dcab966d1123 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp - REF v1.2.0 - SHA512 5491fc21074f86d3b4ad5e8f7b16168b736491952942b7821984c4564fcb26f73630d83fe74ee7878848240a1b511f893e079154f42013bfe3bf1fd03c114c6d + REF v1.3.0 + SHA512 38f613c208ec847c8bf7765732d8198fcc427c293a929945d72c2f739e89d2a0ad36be4d94cc3c1b77fd7b1f1d1e5d8bdb38094a493ba3da3125281cd1016836 HEAD_REF main ) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 1eb422a229ac46..659a02dd7068ca 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.2.0", + "version-semver": "1.3.0", "description": [ "OpenTelemetry is a collection of tools, APIs, and SDKs.", "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." diff --git a/versions/baseline.json b/versions/baseline.json index 37298dfa76f8e9..5740f5e8574151 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5177,7 +5177,7 @@ "port-version": 4 }, "opentelemetry-cpp": { - "baseline": "1.2.0", + "baseline": "1.3.0", "port-version": 0 }, "opentracing": { diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index f10a1c230048a7..64778c37162557 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ab7ef25acedde2552479fda46f92716afa53c98", + "version-semver": "1.3.0", + "port-version": 0 + }, { "git-tree": "c8c4bd4f115feaa3faed25dc74c695c1627d4f0d", "version-semver": "1.2.0", From 48d15f4db6593ec677a9e0625537d227b308b4d5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 18 Apr 2022 19:56:00 +0200 Subject: [PATCH 008/383] [wxwidgets] Validate and fix (#24047) * Add wxwidgets example and test port * Fix library processing for export Split original patch. Restore missing appending in the end. Drop libs (generator expression) which don't match build type. * Make wx-config relocatable * Rewrite wrapper * Add missing libjpeg-turbo dependency * Fixup wxrc * Update usage * Validate release/debug consistency * Fixup wx-config symlink * Use non-deprecated license expression * Fix portfile quirks * Transform installation fixup into patch * Fix mingw * Control curl dependency * Add message for linux system package dependencies * Update versions * Resolve linux lib issues * Update versions * Minor amendments * Update versions * Update requirements warning * Update versions * CR request: Move CMakelists.txt to example dir * CR requests: Revise wrapper * Update versions --- .../wxwidgets/disable-platform-lib-dir.patch | 13 --- ports/wxwidgets/example/CMakeLists.txt | 21 ++++ ports/wxwidgets/fix-libs-export.patch | 36 +++++++ ports/wxwidgets/fix-linux-configure.patch | 34 ------ ports/wxwidgets/install-layout.patch | 52 +++++++++ ports/wxwidgets/mingw-output-name.patch | 21 ++++ ports/wxwidgets/portfile.cmake | 101 +++++++++++++----- ports/wxwidgets/relocatable-wx-config.patch | 49 +++++++++ ports/wxwidgets/usage | 1 + ports/wxwidgets/vcpkg-cmake-wrapper.cmake | 87 +++++++++++---- ports/wxwidgets/vcpkg.json | 17 ++- scripts/test_ports/cmake-user/vcpkg.json | 4 + .../vcpkg-ci-wxwidgets/portfile.cmake | 13 +++ .../test_ports/vcpkg-ci-wxwidgets/vcpkg.json | 38 +++++++ versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 + 16 files changed, 393 insertions(+), 101 deletions(-) delete mode 100644 ports/wxwidgets/disable-platform-lib-dir.patch create mode 100644 ports/wxwidgets/example/CMakeLists.txt create mode 100644 ports/wxwidgets/fix-libs-export.patch create mode 100644 ports/wxwidgets/install-layout.patch create mode 100644 ports/wxwidgets/mingw-output-name.patch create mode 100644 ports/wxwidgets/relocatable-wx-config.patch create mode 100644 scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json diff --git a/ports/wxwidgets/disable-platform-lib-dir.patch b/ports/wxwidgets/disable-platform-lib-dir.patch deleted file mode 100644 index 930477c010327d..00000000000000 --- a/ports/wxwidgets/disable-platform-lib-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index d013e92..c03135d 100644 ---- a/build/cmake/init.cmake -+++ b/build/cmake/init.cmake -@@ -149,7 +149,7 @@ else() - set(wxCOMPILER_PREFIX) - endif() - --if(MSVC) -+if(MSVC AND NOT wxBUILD_DISABLE_PLATFORM_LIB_DIR) - if(wxBUILD_SHARED) - set(lib_suffix "dll") - else() diff --git a/ports/wxwidgets/example/CMakeLists.txt b/ports/wxwidgets/example/CMakeLists.txt new file mode 100644 index 00000000000000..b9fc010314a7be --- /dev/null +++ b/ports/wxwidgets/example/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.7) + +project(wxwidgets-example) + +add_executable(main WIN32 popup.cpp) + +find_package(wxWidgets REQUIRED) +target_compile_definitions(main PRIVATE ${wxWidgets_DEFINITIONS} "$<$:${wxWidgets_DEFINITIONS_DEBUG}>") +target_include_directories(main PRIVATE ${wxWidgets_INCLUDE_DIRS}) +target_link_libraries(main PRIVATE ${wxWidgets_LIBRARIES}) + +option(USE_WXRC "Use the wxrc resource compiler" ON) +if(USE_WXRC) + execute_process( + COMMAND "${wxWidgets_wxrc_EXECUTABLE}" --help + RESULTS_VARIABLE error_result + ) + if(error_result) + message(FATAL_ERROR "Failed to run wxWidgets_wxrc_EXECUTABLE (${wxWidgets_wxrc_EXECUTABLE})") + endif() +endif() diff --git a/ports/wxwidgets/fix-libs-export.patch b/ports/wxwidgets/fix-libs-export.patch new file mode 100644 index 00000000000000..35e1379ff01fea --- /dev/null +++ b/ports/wxwidgets/fix-libs-export.patch @@ -0,0 +1,36 @@ +diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake +index 91d11ac..2791466 100644 +--- a/build/cmake/config.cmake ++++ b/build/cmake/config.cmake +@@ -41,7 +41,30 @@ macro(wx_get_dependencies var lib) + endif() + set(dep_name "-l${dep_name}") + else() +- get_filename_component(dep_name ${dep} NAME) ++ # For the value like $<$:LIB_PATH> ++ # Or $<$>:LIB_PATH> ++ if(dep MATCHES "^(.+>):(.+)>$") ++ if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_MATCH_1 STREQUAL [[$<$>]]) ++ continue() ++ elseif(CMAKE_BUILD_TYPE STREQUAL "Release" AND CMAKE_MATCH_1 STREQUAL [[$<$]]) ++ continue() ++ endif() ++ set(dep_name "${CMAKE_MATCH_2}") ++ else() ++ set(dep_name ${dep}) ++ endif() ++ endif() ++ if(dep_name STREQUAL "libc.so") ++ continue() # don't include this library ++ elseif(dep_name MATCHES "^-") # -l, -framework, -weak_framework ++ # ok ++ elseif(dep_name MATCHES "^lib(.*)(.so|.dylib|.tbd|.a)$") ++ set(dep_name "-l${CMAKE_MATCH_1} ") ++ elseif(dep_name) ++ get_filename_component(abs_path ${dep_name} PATH) ++ if (NOT abs_path) ++ set(dep_name "-l${dep_name} ") ++ endif() + endif() + wx_string_append(${var} "${dep_name} ") + endforeach() diff --git a/ports/wxwidgets/fix-linux-configure.patch b/ports/wxwidgets/fix-linux-configure.patch index 059bb42b7bb097..0fc85bf0802af9 100644 --- a/ports/wxwidgets/fix-linux-configure.patch +++ b/ports/wxwidgets/fix-linux-configure.patch @@ -13,37 +13,3 @@ index bb69643..09b52a6 100644 cotire_get_source_files_compile_definitions( "${_config}" "${_language}" COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig} ${_targetSources}) endforeach() -diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake -index 91d11ac..2791466 100644 ---- a/build/cmake/config.cmake -+++ b/build/cmake/config.cmake -@@ -41,9 +41,27 @@ macro(wx_get_dependencies var lib) - endif() - set(dep_name "-l${dep_name}") - else() -- get_filename_component(dep_name ${dep} NAME) -+ # For the value like $<$:LIB_PATH> -+ # Or $<$>:LIB_PATH> -+ string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_name ${dep}) -+ if (NOT dep_name) -+ set(dep_name ${dep}) -+ endif() -+ endif() -+ if(dep_name STREQUAL "libc.so") -+ # don't include this library -+ elseif(dep_name MATCHES "^-(.*)$") # -l, -framework, -weak_framework -+ wx_string_append(${var} "${dep_name} ") -+ elseif(dep_name MATCHES "^lib(.*)(.so|.dylib|.tbd|.a)$") -+ wx_string_append(${var} "-l${CMAKE_MATCH_1} ") -+ elseif(dep_name) -+ get_filename_component(abs_path ${dep_name} PATH) -+ if (abs_path) # value contains path -+ wx_string_append(${var} "${dep_name} ") -+ else() -+ wx_string_append(${var} "-l${dep_name} ") -+ endif() - endif() -- wx_string_append(${var} "${dep_name} ") - endforeach() - string(STRIP ${${var}} ${var}) - endif() diff --git a/ports/wxwidgets/install-layout.patch b/ports/wxwidgets/install-layout.patch new file mode 100644 index 00000000000000..bb99dd0071ead8 --- /dev/null +++ b/ports/wxwidgets/install-layout.patch @@ -0,0 +1,52 @@ +diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake +index 902b7c5..dba3d07 100644 +--- a/build/cmake/functions.cmake ++++ b/build/cmake/functions.cmake +@@ -374,7 +374,7 @@ macro(wx_add_library name) + wx_install(TARGETS ${name} + LIBRARY DESTINATION "lib${wxPLATFORM_LIB_DIR}" + ARCHIVE DESTINATION "lib${wxPLATFORM_LIB_DIR}" +- RUNTIME DESTINATION "lib${wxPLATFORM_LIB_DIR}" ++ RUNTIME DESTINATION "bin" + BUNDLE DESTINATION Applications/wxWidgets + ) + endif() +diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake +index 0bc4f93..65fe3b8 100644 +--- a/build/cmake/init.cmake ++++ b/build/cmake/init.cmake +@@ -149,7 +149,7 @@ else() + set(wxCOMPILER_PREFIX) + endif() + +-if(MSVC) ++if(MSVC AND NOT wxBUILD_DISABLE_PLATFORM_LIB_DIR) + if(wxBUILD_SHARED) + set(lib_suffix "dll") + else() +diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake +index 968dff8..5b4fda9 100644 +--- a/build/cmake/install.cmake ++++ b/build/cmake/install.cmake +@@ -45,7 +45,7 @@ else() + + install(DIRECTORY DESTINATION "bin") + install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ ++ COMMAND ${CMAKE_COMMAND} -E copy \ + ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \ + ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ + )" +diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt +index 4108d6a..19d730e 100644 +--- a/build/cmake/utils/CMakeLists.txt ++++ b/build/cmake/utils/CMakeLists.txt +@@ -39,7 +39,7 @@ if(wxUSE_XRC) + )" + ) + install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ ++ COMMAND ${CMAKE_COMMAND} -E copy \ + ${CMAKE_INSTALL_PREFIX}/bin/wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \ + ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \ + )" diff --git a/ports/wxwidgets/mingw-output-name.patch b/ports/wxwidgets/mingw-output-name.patch new file mode 100644 index 00000000000000..772ac0743d4fdd --- /dev/null +++ b/ports/wxwidgets/mingw-output-name.patch @@ -0,0 +1,21 @@ +diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake +index 902b7c5..ad8d1c4 100644 +--- a/build/cmake/functions.cmake ++++ b/build/cmake/functions.cmake +@@ -184,7 +184,6 @@ function(wx_set_target_properties target_name is_base) + set_target_properties(${target_name} + PROPERTIES + OUTPUT_NAME "wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}" +- OUTPUT_NAME_DEBUG "wx_${lib_toolkit}${lib_unicode}d${lib_flavour}${lib_suffix}-${lib_version}" + PREFIX "lib" + ) + endif() +@@ -486,7 +485,7 @@ function(wx_set_builtin_target_properties target_name) + PROPERTIES + OUTPUT_NAME ${target_name}${lib_unicode}${postfix} + ) +- if(WIN32) ++ if(WIN32 AND NOT MINGW) + set_target_properties(${target_name} + PROPERTIES + OUTPUT_NAME_DEBUG ${target_name}${lib_unicode}d diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 441943a4a18f41..2bf7be2680a7bf 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -5,23 +5,50 @@ vcpkg_from_github( SHA512 33817f766b36d24e5e6f4eb7666f2e4c1ec305063cb26190001e0fc82ce73decc18697e8005da990a1c99dc1ccdac9b45bb2bbe5ba73e6e2aa860c768583314c HEAD_REF master PATCHES - disable-platform-lib-dir.patch + install-layout.patch + mingw-output-name.patch fix-build.patch fix-linux-configure.patch # Remove this patch in the next update + fix-libs-export.patch + relocatable-wx-config.patch ) -set(OPTIONS) +if(VCPKG_TARGET_IS_LINUX) + message(WARNING [[ +Port wxwidgets currently requires the following packages from the system package manager: + pkg-config + GTK 3 + libsecret + libgcrypt + libsystemd +These development packages can be installed on Ubuntu systems via + sudo apt-get install pkg-config libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev +]]) + foreach(conflicting_port IN ITEMS freetype glib) + if(EXISTS "${CURRENT_INSTALLED_DIR}/share/${conflicting_port}/copyright") + message(FATAL_ERROR "Port ${conflicting_port} must not be installed when building ${PORT}:${TARGET_TRIPLET}.") + endif() + endforeach() +endif() + +set(OPTIONS "") if(VCPKG_TARGET_IS_OSX) - set(OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) + list(APPEND OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) endif() -if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm) - set(OPTIONS +if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) + list(APPEND OPTIONS -DwxUSE_OPENGL=OFF -DwxUSE_STACKWALKER=OFF ) endif() +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) + list(APPEND OPTIONS -DwxUSE_WEBREQUEST_CURL=OFF) +else() + list(APPEND OPTIONS -DwxUSE_WEBREQUEST_CURL=ON) +endif() + # wxWidgets on Linux currently needs to find the system's `gtk+-3.0.pc`. # vcpkg's port pkgconf would prevent this lookup. if(VCPKG_TARGET_IS_LINUX AND NOT VCPKG_CROSSCOMPILING AND NOT DEFINED ENV{PKG_CONFIG}) @@ -29,6 +56,9 @@ if(VCPKG_TARGET_IS_LINUX AND NOT VCPKG_CROSSCOMPILING AND NOT DEFINED ENV{PKG_CO if(system_pkg_config) set(ENV{PKG_CONFIG} "${system_pkg_config}") endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND OPTIONS -DPKG_CONFIG_ARGN=--static) + endif() endif() # This may be set to ON by users in a custom triplet. @@ -59,30 +89,17 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -if (VCPKG_TARGET_IS_WINDOWS) - file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") - if(DLLS) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - foreach(DLL IN LISTS DLLS) - get_filename_component(N "${DLL}" NAME) - file(RENAME "${DLL}" "${CURRENT_PACKAGES_DIR}/bin/${N}") - endforeach() - endif() - file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") - if(DLLS) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - foreach(DLL IN LISTS DLLS) - get_filename_component(N "${DLL}" NAME) - file(RENAME "${DLL}" "${CURRENT_PACKAGES_DIR}/debug/bin/${N}") - endforeach() +set(tools wxrc) +if(VCPKG_TARGET_IS_MINGW OR NOT VCPKG_TARGET_IS_WINDOWS) + list(APPEND tools wxrc-3.1) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/wx-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wx-config") + if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/wx-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/wx-config") endif() endif() - -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_copy_tools(TOOL_NAMES wxrc AUTO_CLEAN) -else() - vcpkg_copy_tools(TOOL_NAMES wxrc wx-config wxrc-3.1 AUTO_CLEAN) -endif() +vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) # do the copy pdbs now after the dlls got moved to the expected /bin folder above vcpkg_copy_pdbs() @@ -128,7 +145,33 @@ if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/wx/setup.h") configure_file("${CMAKE_CURRENT_LIST_DIR}/setup.h.in" "${CURRENT_PACKAGES_DIR}/include/wx/setup.h" @ONLY) endif() -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) +file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/wx/config/*" "${CURRENT_PACKAGES_DIR}/tools/wx-config") +foreach(config IN LISTS configs) + vcpkg_replace_string("${config}" "${CURRENT_INSTALLED_DIR}" [[${prefix}]]) +endforeach() +file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/debug/lib/wx/config/*") +foreach(config IN LISTS configs) + vcpkg_replace_string("${config}" "${CURRENT_INSTALLED_DIR}/debug" [[${prefix}]]) +endforeach() + +# For CMake multi-config in connection with wrapper +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") + file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib/mswud/wx" + ) +endif() + +if("example" IN_LIST FEATURES) + file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/example/CMakeLists.txt" + "${SOURCE_PATH}/samples/popup/popup.cpp" + "${SOURCE_PATH}/samples/sample.xpm" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/example/popup.cpp" "../sample.xpm" "sample.xpm") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/docs/licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/wxwidgets/relocatable-wx-config.patch b/ports/wxwidgets/relocatable-wx-config.patch new file mode 100644 index 00000000000000..8a5e7c4d5bc69e --- /dev/null +++ b/ports/wxwidgets/relocatable-wx-config.patch @@ -0,0 +1,49 @@ +diff --git a/wx-config.in b/wx-config.in +index 441f88c..b326867 100755 +--- a/wx-config.in ++++ b/wx-config.in +@@ -91,7 +91,7 @@ EOF + + + # Contentious tools determined by configure. +-EGREP="@EGREP@" ++EGREP="grep -E" # no absolute path from host + + + # For the people who know what they want, or think they do: +@@ -402,8 +402,23 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } + + + # Determine the base directories we require. +-prefix=${input_option_prefix-${this_prefix:-@prefix@}} +-exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}} ++vcpkg_prefix=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P) ++case "$vcpkg_prefix" in ++ */lib/wx/config) ++ vcpkg_prefix=${vcpkg_prefix%/*/*/*} ++ ;; ++ */tools/wxwidgets/debug) ++ vcpkg_prefix=${vcpkg_prefix%/*/*/*}/debug ++ ;; ++ */tools/wxwidgets) ++ vcpkg_prefix=${vcpkg_prefix%/*/*} ++ ;; ++esac ++if [ -n "@MINGW@" -a -n "@CMAKE_HOST_WIN32@" ]; then ++ vcpkg_prefix=$(cygpath -m "$vcpkg_prefix") ++fi ++prefix=${input_option_prefix-${this_prefix:-$vcpkg_prefix}} ++exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-$prefix}}} + wxconfdir="@libdir@/wx/config" + + installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` +@@ -940,6 +949,9 @@ prefix=${this_prefix-$prefix} + exec_prefix=${this_exec_prefix-$exec_prefix} + + includedir="@includedir@" ++if [ "@CMAKE_BUILD_TYPE@" = "Debug" ] ; then ++ includedir="${includedir%/debug/include}/include" ++fi + libdir="@libdir@" + bindir="@bindir@" + diff --git a/ports/wxwidgets/usage b/ports/wxwidgets/usage index e873e4ae343aa8..f86b406196a8b6 100644 --- a/ports/wxwidgets/usage +++ b/ports/wxwidgets/usage @@ -1,5 +1,6 @@ The package wxwidgets provides CMake integration: find_package(wxWidgets REQUIRED) + target_compile_definitions(main PRIVATE ${wxWidgets_DEFINITIONS} "$<$:${wxWidgets_DEFINITIONS_DEBUG}>") target_include_directories(main PRIVATE ${wxWidgets_INCLUDE_DIRS}) target_link_libraries(main PRIVATE ${wxWidgets_LIBRARIES}) diff --git a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake index 55557b36097a05..a7563f68ded208 100644 --- a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake +++ b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake @@ -1,25 +1,70 @@ -set(wxWidgets_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." CACHE INTERNAL "" FORCE) -set(WX_ROOT_DIR "${wxWidgets_ROOT_DIR}") -set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "" FORCE) -set(WX_LIB_DIR "${wxWidgets_LIB_DIR}") -find_library(WX_based NAMES wxbase31ud PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) -file(GLOB WX_DEBUG_LIBS "${wxWidgets_ROOT_DIR}/debug/lib/wx*d_*.lib") -foreach(WX_DEBUG_LIB ${WX_DEBUG_LIBS}) - string(REGEX REPLACE ".*wx([^/]*)d_([^/\\.]*)\\.[^/\\.]*\$" "WX_\\2d" varname "${WX_DEBUG_LIB}") - set(${varname} "${WX_DEBUG_LIB}" CACHE INTERNAL "" FORCE) -endforeach() -_find_package(${ARGS}) -find_package(ZLIB QUIET) -find_package(libpng CONFIG QUIET) -find_package(TIFF QUIET) -find_package(expat CONFIG QUIET) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) + +get_filename_component(_vcpkg_wx_root "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) +set(wxWidgets_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") +set(WX_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") +unset(_vcpkg_wx_root) -if(wxWidgets_LIBRARIES AND NOT wxWidgets_LIBRARIES MATCHES "TIFF::TIFF;png;expat::expat;ZLIB::ZLIB") - list(APPEND wxWidgets_LIBRARIES "TIFF::TIFF;expat::expat;ZLIB::ZLIB") +if(MINGW) + # Force FindwxWidgets.cmake unix mode, matching mingw install layout + set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") + set(CMAKE_CROSSCOMPILING 1) +elseif(WIN32) + # Force FindwxWidgets.cmake win32 mode, matching win32 install layout + set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") + set(CMAKE_CROSSCOMPILING 0) +endif() - if (TARGET png) - list(APPEND wxWidgets_LIBRARIES "png") - elseif(TARGET png_static) - list(APPEND wxWidgets_LIBRARIES "png_static") +if(WIN32 AND NOT CMAKE_CROSSCOMPILING) + # FindwxWidgets.cmake win32 mode, multi-config + # Get cache variables for debug libs + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/debug/lib" CACHE INTERNAL "") + set(WX_LIB_DIR "${wxWidgets_LIB_DIR}" CACHE INTERNAL "") + _find_package(${ARGS}) + # Reset for regular lookup + unset(wxWidgets_CONFIGURATION CACHE) + set(WX_CONFIGURATION_LIST "") + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "") +else() + # FindwxWidgets.cmake unix mode, single-config + set(_vcpkg_wxconfig "") + if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR "Debug" IN_LIST MAP_IMPORTED_CONFIG_${CMAKE_BUILD_TYPE}) + # Debug + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/debug/lib" CACHE INTERNAL "") + file(GLOB _vcpkg_wxconfig LIST_DIRECTORIES false "${wxWidgets_LIB_DIR}/wx/config/*") endif() + if(NOT _vcpkg_wxconfig) + # Release or fallback + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "") + file(GLOB _vcpkg_wxconfig LIST_DIRECTORIES false "${wxWidgets_LIB_DIR}/wx/config/*") + endif() + set(wxWidgets_CONFIG_EXECUTABLE "${_vcpkg_wxconfig}" CACHE INTERNAL "") + unset(_vcpkg_wxconfig) endif() +set(WX_LIB_DIR "${wxWidgets_LIB_DIR}" CACHE INTERNAL "") + +_find_package(${ARGS}) + +if(DEFINED _vcpkg_wxwidgets_backup_crosscompiling) + set(CMAKE_CROSSCOMPILING "${_vcpkg_wxwidgets_backup_crosscompiling}") + unset(_vcpkg_wxwidgets_backup_crosscompiling) +endif() + +if(WIN32 AND NOT MINGW AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + find_package(EXPAT QUIET) + find_package(JPEG QUIET) + find_package(PNG QUIET) + find_package(TIFF QUIET) + find_package(ZLIB QUIET) + list(APPEND wxWidgets_LIBRARIES + ${EXPAT_LIBRARIES} + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ${TIFF_LIBRARIES} + ${ZLIB_LIBRARIES} + ) +endif() + +cmake_policy(POP) diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 9a4cdf2a8fb8a1..5f504972e23cfd 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,17 +1,23 @@ { "name": "wxwidgets", "version-semver": "3.1.5", - "port-version": 8, + "port-version": 9, "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", "Set WXWIDGETS_USE_STD_CONTAINERS in a custom triplet to build with the wxUSE_STD_CONTAINERS build option." ], "homepage": "https://github.com/wxWidgets/wxWidgets", - "license": "wxWindows", + "license": "LGPL-2.0-or-later WITH WxWindows-exception-3.1", "supports": "!uwp", "dependencies": [ + { + "name": "curl", + "default-features": false, + "platform": "!windows & !osx" + }, "expat", + "libjpeg-turbo", "libpng", "tiff", { @@ -23,5 +29,10 @@ "host": true }, "zlib" - ] + ], + "features": { + "example": { + "description": "Example source code and CMake project" + } + } } diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index 73907dfdcdfc7b..459086f246f8ca 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -72,6 +72,10 @@ "$package": "TIFF", "name": "tiff" }, + { + "$package": "wxWidgets", + "name": "wxwidgets" + }, { "$package": "ZLIB", "name": "zlib" diff --git a/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake b/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake new file mode 100644 index 00000000000000..e69c2351ae1a44 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake @@ -0,0 +1,13 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS + FEATURES + wxrc USE_WXRC +) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_INSTALLED_DIR}/share/wxwidgets/example" + OPTIONS + ${OPTIONS} +) +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json b/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json new file mode 100644 index 00000000000000..188d1069db05a9 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "vcpkg-ci-wxwidgets", + "version-date": "2022-04-05", + "description": "Builds a GUI app in order to validate the wxwidgets port.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "wxwidgets", + "features": [ + "example" + ] + } + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Default features depending on system", + "dependencies": [ + { + "name": "vcpkg-ci-wxwidgets", + "default-features": false, + "features": [ + "wxrc" + ], + "platform": "native" + } + ] + }, + "wxrc": { + "description": "Test wxrc" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 5740f5e8574151..ef9873909592b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7510,7 +7510,7 @@ }, "wxwidgets": { "baseline": "3.1.5", - "port-version": 8 + "port-version": 9 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index ec844293847ab8..392562d2375f5d 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26ad66271632adb4d00a270a90ad18514025859e", + "version-semver": "3.1.5", + "port-version": 9 + }, { "git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f", "version-semver": "3.1.5", From 06a513718c937be4a1d0cf38dfdf4d6803f718cd Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Mon, 18 Apr 2022 14:14:56 -0700 Subject: [PATCH 009/383] [zeroc-ice] correct windows-static and linux (#24169) * [zeroc-ice] correct windows-static and linux * remove tabs * does this work to fix mcppd? * remove the ability for zeroc-ice to depend on external libs * remove feature supports Co-authored-by: nicole mazzuca --- ports/zeroc-ice/mcppd_fix.patch | 24 ++++++++++++++++++++++++ ports/zeroc-ice/portfile.cmake | 22 ++++++++++++++++++---- ports/zeroc-ice/vcpkg.json | 9 +++------ versions/baseline.json | 2 +- versions/z-/zeroc-ice.json | 5 +++++ 5 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 ports/zeroc-ice/mcppd_fix.patch diff --git a/ports/zeroc-ice/mcppd_fix.patch b/ports/zeroc-ice/mcppd_fix.patch new file mode 100644 index 00000000000000..3502af87191247 --- /dev/null +++ b/ports/zeroc-ice/mcppd_fix.patch @@ -0,0 +1,24 @@ +--- a/config/Make.project.rules 2022-01-17 10:28:23.000000000 ++++ b/config/Make.project.rules 2022-04-18 12:15:19.000000000 +@@ -1050,17 +1050,17 @@ + # + # $(call make-lib,$1=libname) + # + define make-lib + ifneq ($($1_home),) + # Check for 3rd party libraries either in home/lib or home/lib +-$1_installdir = $$($1_home)/lib$$(call platform-var,installdir,$1,$$($$2_platform),$$($$2_config),$$2) +-$1_libdir ?= $$(strip $$(if $$(wildcard $$($1_installdir)),$$($1_installdir),$$($1_home)/lib)) +-$1_includedir ?= $$($1_home)/include ++$1_installdir = ++$1_libdir ?= ++$1_includedir ?= + endif +-$1_ldflags ?= -l$1 ++$1_ldflags ?= -l$$(if $$(and $$(filter mcpp,$1),$$(filter no,$$(OPTIMIZE))),$1d,$1) + endef + + # + # $(call repathfromdir,path) + # + # Returns reversed relative path for directory (e.g.: test/Ice/operations diff --git a/ports/zeroc-ice/portfile.cmake b/ports/zeroc-ice/portfile.cmake index 79cfb5a00fd545..c1eaf7d02192e6 100644 --- a/ports/zeroc-ice/portfile.cmake +++ b/ports/zeroc-ice/portfile.cmake @@ -4,16 +4,16 @@ vcpkg_from_github( REPO zeroc-ice/ice REF v3.7.7 SHA512 73c3a2bb14c9e145383e4026206edd3e03b29c60a33af628611bfdab71d69a3aed108ce4e6cbfd67eb852560110e3495b4bd238c8cdf0de9d1f8e2f1088513ee - PATCHES md5i_fix.patch slice2swift.patch + PATCHES md5i_fix.patch slice2swift.patch mcppd_fix.patch ) set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME) +set(UNIX_BUILD_DIR "${SOURCE_PATH}") set(WIN_DEBUG_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/${SOURCE_PATH_SUFFIX}) set(WIN_RELEASE_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/${SOURCE_PATH_SUFFIX}) -set(UNIX_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/src/${SOURCE_PATH_SUFFIX}) # install_includes function(install_includes ORIGINAL_PATH RELATIVE_PATHS) @@ -132,6 +132,20 @@ if("icediscovery" IN_LIST FEATURES) endif() if(NOT VCPKG_TARGET_IS_WINDOWS) + # Clean up for the first round (important for install --editable) + vcpkg_execute_build_process( + COMMAND make distclean + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-clean-${TARGET_TRIPLET} + ) + + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") + endif() + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") + endif() + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") # Setting these as environment variables, as .d files aren't generated # the first time passing them as arguments to make. @@ -248,12 +262,12 @@ else() # VCPKG_TARGET_IS_WINDOWS SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH "cpp/msbuild/ice.${VCPKG_PLATFORM_TOOLSET}.sln" SKIP_CLEAN - TARGET "C++11\\ice++11" + TARGET "C++11\\ice++11" USE_VCPKG_INTEGRATION OPTIONS /p:UseVcpkg=yes /p:IceBuildingSrc=yes - ${ICE_OPTIONAL_COMPONENTS_MSBUILD} + ${ICE_OPTIONAL_COMPONENTS_MSBUILD} ) if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll") diff --git a/ports/zeroc-ice/vcpkg.json b/ports/zeroc-ice/vcpkg.json index bd2f3013c623c3..fa2d4c4968b8f3 100644 --- a/ports/zeroc-ice/vcpkg.json +++ b/ports/zeroc-ice/vcpkg.json @@ -1,11 +1,12 @@ { "name": "zeroc-ice", "version": "3.7.7", + "port-version": 1, "maintainers": "Benjamin Oldenburg ", "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", "homepage": "https://github.com/zeroc-ice/ice", "license": null, - "supports": "!uwp & !(windows & arm) & !wasm32", + "supports": "!uwp & !(windows & arm) & !(windows & staticcrt) & !wasm32", "dependencies": [ "bzip2", "expat", @@ -23,7 +24,6 @@ }, "glacier2router": { "description": "Glacier2Router", - "supports": "!static", "dependencies": [ { "name": "zeroc-ice", @@ -38,8 +38,7 @@ "description": "IceBox libraries and runtime" }, "iceboxtools": { - "description": "IceBox tools", - "supports": "!static" + "description": "IceBox tools" }, "icebridge": { "description": "IceBridge", @@ -79,7 +78,6 @@ }, "icegridtools": { "description": "IceGrid tools", - "supports": "!static", "dependencies": [ "expat", { @@ -107,7 +105,6 @@ }, "icestormtools": { "description": "IceStorm tools", - "supports": "!static", "dependencies": [ "lmdb", { diff --git a/versions/baseline.json b/versions/baseline.json index ef9873909592b0..c021f61583e4ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7658,7 +7658,7 @@ }, "zeroc-ice": { "baseline": "3.7.7", - "port-version": 0 + "port-version": 1 }, "zeromq": { "baseline": "4.3.4", diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json index f0e580ba7cc94a..cf4a0d74ce330f 100644 --- a/versions/z-/zeroc-ice.json +++ b/versions/z-/zeroc-ice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f32e4c338e25d36018095348e632c794b13fc513", + "version": "3.7.7", + "port-version": 1 + }, { "git-tree": "bdb180069d461c04c1eee1a7937afa63d0ea752b", "version": "3.7.7", From 84f0ea23aa3164da9ff5ae1d28813612f0577c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 18 Apr 2022 23:17:02 +0200 Subject: [PATCH 010/383] [libgcrypt] new stable release (1.10.1) (#24216) * [libgcrypt] new stable 1.10.1 release * [libgcrypt] update versions --- ports/libgcrypt/portfile.cmake | 4 ++-- ports/libgcrypt/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libgcrypt.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libgcrypt/portfile.cmake b/ports/libgcrypt/portfile.cmake index 774868592108ac..b1fe3263493f08 100644 --- a/ports/libgcrypt/portfile.cmake +++ b/ports/libgcrypt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL git://git.gnupg.org/libgcrypt.git - FETCH_REF libgcrypt-1.9.4 - REF 05422ca24a0391dad2a0b7790a904ce348819c10 # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=05422ca24a0391dad2a0b7790a904ce348819c10 + FETCH_REF libgcrypt-1.10.1 + REF ae0e567820c37f9640440b3cff77d7c185aa6742 # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=tag;h=a8a888c9d2ed8a25ff502b104860a1bac4c4f73c HEAD_REF master ) diff --git a/ports/libgcrypt/vcpkg.json b/ports/libgcrypt/vcpkg.json index f70325d4f08e77..af8486011caf65 100644 --- a/ports/libgcrypt/vcpkg.json +++ b/ports/libgcrypt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libgcrypt", - "version": "1.9.4", - "port-version": 2, + "version": "1.10.1", "description": "A general purpose cryptographic library", "homepage": "https://gnupg.org/software/libgcrypt/index.html", "supports": "linux | osx", diff --git a/versions/baseline.json b/versions/baseline.json index c021f61583e4ab..064df04192f083 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3569,8 +3569,8 @@ "port-version": 3 }, "libgcrypt": { - "baseline": "1.9.4", - "port-version": 2 + "baseline": "1.10.1", + "port-version": 0 }, "libgd": { "baseline": "2.3.2", diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json index cee2cf03ba7e6e..133aaffeda11d9 100644 --- a/versions/l-/libgcrypt.json +++ b/versions/l-/libgcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba183f10b284405f9b4b50720d7583131a87d393", + "version": "1.10.1", + "port-version": 0 + }, { "git-tree": "8c0737adf68a0ada3ed976e4acf201b4cbeb9dfe", "version": "1.9.4", From 7cd3196145843193212bb141ec5bf43c56f9e58a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 18 Apr 2022 23:33:43 +0200 Subject: [PATCH 011/383] [libpng] Fix and cleanup (#24211) * Fix unused CMake variable warning * Acquire msys only on Windows * Revise APNG variable names and usage * Fix download mode usability with APNG * Uncompress APNG patch with gzip gzip is a default package of MSYS2 and (most) other systems. 7z download is implemented for windows only. * Revise main CMake patches cmake.patch deals with libpng build configuration. fix-export-targets deals with cmake config export. * Revise pkgconfig patching and fixup * Additional cleanup * Add usage based on FindPNG.cmake * Update versions Co-authored-by: Leonid Pospelov --- ports/libpng/cmake.patch | 44 ++------ ports/libpng/fix-export-targets.patch | 64 ++--------- ports/libpng/pkgconfig.2.patch | 48 -------- ports/libpng/pkgconfig.patch | 50 ++++---- ports/libpng/portfile.cmake | 138 ++++++++--------------- ports/libpng/usage | 4 + ports/libpng/vcpkg.json | 3 +- scripts/test_ports/cmake-user/vcpkg.json | 15 ++- versions/baseline.json | 2 +- versions/l-/libpng.json | 5 + 10 files changed, 118 insertions(+), 255 deletions(-) delete mode 100644 ports/libpng/pkgconfig.2.patch create mode 100644 ports/libpng/usage diff --git a/ports/libpng/cmake.patch b/ports/libpng/cmake.patch index f2eb6aa8e10117..f8cd527f53b0bc 100644 --- a/ports/libpng/cmake.patch +++ b/ports/libpng/cmake.patch @@ -1,8 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6451fcf..6599e1d 100644 +index a8e5100..0ccac52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -44,7 +44,7 @@ if(NOT PNG_BUILD_ZLIB) +@@ -40,11 +40,11 @@ option(PNG_BUILD_ZLIB "Custom zlib Location, else find_package is used" OFF) + + if(NOT PNG_BUILD_ZLIB) + find_package(ZLIB REQUIRED) +- include_directories(${ZLIB_INCLUDE_DIR}) ++ set(ZLIB_LIBRARY ZLIB::ZLIB) endif() if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) @@ -11,37 +16,12 @@ index 6451fcf..6599e1d 100644 else() # libm is not needed and/or not available set(M_LIBRARY "") -@@ -551,21 +551,14 @@ endif() - - if(PNG_STATIC) - # does not work without changing name -- set(PNG_LIB_NAME_STATIC png_static) - add_library(png_static STATIC ${libpng_sources}) - add_dependencies(png_static genfiles) +@@ -557,7 +557,7 @@ if(PNG_STATIC) # MSVC doesn't use a different file extension for shared vs. static # libs. We are able to change OUTPUT_NAME to remove the _static # for all other platforms. - if(NOT MSVC) -- set_target_properties(png_static PROPERTIES -- OUTPUT_NAME "${PNG_LIB_NAME}" -- CLEAN_DIRECT_OUTPUT 1) -- else() -- set_target_properties(png_static PROPERTIES -- OUTPUT_NAME "${PNG_LIB_NAME}_static" -- CLEAN_DIRECT_OUTPUT 1) -- endif() -+ set_target_properties(png_static PROPERTIES -+ OUTPUT_NAME "${PNG_LIB_NAME}" -+ CLEAN_DIRECT_OUTPUT 1) - list(APPEND PNG_LIB_TARGETS png_static) - if(MSVC) - # msvc does not append 'lib' - do it here to have consistent name -@@ -915,7 +908,7 @@ endif() - - # Create an export file that CMake users can include() to import our targets. - if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL) -- install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake) -+ install(EXPORT libpng DESTINATION lib/libpng FILE libpngConfig.cmake) - endif() - - # what's with libpng-manual.txt and all the extra files? ++ if(1) + set_target_properties(png_static PROPERTIES + OUTPUT_NAME "${PNG_LIB_NAME}" + CLEAN_DIRECT_OUTPUT 1) diff --git a/ports/libpng/fix-export-targets.patch b/ports/libpng/fix-export-targets.patch index ec331c48da58ad..23812c265e073a 100644 --- a/ports/libpng/fix-export-targets.patch +++ b/ports/libpng/fix-export-targets.patch @@ -1,65 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b45e878..19f8692 100644 +index 3931f12..b570fa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -536,7 +536,7 @@ if(PNG_SHARED) - set_target_properties(png PROPERTIES PREFIX "lib") - set_target_properties(png PROPERTIES IMPORT_PREFIX "lib") - endif() -- target_link_libraries(png ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png ZLIB::ZLIB ${M_LIBRARY}) - - if(UNIX AND AWK) - if(HAVE_LD_VERSION_SCRIPT) -@@ -564,7 +564,7 @@ if(PNG_STATIC) - # msvc does not append 'lib' - do it here to have consistent name - set_target_properties(png_static PROPERTIES PREFIX "lib") - endif() -- target_link_libraries(png_static ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png_static ZLIB::ZLIB ${M_LIBRARY}) - endif() - - if(PNG_FRAMEWORK) -@@ -581,7 +581,7 @@ if(PNG_FRAMEWORK) - XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" - PUBLIC_HEADER "${libpng_public_hdrs}" - OUTPUT_NAME png) -- target_link_libraries(png_framework ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png_framework ZLIB::ZLIB ${M_LIBRARY}) - endif() - - if(NOT PNG_LIB_TARGETS) -@@ -746,7 +746,7 @@ if(PNG_SHARED) - set(PNG_BIN_TARGETS pngfix) - - add_executable(png-fix-itxt ${png_fix_itxt_sources}) -- target_link_libraries(png-fix-itxt ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png-fix-itxt ZLIB::ZLIB ${M_LIBRARY}) - list(APPEND PNG_BIN_TARGETS png-fix-itxt) - endif() - -@@ -851,7 +851,7 @@ endif() - # INSTALL - if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - install(TARGETS ${PNG_LIB_TARGETS} -- EXPORT libpng -+ EXPORT libpng-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -919,7 +919,14 @@ endif() - +@@ -909,6 +909,12 @@ endif() # Create an export file that CMake users can include() to import our targets. if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL) -- install(EXPORT libpng DESTINATION lib/libpng FILE libpngConfig.cmake) -+ install(EXPORT libpng-targets DESTINATION lib/libpng) -+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" -+ [[include(CMakeFindDependencyMacro) + install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake) ++ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" " ++include(CMakeFindDependencyMacro) +find_dependency(ZLIB) -+include("${CMAKE_CURRENT_LIST_DIR}/libpng-targets.cmake") -+ ]]) -+ -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/libpng) ++include(\"\${CMAKE_CURRENT_LIST_DIR}/lib${PNG_LIB_NAME}.cmake\") ++") ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/libpng") endif() # what's with libpng-manual.txt and all the extra files? diff --git a/ports/libpng/pkgconfig.2.patch b/ports/libpng/pkgconfig.2.patch deleted file mode 100644 index 99c1b19300d950..00000000000000 --- a/ports/libpng/pkgconfig.2.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6451fcf..4090f42 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -821,20 +821,31 @@ endif() - # Only do this on Windows for Cygwin - the files don't make much sense outside - # of a UNIX look-alike. - if(NOT WIN32 OR CYGWIN OR MINGW) -- set(prefix ${CMAKE_INSTALL_PREFIX}) -- set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -- set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) -- set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) -- set(LIBS "-lz -lm") -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in -- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) -- create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc) -- -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in -- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY) -- create_symlink(libpng-config FILE ${PNGLIB_NAME}-config) -+ set(LIBS "-lz") -+ if(NOT APPLE) -+ string(APPEND LIBS " -lm") -+ endif() -+else() -+ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(LIBS "-lzlibd") -+ else() -+ set(LIBS "-lzlib") -+ endif() - endif() - -+set(prefix ${CMAKE_INSTALL_PREFIX}) -+set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -+set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) -+set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) -+ -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in -+ ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) -+create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc) -+ -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in -+ ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY) -+create_symlink(libpng-config FILE ${PNGLIB_NAME}-config) -+ - # SET UP LINKS - if(PNG_SHARED) - set_target_properties(png PROPERTIES diff --git a/ports/libpng/pkgconfig.patch b/ports/libpng/pkgconfig.patch index 5640f3834ca44c..437c86836ed898 100644 --- a/ports/libpng/pkgconfig.patch +++ b/ports/libpng/pkgconfig.patch @@ -1,24 +1,32 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6599e1d7d..c0bb2fad2 100644 +index 0ccac52..218747a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -894,13 +894,13 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) - install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3) - install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5) - # Install pkg-config files -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - if(NOT CMAKE_HOST_WIN32 OR CYGWIN OR MINGW) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config -- DESTINATION bin) -+ DESTINATION tools/libpng) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config -- DESTINATION bin) -+ DESTINATION tools/libpng) - endif() +@@ -820,12 +820,15 @@ endif() + # We use the same files like ./configure, so we have to set its vars. + # Only do this on Windows for Cygwin - the files don't make much sense outside + # of a UNIX look-alike. +-if(NOT WIN32 OR CYGWIN OR MINGW) ++if(1) + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix ${CMAKE_INSTALL_PREFIX}) + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) + set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) +- set(LIBS "-lz -lm") ++ set(LIBS "") ++ if(M_LIBRARY) ++ string(APPEND LIBS "-lm") ++ endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) + create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc) +@@ -894,6 +897,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL) + endif() + + if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++elseif(0) + # Install man pages + if(NOT PNG_MAN_DIR) + set(PNG_MAN_DIR "share/man") diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index 48e4c6ac007477..fda335e345cf35 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -1,32 +1,32 @@ set(LIBPNG_VER 1.6.37) # Download the apng patch -set(LIBPNG_APNG_OPTION ) +set(LIBPNG_APNG_PATCH_PATH "") +set(LIBPNG_APNG_OPTION "") if ("apng" IN_LIST FEATURES) - # Get (g)awk installed - vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk) - set(AWK_EXE_PATH "${MSYS_ROOT}/usr/bin") - vcpkg_add_to_path("${AWK_EXE_PATH}") + if(VCPKG_HOST_IS_WINDOWS) + # Get (g)awk and gzip installed + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk gzip) + set(AWK_EXE_PATH "${MSYS_ROOT}/usr/bin") + vcpkg_add_to_path("${AWK_EXE_PATH}") + endif() - set(LIBPNG_APG_PATCH_NAME libpng-${LIBPNG_VER}-apng.patch) - set(LIBPNG_APG_PATCH_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APG_PATCH_NAME}) - if (NOT EXISTS ${LIBPNG_APG_PATCH_PATH}) - if (NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src) - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src) - endif() - vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE - URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${LIBPNG_VER}/${LIBPNG_APG_PATCH_NAME}.gz" - FILENAME "${LIBPNG_APG_PATCH_NAME}.gz" - SHA512 226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b - ) - vcpkg_find_acquire_program(7Z) + set(LIBPNG_APNG_PATCH_NAME "libpng-${LIBPNG_VER}-apng.patch") + vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE + URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${LIBPNG_VER}/${LIBPNG_APNG_PATCH_NAME}.gz" + FILENAME "${LIBPNG_APNG_PATCH_NAME}.gz" + SHA512 226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b + ) + set(LIBPNG_APNG_PATCH_PATH "${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APNG_PATCH_NAME}") + if (NOT EXISTS "${LIBPNG_APNG_PATCH_PATH}") + file(INSTALL "${LIBPNG_APNG_PATCH_ARCHIVE}" DESTINATION "${CURRENT_BUILDTREES_DIR}/src") vcpkg_execute_required_process( - COMMAND ${7Z} x ${LIBPNG_APNG_PATCH_ARCHIVE} -aoa - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src + COMMAND gzip -d "${LIBPNG_APNG_PATCH_NAME}.gz" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src" + ALLOW_IN_DOWNLOAD_MODE LOGNAME extract-patch.log ) endif() - set(APNG_EXTRA_PATCH ${LIBPNG_APG_PATCH_PATH}) set(LIBPNG_APNG_OPTION "-DPNG_PREFIX=a") endif() @@ -37,109 +37,65 @@ vcpkg_from_github( SHA512 ccb3705c23b2724e86d072e2ac8cfc380f41fadfd6977a248d588a8ad57b6abe0e4155e525243011f245e98d9b7afbe2e8cc7fd4ff7d82fcefb40c0f48f88918 HEAD_REF master PATCHES + "${LIBPNG_APNG_PATCH_PATH}" use_abort.patch cmake.patch - pkgconfig.patch - pkgconfig.2.patch - ${APNG_EXTRA_PATCH} fix-export-targets.patch + pkgconfig.patch macos-arch-fix.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(PNG_STATIC_LIBS OFF) - set(PNG_SHARED_LIBS ON) -else() - set(PNG_STATIC_LIBS ON) - set(PNG_SHARED_LIBS OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PNG_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PNG_STATIC) -set(LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION ) +vcpkg_list(SET LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION) if(VCPKG_TARGET_IS_IOS) - list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF") + vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF") endif() -set(LD_VERSION_SCRIPT_OPTION ) +vcpkg_list(SET LD_VERSION_SCRIPT_OPTION) if(VCPKG_TARGET_IS_ANDROID) - set(LD_VERSION_SCRIPT_OPTION "-Dld-version-script=OFF") + vcpkg_list(APPEND LD_VERSION_SCRIPT_OPTION "-Dld-version-script=OFF") # for armeabi-v7a, check whether NEON is available - list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=check") + vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=check") else() - list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=on") + vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=on") endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPNG_MAN_DIR=share/${PORT}/man ${LIBPNG_APNG_OPTION} ${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION} ${LD_VERSION_SCRIPT_OPTION} - -DPNG_STATIC=${PNG_STATIC_LIBS} - -DPNG_SHARED=${PNG_SHARED_LIBS} + -DPNG_STATIC=${PNG_STATIC} + -DPNG_SHARED=${PNG_SHARED} -DPNG_TESTS=OFF -DSKIP_INSTALL_PROGRAMS=ON -DSKIP_INSTALL_EXECUTABLES=ON -DSKIP_INSTALL_FILES=OFF OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON + MAYBE_UNUSED_VARIABLES + PNG_ARM_NEON ) vcpkg_cmake_install() - vcpkg_cmake_config_fixup(CONFIG_PATH lib/libpng) -set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc") -if(EXISTS ${_file}) - file(READ "${_file}" _contents) - if(VCPKG_TARGET_IS_WINDOWS) - string(REGEX REPLACE "-lpng16(d)?" "-llibpng16d" _contents "${_contents}") - else() - string(REGEX REPLACE "-lpng16(d)?" "-lpng16d" _contents "${_contents}") - endif() - if(VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lz" "-lzlibd" _contents "${_contents}") - else() - string(REPLACE "-lzlib" "-lzlibd" _contents "${_contents}") - endif() - file(WRITE "${_file}" "${_contents}") -endif() -set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng.pc") -if(EXISTS ${_file}) - file(READ "${_file}" _contents) - if(VCPKG_TARGET_IS_WINDOWS) - string(REGEX REPLACE "-lpng16(d)?" "-llibpng16d" _contents "${_contents}") - else() - string(REGEX REPLACE "-lpng16(d)?" "-lpng16d" _contents "${_contents}") - endif() - if(VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lz" "-lzlibd" _contents "${_contents}") - else() - string(REPLACE "-lzlib" "-lzlibd" _contents "${_contents}") - endif() - file(WRITE "${_file}" "${_contents}") -endif() -if(VCPKG_TARGET_IS_WINDOWS) - set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc") - if(EXISTS ${_file}) - file(READ "${_file}" _contents) - string(REPLACE "-lpng16" "-llibpng16" _contents "${_contents}") - if(VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lz" "-lzlib" _contents "${_contents}") - endif() - file(WRITE "${_file}" "${_contents}") - endif() - set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng.pc") - if(EXISTS ${_file}) - file(READ "${_file}" _contents) - string(REPLACE "-lpng16" "-llibpng16" _contents "${_contents}") - if(VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lz" "-lzlib" _contents "${_contents}") - endif() - file(WRITE "${_file}" "${_contents}") + +vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" "-lpng16" "-llibpng16d") + file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" RENAME "libpng.pc") endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" "-lpng16" "-llibpng16") +elseif(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" "-lpng16" "-lpng16d") + file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" RENAME "libpng.pc") endif() -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) +file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" RENAME "libpng.pc") vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools" "${CURRENT_PACKAGES_DIR}/debug/tools") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libpng/usage b/ports/libpng/usage new file mode 100644 index 00000000000000..19203399c64140 --- /dev/null +++ b/ports/libpng/usage @@ -0,0 +1,4 @@ +The package libpng is compatible with built-in CMake targets: + + find_package(PNG REQUIRED) + target_link_libraries(main PRIVATE PNG::PNG) diff --git a/ports/libpng/vcpkg.json b/ports/libpng/vcpkg.json index 0fe109eb8074ad..a827351d9721f5 100644 --- a/ports/libpng/vcpkg.json +++ b/ports/libpng/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libpng", "version": "1.6.37", - "port-version": 16, + "port-version": 17, "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files", "homepage": "https://github.com/glennrp/libpng", + "license": "libpng-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index 459086f246f8ca..dac50f93cea39d 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -1,7 +1,8 @@ { "name": "cmake-user", - "version-date": "2022-03-18", + "version-date": "2022-04-18", "description": "Test port to verify the vcpkg toolchain in cmake user projects", + "license": "MIT", "default-features": [ "ci" ], @@ -48,10 +49,6 @@ "$package": "Freetype", "name": "freetype" }, - { - "$package": "ICU", - "name": "icu" - }, { "$package": "Intl", "name": "gettext" @@ -60,6 +57,10 @@ "$package": "GIF", "name": "giflib" }, + { + "$package": "ICU", + "name": "icu" + }, { "$package": "JPEG", "name": "libjpeg-turbo" @@ -68,6 +69,10 @@ "$package": "LibLZMA", "name": "liblzma" }, + { + "$package": "PNG", + "name": "libpng" + }, { "$package": "TIFF", "name": "tiff" diff --git a/versions/baseline.json b/versions/baseline.json index 064df04192f083..c6f80014d175a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3886,7 +3886,7 @@ }, "libpng": { "baseline": "1.6.37", - "port-version": 16 + "port-version": 17 }, "libpopt": { "baseline": "1.16", diff --git a/versions/l-/libpng.json b/versions/l-/libpng.json index a9380b8c1f74c9..492a9a83cf27be 100644 --- a/versions/l-/libpng.json +++ b/versions/l-/libpng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffe71783883ccf1c6e6a306daa686868bfb62191", + "version": "1.6.37", + "port-version": 17 + }, { "git-tree": "b082585ac20aefc27150af5386b6a8a15473e93a", "version": "1.6.37", From 4193cfc1be018ec3940b7d33086c94b4e404e841 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Mon, 18 Apr 2022 17:35:25 -0400 Subject: [PATCH 012/383] [flatbuffers] Update to 2.0.6 (#24208) * [flatbuffers] Update to 2.0.6 * Update version --- ports/flatbuffers/portfile.cmake | 4 ++-- ports/flatbuffers/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/f-/flatbuffers.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index 5b879ad031cfb6..ce824f022a19e1 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/flatbuffers - REF v2.0.0 - SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89 + REF v2.0.6 + SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6 HEAD_REF master PATCHES ignore_use_of_cmake_toolchain_file.patch diff --git a/ports/flatbuffers/vcpkg.json b/ports/flatbuffers/vcpkg.json index 8eceb524c5dad6..5a5545748a6147 100644 --- a/ports/flatbuffers/vcpkg.json +++ b/ports/flatbuffers/vcpkg.json @@ -1,12 +1,12 @@ { "name": "flatbuffers", - "version": "2.0.0", - "port-version": 3, + "version": "2.0.6", "description": [ "Memory Efficient Serialization Library", "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility." ], "homepage": "https://google.github.io/flatbuffers/", + "license": "Apache-2.0", "dependencies": [ { "name": "flatbuffers", diff --git a/versions/baseline.json b/versions/baseline.json index c6f80014d175a1..0e9045ded2576b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2237,8 +2237,8 @@ "port-version": 2 }, "flatbuffers": { - "baseline": "2.0.0", - "port-version": 3 + "baseline": "2.0.6", + "port-version": 0 }, "flint": { "baseline": "2.8.0", diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 6e2a73e54bdcd7..0f2e1a5d77fd28 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "288dddf9e3a03a41f09b5f61547bf8d6b7b888c3", + "version": "2.0.6", + "port-version": 0 + }, { "git-tree": "8713fce3bc50837e44d958ddc745471619c511c4", "version": "2.0.0", From da6351432f7d3699f7e9a8ffc6f29f426d96b4b0 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 18 Apr 2022 23:41:57 +0200 Subject: [PATCH 013/383] [tinyspline] Update to 0.4.0 (#24187) * Update tinyspline to 0.4.0 * Update CI baseline Co-authored-by: chausner --- ports/tinyspline/portfile.cmake | 4 ++-- ports/tinyspline/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/t-/tinyspline.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/tinyspline/portfile.cmake b/ports/tinyspline/portfile.cmake index 6e0772d875f0f1..3d6dc3453d4337 100644 --- a/ports/tinyspline/portfile.cmake +++ b/ports/tinyspline/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO msteinbeck/tinyspline - REF v0.3.0 - SHA512 9B02ACA5C56341E8DDC057E2AEB78632695DAC3A4D2C628A43028E4216FC79942F68DD3105B1B92ACAE0D009109C56EC437AB638FB7334EBDD68543BE2D8D7F6 + REF v0.4.0 + SHA512 45c3e6937c0c48c3a6953cea26f31a0217a3943f5bca3b4432010b615d30d7e46081625409917a15cf88d671c1c0e0c9c3e61a65a81c842a9a36c2acd8fc6c26 HEAD_REF master ) diff --git a/ports/tinyspline/vcpkg.json b/ports/tinyspline/vcpkg.json index 03f32869a4dc8e..0cb155e923ea8a 100644 --- a/ports/tinyspline/vcpkg.json +++ b/ports/tinyspline/vcpkg.json @@ -1,9 +1,9 @@ { "name": "tinyspline", - "version": "0.3.0", - "port-version": 1, + "version": "0.4.0", "description": "Library for NURBS, B-Splines, and BĆ©zier curves, allowing you to handle splines with ease", "homepage": "https://github.com/msteinbeck/tinyspline", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 0e9045ded2576b..58c1b1998bccfd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7009,8 +7009,8 @@ "port-version": 2 }, "tinyspline": { - "baseline": "0.3.0", - "port-version": 1 + "baseline": "0.4.0", + "port-version": 0 }, "tinythread": { "baseline": "1.1", diff --git a/versions/t-/tinyspline.json b/versions/t-/tinyspline.json index 428ffdf0fb577f..45d5fdc3b0d0a2 100644 --- a/versions/t-/tinyspline.json +++ b/versions/t-/tinyspline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "231dcdd1e689138e14cb5c1d4250a224f580cdd7", + "version": "0.4.0", + "port-version": 0 + }, { "git-tree": "6ad4ac2f1aa4dc253ada4023358286ab6bdc24a6", "version": "0.3.0", From 65dcd479060b04f02e657b328f005845b27b1d6b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 18 Apr 2022 23:48:16 +0200 Subject: [PATCH 014/383] [fixed-string] Update to 0.1.1 (#24188) * Update fixed-string to 0.1.1 * Update CI baseline Co-authored-by: chausner --- ports/fixed-string/portfile.cmake | 17 ++++++++--------- ports/fixed-string/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/f-/fixed-string.json | 5 +++++ 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ports/fixed-string/portfile.cmake b/ports/fixed-string/portfile.cmake index 760d2d0a632d90..5442bfeaa4e69f 100644 --- a/ports/fixed-string/portfile.cmake +++ b/ports/fixed-string/portfile.cmake @@ -3,25 +3,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unterumarmung/fixed_string - REF v0.1.0 - SHA512 759c228e3bc4bc06d58b59bc19756ceb27a6f6104cb0c58288bf3156ca0958e6099741870fa09ba88a5572d17988529992cc5198faab30847118665e626c2ea4 + REF v0.1.1 + SHA512 8367f7cf898dd88918913f6e788cc5841eab7cd56d61f3ea21636bf3253f450d5dd6207a259d4c5980d863c2ce55fba35e3e8944341f56dbfd56faa29c39746e HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFIXED_STRING_OPT_BUILD_EXAMPLES=OFF -DFIXED_STRING_OPT_BUILD_TESTS=OFF -DFIXED_STRING_OPT_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fixed_string TARGET_PATH share/fixed_string) +vcpkg_cmake_config_fixup(PACKAGE_NAME fixed_string CONFIG_PATH lib/cmake/fixed_string) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/fixed-string/vcpkg.json b/ports/fixed-string/vcpkg.json index b7ed3e4d7aee68..cbb1a272af1795 100644 --- a/ports/fixed-string/vcpkg.json +++ b/ports/fixed-string/vcpkg.json @@ -1,7 +1,17 @@ { "name": "fixed-string", - "version-string": "0.1.0", - "port-version": 1, + "version": "0.1.1", "description": "Header-only C++17 library provides a string class with std::array fixed-size semantic.", - "homepage": "https://github.com/unterumarmung/fixed_string" + "homepage": "https://github.com/unterumarmung/fixed_string", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 58c1b1998bccfd..e269e1988e09e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2213,8 +2213,8 @@ "port-version": 2 }, "fixed-string": { - "baseline": "0.1.0", - "port-version": 1 + "baseline": "0.1.1", + "port-version": 0 }, "fizz": { "baseline": "2022.03.21.00", diff --git a/versions/f-/fixed-string.json b/versions/f-/fixed-string.json index 9cf1230d9cca5c..2ba86ed061ed8e 100644 --- a/versions/f-/fixed-string.json +++ b/versions/f-/fixed-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd3abbab052dee3c26babb29ed11725fbc82bcde", + "version": "0.1.1", + "port-version": 0 + }, { "git-tree": "e24d1c3d1692a06fa69dc12b65e4240a92db31bf", "version-string": "0.1.0", From 50fdc1f8303d597b40399a9ea1904ba8d176cbf4 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 18 Apr 2022 23:51:15 +0200 Subject: [PATCH 015/383] [avisynthplus] Update to 3.7.2 (#24189) * Update avisynthplus to 3.7.2 * Update CI baseline Co-authored-by: chausner --- ports/avisynthplus/portfile.cmake | 15 +++++++-------- ports/avisynthplus/vcpkg.json | 12 +++++++++--- versions/a-/avisynthplus.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake index c64088b2ec57ea..4851bb0f9b70f1 100644 --- a/ports/avisynthplus/portfile.cmake +++ b/ports/avisynthplus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AviSynth/AviSynthPlus - REF v3.7.0 - SHA512 0f2d5344c4472b810667b99d9e99a2ec8135923f4185dbd7e29ca65e696ce13500ea20ef09c995486573314149a671e1256a4dd0696c4ace8d3ec3716ffdcfc7 + REF v3.7.2 + SHA512 82cf2afed4cc53c0e09d367ff3df1db0e9ac17ff2458e4660c646430d8e72f472b072a3910c9595b26eb5ac89c82fe74699acab3869014f87d8e2738b81568a1 HEAD_REF master ) @@ -12,20 +12,19 @@ vcpkg_download_distfile(GHC_ARCHIVE SHA512 e3fe1e41b31f840ebc219fcd795e7be2973b80bb3843d6bb080786ad9e3e7f846a118673cb9e17d76bae66954e64e024a82622fb8cea7818d5d9357de661d3d1 ) -file(REMOVE_RECURSE ${SOURCE_PATH}/filesystem) +file(REMOVE_RECURSE "${SOURCE_PATH}/filesystem") vcpkg_extract_source_archive(extracted_archive ARCHIVE "${GHC_ARCHIVE}") file(RENAME "${extracted_archive}" "${SOURCE_PATH}/filesystem") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_PLUGINS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/distrib/gpl.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/distrib/gpl.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json index 9527fdf40a15d8..f2a64817c1081b 100644 --- a/ports/avisynthplus/vcpkg.json +++ b/ports/avisynthplus/vcpkg.json @@ -1,8 +1,14 @@ { "name": "avisynthplus", - "version-semver": "3.7.0", - "port-version": 3, + "version-semver": "3.7.2", "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", "homepage": "https://avs-plus.net/", - "supports": "!arm & !uwp" + "license": "GPL-2.0", + "supports": "!arm & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/a-/avisynthplus.json b/versions/a-/avisynthplus.json index eeb574694dc06d..fa886037d29c6e 100644 --- a/versions/a-/avisynthplus.json +++ b/versions/a-/avisynthplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3749b45c163c78cdd03a7e47223634ba17ab58f", + "version-semver": "3.7.2", + "port-version": 0 + }, { "git-tree": "a585670d79213148e938d9f3ea7d2ccb1c784f2c", "version-semver": "3.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index e269e1988e09e6..0c7196f1270afc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -245,8 +245,8 @@ "port-version": 1 }, "avisynthplus": { - "baseline": "3.7.0", - "port-version": 3 + "baseline": "3.7.2", + "port-version": 0 }, "avro-c": { "baseline": "1.11.0", From 9429391e9fc1f865060cd131c4d8f075eca6540d Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Mon, 18 Apr 2022 18:43:59 -0400 Subject: [PATCH 016/383] [DiscordCoreAPI] Fixing a certificate location issue. (#24204) * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Removing patch file. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updating version database. * Updated build system. * Updated build system. * Updated build system. * Updated build system. * Updated build system. * Updated build system. * Updating version database. * Updating version database. * Updating version database. --- .../fix-cert-installation.patch | 30 ------------------- ports/discordcoreapi/portfile.cmake | 7 ++--- ports/discordcoreapi/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/d-/discordcoreapi.json | 5 ++++ 5 files changed, 11 insertions(+), 38 deletions(-) delete mode 100644 ports/discordcoreapi/fix-cert-installation.patch diff --git a/ports/discordcoreapi/fix-cert-installation.patch b/ports/discordcoreapi/fix-cert-installation.patch deleted file mode 100644 index 06f0cbe85d96e8..00000000000000 --- a/ports/discordcoreapi/fix-cert-installation.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt -index 10cd8d1..1439aa0 100644 ---- a/Library/CMakeLists.txt -+++ b/Library/CMakeLists.txt -@@ -27,19 +27,19 @@ file(GLOB HEADERS "${CMAKE_SOURCE_DIR}/Include/discordcoreapi/*.hpp") - if (UNIX) - add_library(DiscordCoreAPI STATIC "${SOURCES}" "${VersionFilesOutputVariable}") - message(STATUS "Copying a file...") -- configure_file("${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" "/home/$ENV{USER}/SSL/Certs/SoundCloudCert.pem" COPYONLY) -+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" DESTINATION share/discordcoreapi/data) - message(STATUS "Copying a file...") -- configure_file("${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" "/home/$ENV{USER}/SSL/Certs/GoogleCert.pem" COPYONLY) -+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" DESTINATION share/discordcoreapi/data) - message(STATUS "Copying a file...") -- configure_file("${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" "/home/$ENV{USER}/SSL/Certs/DiscordCert.pem" COPYONLY) -+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" DESTINATION share/discordcoreapi/data) - elseif (WIN32) - add_library(DiscordCoreAPI SHARED "${SOURCES}" "${VersionFilesOutputVariable}") - message(STATUS "Copying a file...") -- configure_file("${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" "C:/SSL/Certs/SoundCloudCert.pem" COPYONLY) -+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" DESTINATION share/discordcoreapi/data) - message(STATUS "Copying a file...") -- configure_file("${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" "C:/SSL/Certs/GoogleCert.pem" COPYONLY) -+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" DESTINATION share/discordcoreapi/data) - message(STATUS "Copying a file...") -- configure_file("${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" "C:/SSL/Certs/DiscordCert.pem" COPYONLY) -+ install(FILES "${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" DESTINATION share/discordcoreapi/data) - endif() - - if (EXISTS ${VCPKG_INSTALLED_DIR}) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 3bb8671edee2b6..73715b3642e82c 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -5,10 +5,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI - REF 6d7c899f0690513855119aa225259dccf17b10f0 - SHA512 ff42ed8ae799b8f875158842c47fcb5612a5b8861dbfb442c97ab131d952ed59140b2d2431a0d389aefbecb122263f340ff9c8fb863466d0aa91875f8080616e + REF c5e7efee991f4dcff428ca21c2e157949e784a78 + SHA512 5f42864f8375c87542550ff1f05e761d75a02de5810a4ca1f1b4893894d9be11a21915ff16771e3233103c4fce3ce8734359baacd5f5051d719e387a225343dd HEAD_REF main - PATCHES fix-cert-installation.patch ) vcpkg_cmake_configure( @@ -30,7 +29,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file( - INSTALL "${SOURCE_PATH}/License" + INSTALL "${SOURCE_PATH}/License.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 767de8aa87b318..da67d297b3625e 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "discordcoreapi", - "version-date": "2022-03-30", - "port-version": 1, + "version-date": "2022-04-17", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "AGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 0c7196f1270afc..e4e5174ccbcd8d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1893,8 +1893,8 @@ "port-version": 1 }, "discordcoreapi": { - "baseline": "2022-03-30", - "port-version": 1 + "baseline": "2022-04-17", + "port-version": 0 }, "discount": { "baseline": "2.2.6", diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index f3d04577bd52f6..03cef54f206474 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd790721f9b6d332bbcdae69e83a716720eedc1a", + "version-date": "2022-04-17", + "port-version": 0 + }, { "git-tree": "70c609a4d2bc6319e046e08e25842c4559bfc556", "version-date": "2022-03-30", From 5b4013057ca1f5e842fa1bdfc0e6dfc0d8763d85 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:32:24 +0200 Subject: [PATCH 017/383] [nlopt] Update to 2.7.1 (#24186) * Update nlopt to 2.7.1 * Update CI baseline Co-authored-by: chausner --- ports/nlopt/portfile.cmake | 19 +++++++++---------- ports/nlopt/vcpkg.json | 17 +++++++++++++---- versions/baseline.json | 4 ++-- versions/n-/nlopt.json | 5 +++++ 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ports/nlopt/portfile.cmake b/ports/nlopt/portfile.cmake index e2204c239ff163..7d232cbc8c3886 100644 --- a/ports/nlopt/portfile.cmake +++ b/ports/nlopt/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevengj/nlopt - REF v2.7.0 - SHA512 3c41cab357b50adf50fe2d6225409ade8c5e8ee3576e3680ab29dded29ed7d328bc3d51d3a50054630159c319dca69e47ff08dc5df891b180b7d7e8fcbc27694 + REF v2.7.1 + SHA512 e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNLOPT_FORTRAN=OFF -DNLOPT_PYTHON=OFF @@ -18,14 +17,14 @@ vcpkg_configure_cmake( -DNLOPT_SWIG=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nlopt) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nlopt) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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) vcpkg_fixup_pkgconfig() diff --git a/ports/nlopt/vcpkg.json b/ports/nlopt/vcpkg.json index 3e895d4a3b2c91..bcc20e45c9e1d4 100644 --- a/ports/nlopt/vcpkg.json +++ b/ports/nlopt/vcpkg.json @@ -1,7 +1,16 @@ { "name": "nlopt", - "version-string": "2.7.0", - "port-version": 1, - "description": "a library for nonlinear local and global optimization, for functions with and without gradient information.", - "homepage": "https://github.com/stevengj/nlopt" + "version": "2.7.1", + "description": "Library for nonlinear local and global optimization, for functions with and without gradient information.", + "homepage": "https://github.com/stevengj/nlopt", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index e4e5174ccbcd8d..dc360db6d4b744 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4845,8 +4845,8 @@ "port-version": 2 }, "nlopt": { - "baseline": "2.7.0", - "port-version": 1 + "baseline": "2.7.1", + "port-version": 0 }, "nmap": { "baseline": "7.70", diff --git a/versions/n-/nlopt.json b/versions/n-/nlopt.json index e4eed6a6b5c235..9450b649d214ce 100644 --- a/versions/n-/nlopt.json +++ b/versions/n-/nlopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b98ca95cd180e8c31c718f78ef39b5d733f0399f", + "version": "2.7.1", + "port-version": 0 + }, { "git-tree": "8307558e59725a365e7139c8e5fd371e5d3481e4", "version-string": "2.7.0", From ed71abbc23aeebc513bb985f4522e2a9d65f2b4d Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:33:30 +0200 Subject: [PATCH 018/383] [quazip] Update to 1.3 (#24185) * Update quazip to 1.2 * Update CI baseline * Update to 1.3 * Update CI baseline * Remove unused version 1.2 Co-authored-by: chausner --- ports/quazip/portfile.cmake | 6 +++--- ports/quazip/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/q-/quazip.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/quazip/portfile.cmake b/ports/quazip/portfile.cmake index 12a51a218d7cee..1f805f5dc724dd 100644 --- a/ports/quazip/portfile.cmake +++ b/ports/quazip/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stachenov/quazip - REF v1.1 - SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c + REF v1.3 + SHA512 3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2 ) vcpkg_cmake_configure( @@ -10,7 +10,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/QuaZip-Qt5-1.1) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/QuaZip-Qt5-1.3) vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") diff --git a/ports/quazip/vcpkg.json b/ports/quazip/vcpkg.json index 0815c748d690b5..89ee6996c8d2d0 100644 --- a/ports/quazip/vcpkg.json +++ b/ports/quazip/vcpkg.json @@ -1,7 +1,6 @@ { "name": "quazip", - "version": "1.1", - "port-version": 1, + "version": "1.3", "description": "Qt/C++ wrapper over minizip", "homepage": "https://stachenov.github.io/quazip/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index dc360db6d4b744..74ff659778a20b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6013,8 +6013,8 @@ "port-version": 1 }, "quazip": { - "baseline": "1.1", - "port-version": 1 + "baseline": "1.3", + "port-version": 0 }, "quickfast": { "baseline": "1.5", diff --git a/versions/q-/quazip.json b/versions/q-/quazip.json index 3aaff18d30ca9a..7433ea291d4d61 100644 --- a/versions/q-/quazip.json +++ b/versions/q-/quazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92000bba1473465da5e5de8864acc0e49250b2f2", + "version": "1.3", + "port-version": 0 + }, { "git-tree": "7e1b1da3a71a9e98c52bad16aef6c0666d993b56", "version": "1.1", From 5e79eeb548eb04e78984f1a7b64d5d8a97a0cb9b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:34:05 +0200 Subject: [PATCH 019/383] [camport3] Update to 1.6.2 (#24184) * Update camport3 to 1.6.2 * Update CI baseline Co-authored-by: chausner --- ports/camport3/portfile.cmake | 52 +++++++++++++++++------------------ ports/camport3/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/c-/camport3.json | 5 ++++ 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/ports/camport3/portfile.cmake b/ports/camport3/portfile.cmake index 8a2333469984e6..3c5e4aea89a851 100644 --- a/ports/camport3/portfile.cmake +++ b/ports/camport3/portfile.cmake @@ -1,40 +1,40 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO percipioxyz/camport3 - REF v1.5.3 - SHA512 efa41e75b4ed7147f94270765138aa226a92ec51c99157776e916ec178ad2a9fe55aa6e6e746be46e2f2178852f4c4f9323b515f5a1b151ac70c21f8f923d901 + REF v1.6.2 + SHA512 e3b1fadb13b826e86aa174215430f5e4175aafd9a967f2401beb3768dcc489a8ce5a74c151d615bd3e34b837c81e201db55b290ef258612381141b0b94212fd1 HEAD_REF master ) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") file(COPY - ${SOURCE_PATH}/include/TYApi.h - ${SOURCE_PATH}/include/TYCoordinateMapper.h - ${SOURCE_PATH}/include/TYImageProc.h - ${SOURCE_PATH}/include/TyIsp.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include) + "${SOURCE_PATH}/include/TYApi.h" + "${SOURCE_PATH}/include/TYCoordinateMapper.h" + "${SOURCE_PATH}/include/TYImageProc.h" + "${SOURCE_PATH}/include/TyIsp.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") if(VCPKG_TARGET_IS_WINDOWS) if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") file(COPY - ${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" ) file(COPY - ${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" ) endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") file(COPY - ${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) file(COPY - ${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" ) endif() @@ -50,24 +50,24 @@ elseif(VCPKG_TARGET_IS_LINUX) endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") file(COPY - ${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + "${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" ) endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") file(COPY - ${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + "${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) endif() endif() file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/camport3/vcpkg.json b/ports/camport3/vcpkg.json index d301a871166a31..863706150e8408 100644 --- a/ports/camport3/vcpkg.json +++ b/ports/camport3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "camport3", - "version-string": "1.5.3", - "port-version": 2, + "version": "1.6.2", "description": "percipio.xyz cameras SDK", "homepage": "https://github.com/percipioxyz/camport3", "supports": "((windows & !uwp & !arm & !arm64 & !static) | linux) & !wasm32" diff --git a/versions/baseline.json b/versions/baseline.json index 74ff659778a20b..1437b3cef57503 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1237,8 +1237,8 @@ "port-version": 0 }, "camport3": { - "baseline": "1.5.3", - "port-version": 2 + "baseline": "1.6.2", + "port-version": 0 }, "capnproto": { "baseline": "0.9.1", diff --git a/versions/c-/camport3.json b/versions/c-/camport3.json index 3ad3ae220f7e76..09375b26a3e87d 100644 --- a/versions/c-/camport3.json +++ b/versions/c-/camport3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8fd1afea0703ffb17838422fd2aef895ab8c828", + "version": "1.6.2", + "port-version": 0 + }, { "git-tree": "ed31882bd5119a95ef69ba8323e0f4575ee5dc6d", "version-string": "1.5.3", From 692af196c9bca360f98cb85d68201176aa1fb561 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:34:30 +0200 Subject: [PATCH 020/383] [gcem] Update to 1.14.1 (#24183) * Update gcem to 1.14.1 * Update CI baseline Co-authored-by: chausner --- ports/gcem/portfile.cmake | 19 +++++++++---------- ports/gcem/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 4 ++-- versions/g-/gcem.json | 5 +++++ 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ports/gcem/portfile.cmake b/ports/gcem/portfile.cmake index 7d7a7124aa4a83..86d33636ba4786 100644 --- a/ports/gcem/portfile.cmake +++ b/ports/gcem/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kthohr/gcem - REF a20b0fc0206ff7d99a96fe4afdfe8205b01c8220 # v1.13.1 - SHA512 baede14856ddcf8f132c7a16b19d4d646a1fc2d5e3a536a46694a8d7c656ce4ffb2fd61f50a1df78ce7ed31528828152b4e881fe10bcead553985b6103018804 + REF v1.14.1 + SHA512 c4d6d50b541d71552ef5c3467bc2abe448a08627964c612abcfacc381b0f07399bdd03643e0914ad3c89116c3eae37ed96ee2cfce35d7ec47e6c0f53bab91f57 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gcem) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gcem) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gcem/vcpkg.json b/ports/gcem/vcpkg.json index ef9aef7151a9ff..e7a9772996aa76 100644 --- a/ports/gcem/vcpkg.json +++ b/ports/gcem/vcpkg.json @@ -1,6 +1,17 @@ { "name": "gcem", - "version-string": "1.13.1", - "port-version": 1, - "description": "A C++ compile-time math library using generalized constant expressions" + "version": "1.14.1", + "description": "A C++ compile-time math library using generalized constant expressions", + "homepage": "https://www.kthohr.com/gcem.html", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1437b3cef57503..d9e9e5d06c1a33 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2421,8 +2421,8 @@ "port-version": 0 }, "gcem": { - "baseline": "1.13.1", - "port-version": 1 + "baseline": "1.14.1", + "port-version": 0 }, "gdal": { "baseline": "3.4.2", diff --git a/versions/g-/gcem.json b/versions/g-/gcem.json index 7753c48bdb961e..29d714d2ba8647 100644 --- a/versions/g-/gcem.json +++ b/versions/g-/gcem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01116231bfab30197748230d4125d18fd2652150", + "version": "1.14.1", + "port-version": 0 + }, { "git-tree": "b5ffa19fc8b11179434020c69f6c998dd58268ee", "version-string": "1.13.1", From 563b5ce4935dfccfc1d265887291f7923885949a Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:35:02 +0200 Subject: [PATCH 021/383] [bfgroup-lyra] Update to 1.6 (#24182) * Update bfgroup-lyra to 1.6 * Update CI baseline Co-authored-by: chausner --- ports/bfgroup-lyra/portfile.cmake | 4 ++-- ports/bfgroup-lyra/vcpkg.json | 3 ++- versions/b-/bfgroup-lyra.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/bfgroup-lyra/portfile.cmake b/ports/bfgroup-lyra/portfile.cmake index fb9848a4fdca56..1dcab723d4a094 100644 --- a/ports/bfgroup-lyra/portfile.cmake +++ b/ports/bfgroup-lyra/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bfgroup/Lyra - REF 1.5.1 - SHA512 e349c57614fe18cfee49b6a3977f133de3e567aa6b1c148abf9510432f7db34b75488739850e48c7943a15151fe2eedb129179d8d73eb61fb4f9a11c54b61086 + REF 1.6 + SHA512 e357fd0e925b67a51ad7232035ac66842676837baebf7a69eb416807b11400c283d098a22bf3ae27ce904700c5b849953ede1873d6535a8b34c4704ebcb09748 HEAD_REF master ) diff --git a/ports/bfgroup-lyra/vcpkg.json b/ports/bfgroup-lyra/vcpkg.json index 88b0d01efb8581..c7189d7d806a2e 100644 --- a/ports/bfgroup-lyra/vcpkg.json +++ b/ports/bfgroup-lyra/vcpkg.json @@ -1,8 +1,9 @@ { "name": "bfgroup-lyra", - "version": "1.5.1", + "version": "1.6", "description": "A simple to use, composable, command line parser for C++ 11 and beyond", "homepage": "https://bfgroup.github.io/Lyra/", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/b-/bfgroup-lyra.json b/versions/b-/bfgroup-lyra.json index 0a6e8cf000d393..ef5ca5bf38fa83 100644 --- a/versions/b-/bfgroup-lyra.json +++ b/versions/b-/bfgroup-lyra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbd3e635da6198f0f2458ec62ff937287c5c5b45", + "version": "1.6", + "port-version": 0 + }, { "git-tree": "d06d9dff4b3cb6ea57292cb81460f113a905e3ea", "version": "1.5.1", diff --git a/versions/baseline.json b/versions/baseline.json index d9e9e5d06c1a33..49677bca14b2bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -449,7 +449,7 @@ "port-version": 0 }, "bfgroup-lyra": { - "baseline": "1.5.1", + "baseline": "1.6", "port-version": 0 }, "bigint": { From 68a85fa730ed3395dc0020b410e6a903913e5bdc Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:35:37 +0200 Subject: [PATCH 022/383] [bext-ut] Update to 1.1.9 (#24181) * Update bext-ut to 1.1.9 * Update CI baseline * Move file(INSTALL) * Update CI baseline * Add bext-ut to ci.baseline.txt * Revert "Add bext-ut to ci.baseline.txt" This reverts commit 16640b0c5b2abc8414bee17f51f3653fbd2f1d9e. * Avoid CPM * Fix copyright installation * Update CI baseline Co-authored-by: chausner --- ports/bext-ut/avoid-cpm.patch | 12 ++++++++++++ ports/bext-ut/portfile.cmake | 29 ++++++++++++----------------- ports/bext-ut/vcpkg.json | 15 +++++++++++++-- versions/b-/bext-ut.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 ports/bext-ut/avoid-cpm.patch diff --git a/ports/bext-ut/avoid-cpm.patch b/ports/bext-ut/avoid-cpm.patch new file mode 100644 index 00000000000000..c1022543a53ea4 --- /dev/null +++ b/ports/bext-ut/avoid-cpm.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,7 +36,7 @@ + # ---- Add dependencies via CPM ---- + # see https://github.com/cpm-cmake/CPM.cmake for more info + +-if(CMAKE_VERSION VERSION_LESS 3.20.0) ++if(1) + # see https://github.com/TheLartians/PackageProject.cmake/pull/19 + include(cmake/PackageProject.cmake) + else() diff --git a/ports/bext-ut/portfile.cmake b/ports/bext-ut/portfile.cmake index 14d456bc5b2ed9..a76999db04496f 100644 --- a/ports/bext-ut/portfile.cmake +++ b/ports/bext-ut/portfile.cmake @@ -1,31 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boost-ext/ut - REF v1.1.8 - SHA512 0df2f8ce784dc69c3cca5554a8b2be7c1664dd66bf52e83f305db5fae84d416a851e9282e9a8cfe50fbcada85b17da00fb25c1228d9cca32226a18bae18acb83 + REF v1.1.9 + SHA512 81a6b80948d3a203534244f62f5f3ac57593083cc0c32484498a7d01d29455f7dcb33e2ec0587609b8dff33a81a5551796d7681d48fd93e817d6d0c31697234e HEAD_REF master + PATCHES + avoid-cpm.patch ) -vcpkg_download_distfile(LICENSE_FILE - URLS https://www.boost.org/LICENSE_1_0.txt - FILENAME d6078467835dba893231.txt - SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBOOST_UT_BUILD_BENCHMARKS=OFF -DBOOST_UT_BUILD_EXAMPLES=OFF -DBOOST_UT_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ut TARGET_PATH share/ut) +vcpkg_cmake_config_fixup(PACKAGE_NAME ut CONFIG_PATH lib/cmake/ut-1.1.8) -configure_file("${LICENSE_FILE}" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bext-ut/vcpkg.json b/ports/bext-ut/vcpkg.json index 8a7c5d77f66132..8ede04611e04eb 100644 --- a/ports/bext-ut/vcpkg.json +++ b/ports/bext-ut/vcpkg.json @@ -1,6 +1,17 @@ { "name": "bext-ut", - "version": "1.1.8", + "version": "1.1.9", "description": "UT: C++20 Ī¼(micro)/Unit Testing Framework", - "homepage": "https://boost-ext.github.io/ut/" + "homepage": "https://boost-ext.github.io/ut/", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/b-/bext-ut.json b/versions/b-/bext-ut.json index 6e6b6971f630ba..bd99a7fbc2d1a7 100644 --- a/versions/b-/bext-ut.json +++ b/versions/b-/bext-ut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea37a3905161a060e837b30d42868792d50029f8", + "version": "1.1.9", + "port-version": 0 + }, { "git-tree": "b08fed0b83c26aabfdda7db38d43a01b288f6a66", "version": "1.1.8", diff --git a/versions/baseline.json b/versions/baseline.json index 49677bca14b2bb..cacf8a96f7ea61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -441,7 +441,7 @@ "port-version": 0 }, "bext-ut": { - "baseline": "1.1.8", + "baseline": "1.1.9", "port-version": 0 }, "bext-wintls": { From 9f3018fc932048b7218b42e94796dd47fdd7fcfb Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:36:32 +0200 Subject: [PATCH 023/383] [console-bridge] Update to 1.0.2 (#24180) * Update console-bridge to 1.0.2 * Update CI baseline * Address suggestions * Update CI baseline Co-authored-by: chausner --- ports/console-bridge/portfile.cmake | 38 ++++++++++++++--------------- ports/console-bridge/vcpkg.json | 18 +++++++++++--- versions/baseline.json | 4 +-- versions/c-/console-bridge.json | 5 ++++ 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/ports/console-bridge/portfile.cmake b/ports/console-bridge/portfile.cmake index cd43cf0df3effe..37b7f84e18c3d5 100644 --- a/ports/console-bridge/portfile.cmake +++ b/ports/console-bridge/portfile.cmake @@ -1,42 +1,40 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/console_bridge - REF 0a6c16ed68750837c32ed1cedee9fca7d61d4364 # 1.0.1 - SHA512 8b856bf8c0eec7d7f3f87e10c4de2b99369bd35cab5f9dd5ea3813fdd5a3fd4e7cd31b2336746920e093a515ad1175fd5af79f9d2f6a4648b1814b3131a1ef03 + REF 1.0.2 + SHA512 ed427da8e59f9629f8d70e0a14415f88177c06fbaf7334bee56135dde91d19a1b54f5c9c668e0fd68314ab8dfd61446a174b9f528304decc5d4626a7c98882cb HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/console_bridge) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(PACKAGE_NAME console_bridge CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/console_bridge/cmake TARGET_PATH share/console_bridge) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/console_bridge) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/console_bridge) + vcpkg_cmake_config_fixup(PACKAGE_NAME console_bridge CONFIG_PATH lib/console_bridge/cmake) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/console_bridge") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/console_bridge") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") vcpkg_fixup_pkgconfig() endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(READ ${SOURCE_PATH}/src/console.cpp _contents) -string(SUBSTRING "${_contents}" 0 2000 license) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/console-bridge) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/console-bridge/copyright "${license}") - -file(READ ${CURRENT_PACKAGES_DIR}/include/console_bridge_export.h _contents) +file(READ "${CURRENT_PACKAGES_DIR}/include/console_bridge/console_bridge_export.h" _contents) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 1" _contents "${_contents}") else() string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 0" _contents "${_contents}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/console_bridge_export.h "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/console_bridge/console_bridge_export.h" "${_contents}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/console-bridge/vcpkg.json b/ports/console-bridge/vcpkg.json index d841bb9e868798..55788a26e1458d 100644 --- a/ports/console-bridge/vcpkg.json +++ b/ports/console-bridge/vcpkg.json @@ -1,7 +1,17 @@ { "name": "console-bridge", - "version-string": "1.0.1", - "port-version": 2, - "description": "a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.", - "homepage": "https://github.com/ros/console_bridge" + "version-semver": "1.0.2", + "description": "A ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.", + "homepage": "https://github.com/ros/console_bridge", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index cacf8a96f7ea61..177260a20930fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1521,8 +1521,8 @@ "port-version": 0 }, "console-bridge": { - "baseline": "1.0.1", - "port-version": 2 + "baseline": "1.0.2", + "port-version": 0 }, "constexpr": { "baseline": "1.0", diff --git a/versions/c-/console-bridge.json b/versions/c-/console-bridge.json index ff15871ce43c55..92630d69135dff 100644 --- a/versions/c-/console-bridge.json +++ b/versions/c-/console-bridge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5f1141775543ea0491358a281840ce2bcc100be", + "version-semver": "1.0.2", + "port-version": 0 + }, { "git-tree": "d73bd3ef8f9afac3c1f5957eda4ff760cea5b17c", "version-string": "1.0.1", From 8e84020c6738672190cf35b42eba4abb341e458c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:37:54 +0200 Subject: [PATCH 024/383] [robin-map] Update to 1.0.1 (#24179) * Update robin-map to 1.0.1 * Update CI baseline Co-authored-by: chausner --- ports/robin-map/portfile.cmake | 8 ++++---- ports/robin-map/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/r-/robin-map.json | 5 +++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/robin-map/portfile.cmake b/ports/robin-map/portfile.cmake index 209bda9fccdc1f..ca5aa4b7330eb6 100644 --- a/ports/robin-map/portfile.cmake +++ b/ports/robin-map/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/robin-map - REF v0.6.3 - SHA512 485557f300d33bda62bb8accdf246819ee8ffe956bc022e7ddca54ff6ad1a9fdb8db8d80690add3ef238e834d1eb8e2905920cb0a0674e7df010f6946d01297b + REF v1.0.1 + SHA512 5741049287fdb9c3316e1eb84b99343efc7b35f492e1db8166d65c2d16c7905f51b11cf164bedae9e44d4b6000bbea3c49012acf725a977e665a8dc23e89b1fb HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() @@ -15,4 +15,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/tsl-robin-map) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/robin-map/vcpkg.json b/ports/robin-map/vcpkg.json index b200ae5c4fa271..82f20f11cc2561 100644 --- a/ports/robin-map/vcpkg.json +++ b/ports/robin-map/vcpkg.json @@ -1,9 +1,9 @@ { "name": "robin-map", - "version-semver": "0.6.3", - "port-version": 1, + "version-semver": "1.0.1", "description": "A C++ implementation of a fast hash map and hash set using robin hood hashing", "homepage": "https://github.com/Tessil/robin-map", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 177260a20930fc..8b2dcda916eeab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6213,8 +6213,8 @@ "port-version": 0 }, "robin-map": { - "baseline": "0.6.3", - "port-version": 1 + "baseline": "1.0.1", + "port-version": 0 }, "rocksdb": { "baseline": "6.27.3", diff --git a/versions/r-/robin-map.json b/versions/r-/robin-map.json index 94e2dbd7e18462..b4c622ba5eb263 100644 --- a/versions/r-/robin-map.json +++ b/versions/r-/robin-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d169ebe25cc931f31bc343d6b21e734070902ed", + "version-semver": "1.0.1", + "port-version": 0 + }, { "git-tree": "95d49e16c7a8ef523608ef8e7d8fb019085789b8", "version-semver": "0.6.3", From d3d3c5738a3c5e498305274d0669df28e94b6cc3 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:38:29 +0200 Subject: [PATCH 025/383] [plog] Update to 1.1.6 (#24178) * Update plog to 1.1.6 * Update CI baseline * Address suggestions * Update CI baseline Co-authored-by: chausner --- ports/plog/portfile.cmake | 16 +++++++++------- ports/plog/usage | 4 ++++ ports/plog/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/p-/plog.json | 5 +++++ 5 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 ports/plog/usage diff --git a/ports/plog/portfile.cmake b/ports/plog/portfile.cmake index a4b769dc345d10..6007c168578848 100644 --- a/ports/plog/portfile.cmake +++ b/ports/plog/portfile.cmake @@ -2,14 +2,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SergiusTheBest/plog - REF 1.1.5 - SHA512 c16b428e1855c905c486130c8610d043962bedc2b40d1d986c250c8f7fd7139540164a3cbb408ed08298370aa150d5937f358c13ccae2728ce8ea47fa897fd0b + REF 1.1.6 + SHA512 5240532df96144d5026d6f879b69f7d6f393ebc9122c6458c41076fd3db998565e45ed2ab4948f8c3cb59e08c0aad7695ee416f95b49fd70209cd937220cdf8b HEAD_REF master ) -# Put the licence file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/plog) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/plog/LICENSE ${CURRENT_PACKAGES_DIR}/share/plog/copyright) - # Copy header files -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h") +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}" FILES_MATCHING PATTERN "*.h") + +# Copy usage file +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Put the licence file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/plog/usage b/ports/plog/usage new file mode 100644 index 00000000000000..6c232afda6bbe7 --- /dev/null +++ b/ports/plog/usage @@ -0,0 +1,4 @@ +The package plog is header only and can be used from CMake via: + + find_path(PLOG_INCLUDE_DIRS "plog/Log.h") + target_include_directories(main PRIVATE ${PLOG_INCLUDE_DIRS}) diff --git a/ports/plog/vcpkg.json b/ports/plog/vcpkg.json index c1de0acffa0386..4e1d89420835d9 100644 --- a/ports/plog/vcpkg.json +++ b/ports/plog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plog", - "version-string": "1.1.5", - "port-version": 1, + "version": "1.1.6", "description": "Portable, simple and extensible C++ logging library.", - "homepage": "https://github.com/SergiusTheBest/plog" + "homepage": "https://github.com/SergiusTheBest/plog", + "license": "MPL-2.0" } diff --git a/versions/baseline.json b/versions/baseline.json index 8b2dcda916eeab..2604268e4d3e96 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5449,8 +5449,8 @@ "port-version": 6 }, "plog": { - "baseline": "1.1.5", - "port-version": 1 + "baseline": "1.1.6", + "port-version": 0 }, "plplot": { "baseline": "5.13.0", diff --git a/versions/p-/plog.json b/versions/p-/plog.json index 640358487ecc56..af0042a7a3651f 100644 --- a/versions/p-/plog.json +++ b/versions/p-/plog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aaca8cb03c90bca09c7bf83b393521dce2719686", + "version": "1.1.6", + "port-version": 0 + }, { "git-tree": "7cbf2ab91e484ee21e8c62316558e11b3a49f288", "version-string": "1.1.5", From c401167e29147ea3c3763104f7ef85a730b130f2 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:38:53 +0200 Subject: [PATCH 026/383] [kangaru] Update to 4.3.0 (#24177) * Update kangaru to 4.3.0 * Update CI baseline Co-authored-by: chausner --- ports/kangaru/portfile.cmake | 26 +++++++++++++------------- ports/kangaru/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 4 ++-- versions/k-/kangaru.json | 5 +++++ 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/ports/kangaru/portfile.cmake b/ports/kangaru/portfile.cmake index 1204f85547d9f7..92ab7aadee31b0 100644 --- a/ports/kangaru/portfile.cmake +++ b/ports/kangaru/portfile.cmake @@ -1,27 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gracicot/kangaru - REF 8da8f0d5a434a6fb2f317022221ea0809914d4a6 # v4.2.4 - SHA512 e5cfdad793db3b3d5ff093e4120a5131000677504eed09c02817c9a49699c044a88183413ad7b09946abb0258df34fe444078c375a5bf70589345d2aa2c2283b + REF v4.3.0 + SHA512 7763d25eed203a033e0420abc0194531082223183ed9ec28d98f871e0dc619d28ec9053ff69b5bf54bac07bd99551f2dfaad9f29d51e8ebdd72d4929f9a8fb93 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DKANGARU_EXPORT=Off -DKANGARU_TEST=Off -DKANGARU_REVERSE_DESTRUCTION=On +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKANGARU_EXPORT=OFF + -DKANGARU_TEST=OFF + -DKANGARU_REVERSE_DESTRUCTION=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kangaru) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kangaru) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/debug + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug" ) - # Put the license file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/kangaru/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/kangaru/LICENSE ${CURRENT_PACKAGES_DIR}/share/kangaru/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kangaru/vcpkg.json b/ports/kangaru/vcpkg.json index 411c67133b602a..29b53eafc6a999 100644 --- a/ports/kangaru/vcpkg.json +++ b/ports/kangaru/vcpkg.json @@ -1,6 +1,17 @@ { "name": "kangaru", - "version-string": "4.2.4", - "port-version": 1, - "description": "A dependency injection container for C++11, C++14 and later" + "version": "4.3.0", + "description": "A dependency injection container for C++11, C++14 and later", + "homepage": "https://github.com/gracicot/kangaru", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 2604268e4d3e96..5db520d6fe7178 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3085,8 +3085,8 @@ "port-version": 3 }, "kangaru": { - "baseline": "4.2.4", - "port-version": 1 + "baseline": "4.3.0", + "port-version": 0 }, "kcp": { "baseline": "1.7", diff --git a/versions/k-/kangaru.json b/versions/k-/kangaru.json index e0cf6d2f76cdb7..81bf486ea0e7d0 100644 --- a/versions/k-/kangaru.json +++ b/versions/k-/kangaru.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6015882a3de991781c67d93b4c470aafcdd3e2b", + "version": "4.3.0", + "port-version": 0 + }, { "git-tree": "e47bf7620670afbcbb349017d71275289fa9b6a9", "version-string": "4.2.4", From ee17fb2af733b9903eb456ad9e57baa540a42cc4 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:40:29 +0200 Subject: [PATCH 027/383] [duckx] Update to 1.2.2 (#24176) * Update duckx to 1.2.2 * Update CI baseline * Use ${PORT} Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Set BUILD_TESTING=OFF * Remove duckx from ci.baseline.txt * Update CI baseline * Switch to ONLY_STATIC_LIBRARY on Windows * version Co-authored-by: chausner Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Co-authored-by: JackBoosY --- ports/duckx/portfile.cmake | 25 ++++++++++++++++--------- ports/duckx/vcpkg.json | 16 +++++++++++++--- scripts/ci.baseline.txt | 9 --------- versions/baseline.json | 4 ++-- versions/d-/duckx.json | 5 +++++ 5 files changed, 36 insertions(+), 23 deletions(-) diff --git a/ports/duckx/portfile.cmake b/ports/duckx/portfile.cmake index be1170ea35a434..3fb2ccfd333ca5 100644 --- a/ports/duckx/portfile.cmake +++ b/ports/duckx/portfile.cmake @@ -1,18 +1,25 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO amiremohamadi/DuckX - REF v1.0.0 - SHA512 21db28f5c62a5695363cb844ce0ca45057433dd622dad44278459dd0582c92a8ca98d8bf597955426636ad31776abdcfdbe51a7fbfe256cfa8adcb8a2fd9410d + REF v1.2.2 + SHA512 3f1e626973b4638adaffcc0a20f59791f3a70abda1d2d09fddca9312014cef86d097f24873e74ef58c775b27c71a637e44f340da01a301b00ef334600bd412d6 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/duckx) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/duckx) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/duckx RENAME copyright) +file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/duckx/vcpkg.json b/ports/duckx/vcpkg.json index f38749088ba67a..d1221aa3eea6bd 100644 --- a/ports/duckx/vcpkg.json +++ b/ports/duckx/vcpkg.json @@ -1,7 +1,17 @@ { "name": "duckx", - "version-string": "1.0.0", - "port-version": 1, + "version": "1.2.2", "description": "DuckX is a library for creation of Office docx files.", - "homepage": "https://github.com/amiremohamadi/DuckX" + "homepage": "https://github.com/amiremohamadi/DuckX", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ad9a3206299a94..177779a55f7ddf 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -233,15 +233,6 @@ dpdk:x64-windows-static=fail dpdk:x64-windows-static-md=fail dpdk:x64-windows=fail dpdk:x86-windows=fail -duckx:arm64-windows = skip -duckx:arm-uwp = skip -duckx:x64-linux = skip -duckx:x64-osx = skip -duckx:x64-uwp = skip -duckx:x64-windows = skip -duckx:x64-windows-static = skip -duckx:x64-windows-static-md=skip -duckx:x86-windows = skip # requires python@2 from brew, but that no longer exists # python2 EOL yay! diff --git a/versions/baseline.json b/versions/baseline.json index 5db520d6fe7178..c1d9d9b58f3825 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1957,8 +1957,8 @@ "port-version": 1 }, "duckx": { - "baseline": "1.0.0", - "port-version": 1 + "baseline": "1.2.2", + "port-version": 0 }, "duilib": { "baseline": "2019-04-28", diff --git a/versions/d-/duckx.json b/versions/d-/duckx.json index fdd584ea7b8df4..61ddd2de110381 100644 --- a/versions/d-/duckx.json +++ b/versions/d-/duckx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6637b59789032a1ef84a1c6324bc7b672e346152", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "2f862e06f527a656f8bbe1133a0ba212833f6951", "version-string": "1.0.0", From 66a54329c8b98aff83d7275e2d08e3e51e119970 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:40:58 +0200 Subject: [PATCH 028/383] [tinydir] Update to 1.2.5 (#24175) * Update tinydir to 1.2.5 * Update CI baseline * Remove unneeded vcpkg_copy_pdbs Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update CI baseline Co-authored-by: chausner Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- ports/tinydir/portfile.cmake | 9 ++++----- ports/tinydir/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/t-/tinydir.json | 5 +++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ports/tinydir/portfile.cmake b/ports/tinydir/portfile.cmake index b5e5647bc2abfb..6f5204fe174db1 100644 --- a/ports/tinydir/portfile.cmake +++ b/ports/tinydir/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cxong/tinydir - REF 1.2.4 - SHA512 476b81a089d378152c2ab644b88fe860f4a6dba9594ef5c2ae138487cb54b8f6da5538c114463619043f694b992e2de5fec925bd746f8e7fd341ebcdcaac98c0 + REF 1.2.5 + SHA512 d86a8709b92c9b6847bd85b4b307a411edf30156a06557641a051f74a7c19898451616772ee53ad2d8fc6c2ea2285c4c4edf2197f36cf48ede6d539d24ebb2cf HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/tinydir.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinydir RENAME copyright) -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/tinydir.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/tinydir" RENAME copyright) diff --git a/ports/tinydir/vcpkg.json b/ports/tinydir/vcpkg.json index 7326cdd2008e06..03789156588923 100644 --- a/ports/tinydir/vcpkg.json +++ b/ports/tinydir/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinydir", - "version-string": "1.2.4", - "port-version": 1, + "version": "1.2.5", "description": "Lightweight, portable and easy to integrate C directory and file reader", - "homepage": "https://github.com/cxong/tinydir" + "homepage": "https://github.com/cxong/tinydir", + "license": "BSD-2-Clause" } diff --git a/versions/baseline.json b/versions/baseline.json index c1d9d9b58f3825..7a92c949769f4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6973,8 +6973,8 @@ "port-version": 1 }, "tinydir": { - "baseline": "1.2.4", - "port-version": 1 + "baseline": "1.2.5", + "port-version": 0 }, "tinyexif": { "baseline": "2022-02-15", diff --git a/versions/t-/tinydir.json b/versions/t-/tinydir.json index 61a10051e6f846..e128c0a5a79a54 100644 --- a/versions/t-/tinydir.json +++ b/versions/t-/tinydir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15a20b060889d83539141c2b42ee7d856e9ab76f", + "version": "1.2.5", + "port-version": 0 + }, { "git-tree": "ce7697b2c8be56998fc7b97681fcd6e1d66cf49f", "version-string": "1.2.4", From ebb431692dea901458cb90088553a52b3c2398e3 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:41:29 +0200 Subject: [PATCH 029/383] [libxml2] Update to 2.9.13 (#24166) * [libxml2] Update to 2.9.13 * version * Fix patch * version Co-authored-by: Billy Robert O'Neal --- ports/libxml2/disable-docs.patch | 16 ++++++++++++++++ ports/libxml2/fix-uwp.patch | 6 +++--- ports/libxml2/fix_cmakelist.patch | 31 ++++++++++--------------------- ports/libxml2/portfile.cmake | 17 +++++++++-------- ports/libxml2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libxml2.json | 5 +++++ 7 files changed, 46 insertions(+), 36 deletions(-) create mode 100644 ports/libxml2/disable-docs.patch diff --git a/ports/libxml2/disable-docs.patch b/ports/libxml2/disable-docs.patch new file mode 100644 index 00000000000000..b00bafacfc5d66 --- /dev/null +++ b/ports/libxml2/disable-docs.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f922d5ab..70466bc7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -647,11 +647,6 @@ if(LIBXML2_WITH_PYTHON) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2.py DESTINATION ${LIBXML2_PYTHON_INSTALL_DIR} COMPONENT runtime) + endif() + +-install(FILES libxml.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) +-install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) +-install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) +-install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONENT documentation PATTERN Makefile.* EXCLUDE) +- + configure_package_config_file( + libxml2-config.cmake.cmake.in libxml2-config.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} diff --git a/ports/libxml2/fix-uwp.patch b/ports/libxml2/fix-uwp.patch index ce57a9ed1237c4..98a5bff4420802 100644 --- a/ports/libxml2/fix-uwp.patch +++ b/ports/libxml2/fix-uwp.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b45d62..ba8bfec 100644 +index f922d5ab..6eb0a7fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -129,6 +129,7 @@ endif() +@@ -134,6 +134,7 @@ endif() if(MSVC) configure_file(include/win32config.h config.h COPYONLY) -+ add_compile_options(/wd4996) ++ add_compile_options(/wd4996) else() check_c_source_compiles(" void __attribute__((destructor)) diff --git a/ports/libxml2/fix_cmakelist.patch b/ports/libxml2/fix_cmakelist.patch index b98ca86eca16e2..494bb8a71abc22 100644 --- a/ports/libxml2/fix_cmakelist.patch +++ b/ports/libxml2/fix_cmakelist.patch @@ -1,16 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a437717ba..0a11039d1 100644 +index f922d5ab..685964b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 3.15) - --project(libxml2 VERSION 2.9.10 LANGUAGES C) -+project(libxml2 VERSION 2.9.12 LANGUAGES C) - - include(CheckCSourceCompiles) - include(CheckFunctionExists) -@@ -465,15 +465,15 @@ endif() +@@ -459,15 +459,15 @@ endif() if(LIBXML2_WITH_ICU) target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc) if(WIN32) @@ -29,7 +21,7 @@ index a437717ba..0a11039d1 100644 endif() if(LIBXML2_WITH_THREADS) -@@ -483,7 +483,7 @@ endif() +@@ -477,7 +477,7 @@ endif() if(LIBXML2_WITH_ZLIB) target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB) @@ -38,11 +30,10 @@ index a437717ba..0a11039d1 100644 endif() set_target_properties( -@@ -495,24 +495,9 @@ set_target_properties( - PREFIX lib +@@ -490,23 +490,9 @@ set_target_properties( VERSION ${PROJECT_VERSION} ) -- + +set(XML_LIB_NAME xml2) if(MSVC) - if(BUILD_SHARED_LIBS) @@ -61,11 +52,11 @@ index a437717ba..0a11039d1 100644 - RELWITHDEBINFO_POSTFIX s - ) - endif() -+ set(XML_LIB_NAME libxml2) ++ set(XML_LIB_NAME libxml2) endif() install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) -@@ -659,30 +644,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN +@@ -654,30 +640,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN configure_package_config_file( libxml2-config.cmake.cmake.in libxml2-config.cmake @@ -102,17 +93,15 @@ index a437717ba..0a11039d1 100644 FILE libxml2-export.cmake COMPONENT development diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index 2653a7c56..d1bff5bcc 100644 +index 2653a7c5..2eb2f362 100644 --- a/libxml-2.0.pc.in +++ b/libxml-2.0.pc.in -@@ -7,7 +7,8 @@ modules=@WITH_MODULES@ - Name: libXML +@@ -8,6 +8,7 @@ Name: libXML Version: @VERSION@ Description: libXML library version2. --Requires: + Requires: -Libs: -L${libdir} -lxml2 -Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ -+Requires: +Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@ +Libs: -L${libdir} -l@XML_LIB_NAME@ +Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index 931dc7756d9f8c..3f0fb98303cd36 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -2,10 +2,11 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxml2 - REF b48e77cf4f6fa0792c5f4b639707a2b0675e461b - SHA512 2d20867961b8d8a0cb0411192146882b976c1276d2e8ecd9a7ee3f1eb287f64e59282736f58c641b66abf63ba45c9421f27e13ec09a0b10814cd56987b18cb5b + REF a075d256fd9ff15590b86d981b75a50ead124fca + SHA512 bcf437b43357400f89e8766a23e841c090c48dfc1bdbb200971013e6c9ed082fb03759248547dfbd5dabf4b6887f69fed6ad790174ec206e20d47dfde2c875ab HEAD_REF master PATCHES + disable-docs.patch fix_cmakelist.patch fix-uwp.patch ) @@ -19,10 +20,10 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "tools" LIBXML2_WITH_PROGRAMS + "tools" LIBXML2_WITH_PROGRAMS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DLIBXML2_WITH_TESTS=OFF @@ -85,10 +86,10 @@ endif() file(COPY "${CURRENT_PACKAGES_DIR}/include/libxml2/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # TODO: Fix usage in all dependent ports hardcoding the wrong include path. -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - #Cleanup file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index b28e844f3e1088..276a8079e09932 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libxml2", - "version-semver": "2.9.12", - "port-version": 5, + "version-semver": "2.9.13", "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7a92c949769f4a..531e12b2511801 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4181,8 +4181,8 @@ "port-version": 0 }, "libxml2": { - "baseline": "2.9.12", - "port-version": 5 + "baseline": "2.9.13", + "port-version": 0 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index e3f0b4de36b2e2..63b6e758b1f95c 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0da62e928cc294ad51a384594db59d6ff2dc49d4", + "version-semver": "2.9.13", + "port-version": 0 + }, { "git-tree": "582189632eff9dc4ba2ef262a853c339d2838bd9", "version-semver": "2.9.12", From e3f3206363a6ae3a628ddf20b2be16cc39f9ad89 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:41:49 +0200 Subject: [PATCH 030/383] [mimalloc] Update to 2.0.6 (#24165) * Update mimalloc to 2.0.6 * Update CI baseline Co-authored-by: chausner --- ports/mimalloc/portfile.cmake | 4 ++-- ports/mimalloc/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/m-/mimalloc.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index c1a47d2bdf4b3e..17645a6a0db61a 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc - REF v2.0.5 - SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d + REF v2.0.6 + SHA512 f2fc0fbfb6384e85959897f129e5d5d9acc51bda536d5cabcd7d4177dbda9fb735b8a8c239b961f8bea31d37c9ae10f66da23aa91d497f95393253d4ac792bb3 HEAD_REF master PATCHES fix-cmake.patch diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index 1a9c98b72160b0..60508c3b5c059d 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mimalloc", - "version": "2.0.5", - "port-version": 1, + "version": "2.0.6", "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 531e12b2511801..4d2f3fd080aaae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4497,8 +4497,8 @@ "port-version": 4 }, "mimalloc": { - "baseline": "2.0.5", - "port-version": 1 + "baseline": "2.0.6", + "port-version": 0 }, "minc": { "baseline": "2.4.03", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index d5427e0d180c94..cf993872242223 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5d0b88ffbb864754eb8b01ac111f84adb8a36a8", + "version": "2.0.6", + "port-version": 0 + }, { "git-tree": "e4dc5fc89e8c1f860b9f07b3d449a5d67f56cfd4", "version": "2.0.5", From eaf727e2504e2ee481a94d54e0ce775c98d86239 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:42:04 +0200 Subject: [PATCH 031/383] [glog] no absolute paths (#24162) --- ports/glog/portfile.cmake | 1 + ports/glog/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/glog.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 5738ba092c3929..297ee84ae62ee5 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -25,5 +25,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index 3c0296ec8c68a4..5f9b2962eaf872 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glog", "version": "0.5.0", + "port-version": 1, "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 4d2f3fd080aaae..a7c7027762ec10 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2550,7 +2550,7 @@ }, "glog": { "baseline": "0.5.0", - "port-version": 0 + "port-version": 1 }, "gloo": { "baseline": "20201203", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index b34d37318e4f8d..db91915a0bc64c 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0809e03781b0f3f322236ad964b6caa464dfe21", + "version": "0.5.0", + "port-version": 1 + }, { "git-tree": "55b03c1cae45ba6b081c9072e6431d720467c82b", "version": "0.5.0", From 793422a0027cfa0cc26daffd7d5f04f511a57563 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:43:04 +0200 Subject: [PATCH 032/383] [mpg123] fix M1 build (#24161) --- ports/mpg123/fix-m1-build.patch | 13 +++++++++++++ ports/mpg123/portfile.cmake | 6 ++++++ ports/mpg123/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mpg123.json | 5 +++++ 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 ports/mpg123/fix-m1-build.patch diff --git a/ports/mpg123/fix-m1-build.patch b/ports/mpg123/fix-m1-build.patch new file mode 100644 index 00000000000000..f8367d3ef93b9f --- /dev/null +++ b/ports/mpg123/fix-m1-build.patch @@ -0,0 +1,13 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index ee9a1ba..81d23f8 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -185,7 +185,7 @@ if(NO_MESSAGES) + set(NO_ERETURN ON) + endif() + +-if(WIN32) ++if(WIN32 OR APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm) + set(HAVE_FPU 1) + else() + cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 87a07c267a7ae9..080ec09e4ec599 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_sourceforge( PATCHES no-executables.patch fix-modulejack.patch + fix-m1-build.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -28,4 +29,9 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_TARGET_IS_OSX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index a2723881a2e763..50daa81591905d 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpg123", "version": "1.29.2", - "port-version": 2, + "port-version": 3, "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index a7c7027762ec10..64697f8a292ce8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4634,7 +4634,7 @@ }, "mpg123": { "baseline": "1.29.2", - "port-version": 2 + "port-version": 3 }, "mpi": { "baseline": "1", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index ead30f3ac3b684..6f87618c878669 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3b079fc036d9384ae34ead0db7c689499937039", + "version": "1.29.2", + "port-version": 3 + }, { "git-tree": "f03fbe2d20adf858700d4c90204ff808d00c34b2", "version": "1.29.2", From 0544d18e3b8029e6edbc2841183d6b2c4b7566e9 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 19 Apr 2022 01:43:22 +0200 Subject: [PATCH 033/383] [simbody] Disable docs (#24159) * [simbody] Disable docs * license * Remove docs * version --- ports/simbody/portfile.cmake | 3 +++ ports/simbody/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/s-/simbody.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/simbody/portfile.cmake b/ports/simbody/portfile.cmake index d3287e03b3c236..4b4d990fdc7cb1 100644 --- a/ports/simbody/portfile.cmake +++ b/ports/simbody/portfile.cmake @@ -20,6 +20,8 @@ vcpkg_cmake_configure( -DBUILD_VISUALIZER=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF + -DBUILD_TESTS_AND_EXAMPLES_STATIC=OFF + -DBUILD_TESTS_AND_EXAMPLES_SHARED=OFF ) vcpkg_cmake_install() @@ -32,6 +34,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc") vcpkg_fixup_pkgconfig() diff --git a/ports/simbody/vcpkg.json b/ports/simbody/vcpkg.json index c35c85a01d5ab8..51cb881fb99571 100644 --- a/ports/simbody/vcpkg.json +++ b/ports/simbody/vcpkg.json @@ -1,9 +1,10 @@ { "name": "simbody", "version-date": "2022-01-04", - "port-version": 1, + "port-version": 2, "description": "High-performance C++ multibody dynamics/physics library for simulating articulated biomechanical and mechanical systems like vehicles, robots, and the human skeleton.", "homepage": "https://simtk.org/home/simbody", + "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ "blas", diff --git a/versions/baseline.json b/versions/baseline.json index 64697f8a292ce8..42cc9db0166c54 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6486,7 +6486,7 @@ }, "simbody": { "baseline": "2022-01-04", - "port-version": 1 + "port-version": 2 }, "simde": { "baseline": "0.7.2", diff --git a/versions/s-/simbody.json b/versions/s-/simbody.json index d3c76f8e03fb31..df589c4477145b 100644 --- a/versions/s-/simbody.json +++ b/versions/s-/simbody.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "077f05087ad6704e1febb44e27273550028c5729", + "version-date": "2022-01-04", + "port-version": 2 + }, { "git-tree": "09ced08b16274ddf38f64031b659a76b8aea2e85", "version-date": "2022-01-04", From d35a986b579e649a34454b4a1e9f0fbcac7a33df Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 18 Apr 2022 16:44:47 -0700 Subject: [PATCH 034/383] [antlr4] Fix CMake files export (#24157) * [antlr4] Fix CMake export * update vcpkg.json * update version * fix build * update version Co-authored-by: Lily Wang --- ports/antlr4/fix_utfcpp_dependency.patch | 31 ------ ports/antlr4/fixed_build.patch | 131 ++++++++++++++++++----- ports/antlr4/portfile.cmake | 53 ++------- ports/antlr4/vcpkg.json | 7 +- versions/a-/antlr4.json | 5 + versions/baseline.json | 2 +- 6 files changed, 123 insertions(+), 106 deletions(-) delete mode 100644 ports/antlr4/fix_utfcpp_dependency.patch diff --git a/ports/antlr4/fix_utfcpp_dependency.patch b/ports/antlr4/fix_utfcpp_dependency.patch deleted file mode 100644 index a055df4707b617..00000000000000 --- a/ports/antlr4/fix_utfcpp_dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -urN a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt ---- a/runtime/CMakeLists.txt -+++ b/runtime/CMakeLists.txt -@@ -51,27 +51,6 @@ else() - - if (utf8cpp_HEADER) - include_directories(${utf8cpp_HEADER}) -- else() -- include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) -- set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty) -- set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp) -- ExternalProject_Add( -- utf8cpp -- GIT_REPOSITORY "https://github.com/nemtrif/utfcpp" -- GIT_TAG "v3.1.1" -- SOURCE_DIR ${UTFCPP_DIR} -- UPDATE_DISCONNECTED 1 -- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -DUTF8_TESTS=off -DUTF8_SAMPLES=off -- STEP_TARGETS build) -- -- include_directories( -- ${UTFCPP_DIR}/install/include/utf8cpp -- ${UTFCPP_DIR}/install/include/utf8cpp/utf8 -- ) -- -- add_dependencies(antlr4_shared utf8cpp) -- add_dependencies(antlr4_static utf8cpp) -- set(INSTALL_utf8cpp TRUE) - endif() - endif() - diff --git a/ports/antlr4/fixed_build.patch b/ports/antlr4/fixed_build.patch index e0f8ff91f0b5d1..3afb4c24986ab0 100644 --- a/ports/antlr4/fixed_build.patch +++ b/ports/antlr4/fixed_build.patch @@ -1,38 +1,115 @@ -diff -urN a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt +diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt +index c8b16c6..53b47dd 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt -@@ -25,7 +25,7 @@ +@@ -21,10 +21,13 @@ file(GLOB libantlrcpp_SRC + "${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath/*.cpp" + ) + ++if(BUILD_SHARED_LIBS) add_library(antlr4_shared SHARED ${libantlrcpp_SRC}) ++else() add_library(antlr4_static STATIC ${libantlrcpp_SRC}) - ++endif() + -set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here. -+# set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here. ++#set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here. message(STATUS "Output libraries to ${LIB_OUTPUT_DIR}") - + # make sure 'make' works fine even if ${LIB_OUTPUT_DIR} is deleted. -@@ -63,15 +63,15 @@ +@@ -32,16 +35,22 @@ add_custom_target(make_lib_output_dir ALL + COMMAND ${CMAKE_COMMAND} -E make_directory ${LIB_OUTPUT_DIR} + ) + ++if(BUILD_SHARED_LIBS) + add_dependencies(antlr4_shared make_lib_output_dir) ++else() + add_dependencies(antlr4_static make_lib_output_dir) ++endif() + + find_package(utf8cpp QUIET) + + set(INSTALL_utf8cpp FALSE) + + if (utf8cpp_FOUND) ++ if(BUILD_SHARED_LIBS) + target_link_libraries(antlr4_shared utf8cpp) ++ else() + target_link_libraries(antlr4_static utf8cpp) ++ endif() + else() + + # older utf8cpp doesn't define the package above +@@ -51,7 +60,7 @@ else() + + if (utf8cpp_HEADER) + include_directories(${utf8cpp_HEADER}) +- else() ++ elseif(0) + include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) + set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty) + set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp) +@@ -76,11 +85,17 @@ else() + endif() + + if(CMAKE_SYSTEM_NAME MATCHES "Linux") ++ if(BUILD_SHARED_LIBS) + target_link_libraries(antlr4_shared ${UUID_LIBRARIES}) ++ else() + target_link_libraries(antlr4_static ${UUID_LIBRARIES}) ++ endif() + elseif(APPLE) ++ if(BUILD_SHARED_LIBS) + target_link_libraries(antlr4_shared ${COREFOUNDATION_LIBRARY}) ++ else() + target_link_libraries(antlr4_static ${COREFOUNDATION_LIBRARY}) ++ endif() + endif() + + if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") +@@ -102,7 +117,7 @@ if(WIN32) set(extra_share_compile_flags "-DANTLR4CPP_EXPORTS") set(extra_static_compile_flags "-DANTLR4CPP_STATIC") endif(WIN32) -if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") -- if(WITH_STATIC_CRT) -- target_compile_options(antlr4_shared PRIVATE "/MT$<$:d>") -- target_compile_options(antlr4_static PRIVATE "/MT$<$:d>") -- else() -- target_compile_options(antlr4_shared PRIVATE "/MD$<$:d>") -- target_compile_options(antlr4_static PRIVATE "/MD$<$:d>") -- endif() --endif() -+# if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") -+# if(WITH_STATIC_CRT) -+# target_compile_options(antlr4_shared PRIVATE "/MT$<$:d>") -+# target_compile_options(antlr4_static PRIVATE "/MT$<$:d>") -+# else() -+# target_compile_options(antlr4_shared PRIVATE "/MD$<$:d>") -+# target_compile_options(antlr4_static PRIVATE "/MD$<$:d>") -+# endif() -+# endif() - - set(static_lib_suffix "") - if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - \ No newline at end of file ++if(0) + if(WITH_STATIC_CRT) + target_compile_options(antlr4_shared PRIVATE "/MT$<$:d>") + target_compile_options(antlr4_static PRIVATE "/MT$<$:d>") +@@ -122,6 +137,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + set(extra_static_compile_flags "-DANTLR4CPP_STATIC -MP") + endif() + ++if(BUILD_SHARED_LIBS) + set_target_properties(antlr4_shared + PROPERTIES VERSION ${ANTLR_VERSION} + SOVERSION ${ANTLR_VERSION} +@@ -132,20 +148,25 @@ set_target_properties(antlr4_shared + RUNTIME_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR} + ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR} + COMPILE_FLAGS "${disabled_compile_warnings} ${extra_share_compile_flags}") +- ++else() + set_target_properties(antlr4_static + PROPERTIES VERSION ${ANTLR_VERSION} + SOVERSION ${ANTLR_VERSION} + OUTPUT_NAME "antlr4-runtime${static_lib_suffix}" + ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR} + COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}") ++endif() + +-install(TARGETS antlr4_shared ++if(BUILD_SHARED_LIBS) ++install(TARGETS antlr4_shared EXPORT antlr4-targets + DESTINATION lib +- EXPORT antlr4-targets) ++ RUNTIME DESTINATION bin ++ ) ++else() + install(TARGETS antlr4_static + DESTINATION lib + EXPORT antlr4-targets) ++endif() + + install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/" + DESTINATION "include/antlr4-runtime" diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 312bb688150fc9..2cef839c047516 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -22,61 +22,22 @@ vcpkg_extract_source_archive_ex( fixed_build.patch uuid_discovery_fix.patch export_guid.patch - fix_utfcpp_dependency.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DANTLR4_INSTALL=ON OPTIONS_DEBUG -DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/dist OPTIONS_RELEASE -DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/dist ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME antlr4-generator CONFIG_PATH lib/cmake/antlr4-generator DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME antlr4-runtime CONFIG_PATH lib/cmake/antlr4-runtime) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/include -) - -if (NOT VCPKG_CMAKE_SYSTEM_NAME) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime-static.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime-static.lib - ) - - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime.dll ${CURRENT_PACKAGES_DIR}/bin/antlr4-runtime.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime.dll ${CURRENT_PACKAGES_DIR}/debug/bin/antlr4-runtime.dll) - else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime.lib - ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime.dll - ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime.dll - ) - - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime-static.lib ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime-static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime.lib) - endif() -else() - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libantlr4-runtime.a - ${CURRENT_PACKAGES_DIR}/debug/lib/libantlr4-runtime.a - ) - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libantlr4-runtime.so - ${CURRENT_PACKAGES_DIR}/lib/libantlr4-runtime.so.${VERSION} - ${CURRENT_PACKAGES_DIR}/debug/lib/libantlr4-runtime.so - ${CURRENT_PACKAGES_DIR}/debug/lib/libantlr4-runtime.so.${VERSION} - ) - else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libantlr4-runtime.dylib - ${CURRENT_PACKAGES_DIR}/lib/libantlr4-runtime.${VERSION}.dylib - ${CURRENT_PACKAGES_DIR}/debug/lib/libantlr4-runtime.dylib - ${CURRENT_PACKAGES_DIR}/debug/lib/libantlr4-runtime.${VERSION}.dylib - ) - endif() -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${LICENSE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/antlr4/vcpkg.json b/ports/antlr4/vcpkg.json index 442ba951507d82..d8db31ef52796d 100644 --- a/ports/antlr4/vcpkg.json +++ b/ports/antlr4/vcpkg.json @@ -1,9 +1,10 @@ { "name": "antlr4", "version": "4.9.3", - "port-version": 1, + "port-version": 2, "description": "ANother Tool for Language Recognition", "homepage": "https://www.antlr.org", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ { @@ -13,6 +14,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/a-/antlr4.json b/versions/a-/antlr4.json index c256005fb66aa0..c076e109661693 100644 --- a/versions/a-/antlr4.json +++ b/versions/a-/antlr4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a716f472a0639199a0a843a64795a88a39f5dee", + "version": "4.9.3", + "port-version": 2 + }, { "git-tree": "0a3fbd320c22b3c017fe13fb4cac5fe330c0df99", "version": "4.9.3", diff --git a/versions/baseline.json b/versions/baseline.json index 42cc9db0166c54..8e130c1b7e2a0e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -90,7 +90,7 @@ }, "antlr4": { "baseline": "4.9.3", - "port-version": 1 + "port-version": 2 }, "any-lite": { "baseline": "0.4.0", From 97b723c3467f53fc49ea9c8c118658ee526d7817 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 19 Apr 2022 01:45:15 +0200 Subject: [PATCH 035/383] [vcpkg-cmake] Fix usage of CMAKE_CXX_COMPILER_TARGET (#24101) * Guard CMAKE_CXX_COMPILER_TARGET * Update versions --- ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt | 2 +- ports/vcpkg-cmake/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt index 190455d9a66969..29951f5ad20e64 100644 --- a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt +++ b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt @@ -111,7 +111,7 @@ endif() if(CMAKE_CXX_COMPILER_TARGET) if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}\"") - else() + elseif(CMAKE_CXX_COMPILE_OPTIONS_TARGET) string(APPEND EXTRA_FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} \"${CMAKE_CXX_COMPILER_TARGET}\"") endif() endif() diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index dbfc761c446ec4..842abb832ac39b 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-04-07", + "version-date": "2022-04-12", "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index 8e130c1b7e2a0e..5a4765c0d354dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7297,7 +7297,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-07", + "baseline": "2022-04-12", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index fb83ccdf337642..fd801a9bc4d763 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef4a9463f802c1cd6f8b31e560529aeaee0faff4", + "version-date": "2022-04-12", + "port-version": 0 + }, { "git-tree": "3dcb01563c0de941013579456d19ce5b0bd08a6e", "version-date": "2022-04-07", From 239bf7610183ddc4014db06788ef8365afc65c25 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 06:04:15 +0200 Subject: [PATCH 036/383] [vlpp] fix to support ARM on unix (#24191) * [vlpp] does not support osx arm * fix ARM, rather than just marking !supports * add license * ughhhh lack of malloc Co-authored-by: nicole mazzuca --- ports/vlpp/fix-arm.patch | 34 ++++++++++++++++++++++++++++++++++ ports/vlpp/portfile.cmake | 1 + ports/vlpp/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/v-/vlpp.json | 5 +++++ 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 ports/vlpp/fix-arm.patch diff --git a/ports/vlpp/fix-arm.patch b/ports/vlpp/fix-arm.patch new file mode 100644 index 00000000000000..862e94f0819e1c --- /dev/null +++ b/ports/vlpp/fix-arm.patch @@ -0,0 +1,34 @@ +--- a/Import/Vlpp.h ++++ b/Import/Vlpp.h +@@ -50,13 +50,12 @@ + #define abstract + #endif +- ++#include + #if defined VCZH_MSVC + #include + #elif defined VCZH_GCC +-#include + #include + #include + #include + #define abstract + #define __thiscall + #define __forceinline inline +@@ -160,14 +159,14 @@ + #define UI64TOA_S _ui64toa_s + #define UI64TOW_S _ui64tow_s + #if defined VCZH_MSVC + #define INCRC(x) (_InterlockedIncrement((volatile long*)(x))) + #define DECRC(x) (_InterlockedDecrement((volatile long*)(x))) + #elif defined VCZH_GCC +-#define INCRC(x) (__sync_add_and_fetch(x, 1)) +-#define DECRC(x) (__sync_sub_and_fetch(x, 1)) ++#define INCRC(x) (__atomic_add_fetch(x, 1, __ATOMIC_SEQ_CST)) ++#define DECRC(x) (__atomic_sub_fetch(x, 1, __ATOMIC_SEQ_CST)) + #endif + #endif + + /*********************************************************************** + Basic Types + ***********************************************************************/ diff --git a/ports/vlpp/portfile.cmake b/ports/vlpp/portfile.cmake index b7f91d9ee7bd40..ee1591d872453a 100644 --- a/ports/vlpp/portfile.cmake +++ b/ports/vlpp/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF 5dfe25c4f4997da2d7a23bdc80c2438e72d9813a # 0.11.0.0 SHA512 5d585e561246385b074c625a3644b79defa22328dab0ab14112c846cb917f384abb617a5f400971ca29e4ee5ac391b88b17ee65d594caf9ebf279806db669a4a HEAD_REF master + PATCHES fix-arm.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/vlpp/vcpkg.json b/ports/vlpp/vcpkg.json index 3bc64f290ebba5..01662b3009c678 100644 --- a/ports/vlpp/vcpkg.json +++ b/ports/vlpp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "vlpp", - "version-string": "0.11.0.0", - "port-version": 2, + "version": "0.11.0.0", + "port-version": 3, "description": "Common C++ construction, including string operation / generic container / linq / General-LR parser generator / multithreading / reflection for C++ / etc", "homepage": "https://github.com/vczh-libraries/Release", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 5a4765c0d354dc..82351d0fb342a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7366,7 +7366,7 @@ }, "vlpp": { "baseline": "0.11.0.0", - "port-version": 2 + "port-version": 3 }, "volk": { "baseline": "1.3.204", diff --git a/versions/v-/vlpp.json b/versions/v-/vlpp.json index 37a6699ba2e81c..31ead26bdbfe12 100644 --- a/versions/v-/vlpp.json +++ b/versions/v-/vlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4f56db04c13b5bf335e4e5939617596e15e89ac", + "version": "0.11.0.0", + "port-version": 3 + }, { "git-tree": "cfa763a8d53142b93748fde4a578ddbd95431ac2", "version-string": "0.11.0.0", From 0495716066d3eb2ca086b8c812b30e7d82daec54 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 19 Apr 2022 15:59:53 +0200 Subject: [PATCH 037/383] [harfbuzz] Fix mingw (#24206) * Fix mingw build * Update versions * fix license Co-authored-by: nicole mazzuca --- ports/harfbuzz/fix-mingw-build.patch | 17 +++++++++++++++++ ports/harfbuzz/portfile.cmake | 1 + ports/harfbuzz/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 ports/harfbuzz/fix-mingw-build.patch diff --git a/ports/harfbuzz/fix-mingw-build.patch b/ports/harfbuzz/fix-mingw-build.patch new file mode 100644 index 00000000000000..25fa3662238d63 --- /dev/null +++ b/ports/harfbuzz/fix-mingw-build.patch @@ -0,0 +1,17 @@ +diff --git a/meson.build b/meson.build +index 41344b3a33..8fb68f296a 100644 +--- a/meson.build ++++ b/meson.build +@@ -57,6 +57,12 @@ if host_machine.cpu_family() == 'arm' and cpp.alignment('struct { char c; }') != + endif + endif + ++if host_machine.system() == 'windows' ++ add_project_arguments(cpp.get_supported_arguments([ ++ '-Wa,-mbig-obj' ++ ]), language : 'cpp') ++endif ++ + check_headers = [ + ['unistd.h'], + ['sys/mman.h'], diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index d122034164e693..a597b5f1f3c7f4 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( 0001-circumvent-samefile-error.patch 0002-fix-uwp-build.patch fix-macos-build.diff # fixes https://github.com/harfbuzz/harfbuzz/issues/3484 + fix-mingw-build.patch # https://github.com/harfbuzz/harfbuzz/pull/3385 ) if("icu" IN_LIST FEATURES) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 7b444a36041d88..701d00f86fdff6 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,9 +1,10 @@ { "name": "harfbuzz", "version-semver": "3.2.0", - "port-version": 2, + "port-version": 3, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", + "license": "MIT-Modern-Variant", "dependencies": [ { "name": "freetype", diff --git a/versions/baseline.json b/versions/baseline.json index 82351d0fb342a8..a243598394e49f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2722,7 +2722,7 @@ }, "harfbuzz": { "baseline": "3.2.0", - "port-version": 2 + "port-version": 3 }, "hayai": { "baseline": "2019-08-10", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 0f296ad129e287..f6416d8e1d889a 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c4a2589742ad6156667771b0cf38ecb46e8c797", + "version-semver": "3.2.0", + "port-version": 3 + }, { "git-tree": "fb0fcb23cc704f5a2bca6fc631622309876ab271", "version-semver": "3.2.0", From 8e957337289e59cb709a910d8ac80ba5eddc3348 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 16:49:32 +0200 Subject: [PATCH 038/383] [portable-snippets] no arm osx (#24236) --- ports/portable-snippets/vcpkg.json | 8 +++++--- versions/baseline.json | 2 +- versions/p-/portable-snippets.json | 5 +++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/portable-snippets/vcpkg.json b/ports/portable-snippets/vcpkg.json index acd3cde956da84..f10854b20b8849 100644 --- a/ports/portable-snippets/vcpkg.json +++ b/ports/portable-snippets/vcpkg.json @@ -1,7 +1,9 @@ { "name": "portable-snippets", - "version-string": "2019-09-20", - "port-version": 1, + "version-date": "2019-09-20", + "port-version": 2, "description": "Collection of miscellaneous portable C snippets", - "homepage": "https://github.com/nemequ/portable-snippets" + "homepage": "https://github.com/nemequ/portable-snippets", + "license": null, + "supports": "!(arm & osx)" } diff --git a/versions/baseline.json b/versions/baseline.json index a243598394e49f..ae763b9a876066 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5514,7 +5514,7 @@ }, "portable-snippets": { "baseline": "2019-09-20", - "port-version": 1 + "port-version": 2 }, "portaudio": { "baseline": "19.7", diff --git a/versions/p-/portable-snippets.json b/versions/p-/portable-snippets.json index 18be8b9f5bd042..80d2d3d3909c51 100644 --- a/versions/p-/portable-snippets.json +++ b/versions/p-/portable-snippets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c955bc2bba510d1fd09122a7b16f8eff1284d922", + "version-date": "2019-09-20", + "port-version": 2 + }, { "git-tree": "7a24a15b684910521e29c4b5e2c6660329f306c9", "version-string": "2019-09-20", From c5c96e8b53959c25eb4ede2dcf4c01a915ae0fdd Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 17:16:20 +0200 Subject: [PATCH 039/383] [libcds] add support expression (#24233) --- ports/libcds/vcpkg.json | 6 ++++-- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/l-/libcds.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libcds/vcpkg.json b/ports/libcds/vcpkg.json index 2464e61ce2f500..ceb4e56a2f52b2 100644 --- a/ports/libcds/vcpkg.json +++ b/ports/libcds/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libcds", - "version-string": "2.3.3", - "port-version": 1, + "version": "2.3.3", + "port-version": 2, "description": "a collection of concurrent containers that don't require external (manual) synchronization for shared access, and safe memory reclamation (SMR) algorithms like Hazard Pointer and user-space RCU that is used as an epoch-based SMR.", "homepage": "https://github.com/khizmax/libcds", + "license": "BSL-1.0", + "supports": "!(arm & (osx | windows)) & !uwp", "dependencies": [ "boost-system", "boost-thread" diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 177779a55f7ddf..39beef8949d31a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -476,9 +476,6 @@ libbf:x64-windows-static-md=fail libbf:x86-windows=fail libbson:arm-uwp=fail libbson:x64-uwp=fail -libcds:arm64-windows=fail -libcds:arm-uwp=fail -libcds:x64-uwp=fail libcopp:arm64-windows=fail libcopp:arm-uwp=fail # Missing system libraries on linux to run/prepare autoconf diff --git a/versions/baseline.json b/versions/baseline.json index ae763b9a876066..d47fff474b1049 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3438,7 +3438,7 @@ }, "libcds": { "baseline": "2.3.3", - "port-version": 1 + "port-version": 2 }, "libcerf": { "baseline": "1.13", diff --git a/versions/l-/libcds.json b/versions/l-/libcds.json index fcdaa2d5cdf4f9..60bbde65468424 100644 --- a/versions/l-/libcds.json +++ b/versions/l-/libcds.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2030ee3d0c39352e9617f28fb14ed17c20b96741", + "version": "2.3.3", + "port-version": 2 + }, { "git-tree": "9c4f193efcb3e703332e10483b443570e1af5ae7", "version-string": "2.3.3", From 5eeffb9036d260b3c4d88705496e5dbcfc167a7d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 17:16:52 +0200 Subject: [PATCH 040/383] [sdl1] add support expression (#24232) --- ports/sdl1/vcpkg.json | 6 ++++-- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/s-/sdl1.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/sdl1/vcpkg.json b/ports/sdl1/vcpkg.json index 299c16461f215e..c8fae8fcae0077 100644 --- a/ports/sdl1/vcpkg.json +++ b/ports/sdl1/vcpkg.json @@ -1,7 +1,9 @@ { "name": "sdl1", "version": "1.2.15", - "port-version": 15, + "port-version": 16, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", - "homepage": "https://www.libsdl.org" + "homepage": "https://www.libsdl.org", + "license": "LGPL-2.1+", + "supports": "!osx & !uwp" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 39beef8949d31a..b3c08b02910d6c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1139,9 +1139,6 @@ sdformat9:arm-uwp=fail sdformat9:x64-linux=fail sdformat9:x64-uwp=fail sdformat9:x64-windows-static-md=fail -sdl1:arm-uwp=fail -sdl1:x64-uwp=fail -sdl1:x64-osx=fail sdl2-mixer:arm-uwp=fail sdl2-mixer:x64-uwp=fail sdl2-net:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index d47fff474b1049..8eb30010126883 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6362,7 +6362,7 @@ }, "sdl1": { "baseline": "1.2.15", - "port-version": 15 + "port-version": 16 }, "sdl1-net": { "baseline": "1.2.8", diff --git a/versions/s-/sdl1.json b/versions/s-/sdl1.json index eaa05de79d8f97..1ed29fc4b6d11a 100644 --- a/versions/s-/sdl1.json +++ b/versions/s-/sdl1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ffe0bac6645cd0fe0c98a0c33cf86a6bc2ddcfc", + "version": "1.2.15", + "port-version": 16 + }, { "git-tree": "4a3aba1bba75ee6d613144dbd6b2c64cbe6a090c", "version": "1.2.15", From 03de4e9edcd30b9ec6c11cb0ff83c022a31be712 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 17:17:40 +0200 Subject: [PATCH 041/383] [protozero] update to 1.7.1 (#24231) --- ports/protozero/fix-builderror.patch | 13 ------------- ports/protozero/fix-no-tests.patch | 17 +++++++++++++++++ ports/protozero/portfile.cmake | 9 +++++---- ports/protozero/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 4 ++-- versions/p-/protozero.json | 5 +++++ 7 files changed, 31 insertions(+), 23 deletions(-) delete mode 100644 ports/protozero/fix-builderror.patch create mode 100644 ports/protozero/fix-no-tests.patch diff --git a/ports/protozero/fix-builderror.patch b/ports/protozero/fix-builderror.patch deleted file mode 100644 index 74ae3980048760..00000000000000 --- a/ports/protozero/fix-builderror.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9702d6..bd41cbe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,7 +29,7 @@ if(MSVC) - add_definitions(/W3) - add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS) - else() -- add_definitions(-std=c++11 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default) -+ add_definitions(-std=c++17 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default) - if(WERROR) - add_definitions(-Werror) - endif() diff --git a/ports/protozero/fix-no-tests.patch b/ports/protozero/fix-no-tests.patch new file mode 100644 index 00000000000000..6cedbd96529379 --- /dev/null +++ b/ports/protozero/fix-no-tests.patch @@ -0,0 +1,17 @@ +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 00:11:38 +0100 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b975d490..df2ca15f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + # + #----------------------------------------------------------------------------- + +-find_package(Protobuf) ++if(BUILD_TESTING) ++ find_package(Protobuf) ++endif() + + + #----------------------------------------------------------------------------- diff --git a/ports/protozero/portfile.cmake b/ports/protozero/portfile.cmake index abfe4956b43820..84e704c3c31831 100644 --- a/ports/protozero/portfile.cmake +++ b/ports/protozero/portfile.cmake @@ -2,15 +2,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapbox/protozero - SHA512 d09a34865c535264c52f9c605ccb6f453c357f5e3a7b0dc72b097de288eabc6985a5b81ddbe79c47d0af2d8f74e33bd380fefce47acb15d8d51d5c151d71786b - REF v1.7.0 + SHA512 90bf1f487efa0ad9da2f3b887b7a6dbd849fa3687dd2126c324f902a8584722f4f7d4a2ea86f6a0e75999f7be829f6ae26cad9df1cae55d0b29a9ec24a4dbfd2 + REF v1.7.1 HEAD_REF master - PATCHES fix-builderror.patch + PATCHES + fix-no-tests.patch # from https://github.com/mapbox/protozero/pull/110 ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/protozero/vcpkg.json b/ports/protozero/vcpkg.json index 3d4ba85b9a7d50..320b34ed8e6860 100644 --- a/ports/protozero/vcpkg.json +++ b/ports/protozero/vcpkg.json @@ -1,10 +1,10 @@ { "name": "protozero", - "version-semver": "1.7.0", - "port-version": 1, + "version-semver": "1.7.1", "description": "Minimalist protocol buffer decoder and encoder in C++", "homepage": "https://github.com/mapbox/protozero", "license": "BSD-2-Clause", + "supports": "!uwp", "dependencies": [ "protobuf", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b3c08b02910d6c..31497efefad741 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1356,8 +1356,6 @@ ctp:x64-windows=skip ctp:x64-windows-static=skip ctp:x64-windows-static-md=skip ctp:x86-windows=skip -protozero:arm-uwp=fail -protozero:x64-uwp=fail # clapack is replaced by lapack-reference on the platforms lapack-reference supports clapack:x64-linux=skip diff --git a/versions/baseline.json b/versions/baseline.json index 8eb30010126883..82b08a2f122cf8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5577,8 +5577,8 @@ "port-version": 1 }, "protozero": { - "baseline": "1.7.0", - "port-version": 1 + "baseline": "1.7.1", + "port-version": 0 }, "proxygen": { "baseline": "2022.03.21.00", diff --git a/versions/p-/protozero.json b/versions/p-/protozero.json index 55c02b1a1fdc44..867cda73c80f50 100644 --- a/versions/p-/protozero.json +++ b/versions/p-/protozero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6fa6a99279f9efb98bafc45707a1bcf9ef690e4", + "version-semver": "1.7.1", + "port-version": 0 + }, { "git-tree": "e617bcd5ceeebd89da7229c7daeecacf7581d767", "version-semver": "1.7.0", From a30b972157812699718ba1314bc47288d3dfca9d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 17:19:51 +0200 Subject: [PATCH 042/383] [meschach] add support expression (#24230) --- ports/meschach/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 4 ---- versions/baseline.json | 2 +- versions/m-/meschach.json | 5 +++++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ports/meschach/vcpkg.json b/ports/meschach/vcpkg.json index b22ceba583029a..2cd52bfb1e609a 100644 --- a/ports/meschach/vcpkg.json +++ b/ports/meschach/vcpkg.json @@ -1,7 +1,8 @@ { "name": "meschach", "version-string": "1.2b", - "port-version": 4, + "port-version": 5, "description": "Matrix computations in C", - "homepage": "https://homepage.math.uiowa.edu/~dstewart/meschach" + "homepage": "https://homepage.math.uiowa.edu/~dstewart/meschach", + "supports": "windows & !uwp" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 31497efefad741..224e23f4eb9350 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -709,10 +709,6 @@ mesa:x64-windows-static-md=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail -meschach:arm-uwp=fail -meschach:x64-linux=fail -meschach:x64-osx=fail -meschach:x64-uwp=fail metis:arm-uwp=fail metis:x64-uwp=fail mfl:x64-linux=skip diff --git a/versions/baseline.json b/versions/baseline.json index 82b08a2f122cf8..28fbe7b3c3a49e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4458,7 +4458,7 @@ }, "meschach": { "baseline": "1.2b", - "port-version": 4 + "port-version": 5 }, "meshoptimizer": { "baseline": "0.16", diff --git a/versions/m-/meschach.json b/versions/m-/meschach.json index ed69f8e81746d0..abd1ed099e636c 100644 --- a/versions/m-/meschach.json +++ b/versions/m-/meschach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e475a3306653b4ab8f50dc691dff3f7fda152b83", + "version-string": "1.2b", + "port-version": 5 + }, { "git-tree": "11c21ca45a95bf05d74344c2518e3a9d107da566", "version-string": "1.2b", From 9e3519a0203f0fd00e01fc54ce37102c0a5ae33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 19 Apr 2022 17:25:21 +0200 Subject: [PATCH 043/383] [zpp-bits] Update to 4.4.4 (#24224) * [zpp-bits] Update to 4.4.4 * [zpp-bits] Update version files --- ports/zpp-bits/portfile.cmake | 9 +++------ ports/zpp-bits/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/zpp-bits.json | 5 +++++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ports/zpp-bits/portfile.cmake b/ports/zpp-bits/portfile.cmake index 02287e7b24bc97..97f383420b0ef0 100644 --- a/ports/zpp-bits/portfile.cmake +++ b/ports/zpp-bits/portfile.cmake @@ -1,14 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eyalz800/zpp_bits - REF v4.3.3 - SHA512 6534711a75d62e4244125329db436ca27bf6b8c31aa9ecb92473f4e5687aa390d9d197d1cb91ed3452363af1537ffdef4a13fe6a1c3049616576a475ba69a548 + REF v.4.4.4 + SHA512 172300f1547b985702698d7f10ac5bd804421226a8c20b26b60608aaa10bf4f9682fd1a3e49e75c309c9cb30b888f623aa5eb7ace5705d85601a2c67c8829b3f HEAD_REF master ) -file( - COPY "${SOURCE_PATH}/zpp_bits.h" - DESTINATION "${CURRENT_PACKAGES_DIR}/include" -) +file(INSTALL "${SOURCE_PATH}/zpp_bits.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/zpp-bits/vcpkg.json b/ports/zpp-bits/vcpkg.json index b75cc2d3d72734..c3b2175ca1162a 100644 --- a/ports/zpp-bits/vcpkg.json +++ b/ports/zpp-bits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zpp-bits", - "version": "4.3.3", + "version": "4.4.4", "description": "A lightweight C++20 serialization and RPC library", "homepage": "https://github.com/eyalz800/zpp_bits", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 28fbe7b3c3a49e..b8f6e9fceed8c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7689,7 +7689,7 @@ "port-version": 1 }, "zpp-bits": { - "baseline": "4.3.3", + "baseline": "4.4.4", "port-version": 0 }, "zserge-webview": { diff --git a/versions/z-/zpp-bits.json b/versions/z-/zpp-bits.json index 8b50b3560f8005..a375c231419d51 100644 --- a/versions/z-/zpp-bits.json +++ b/versions/z-/zpp-bits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c360348897285a2a3bfa0b5db6f8cc09da9893be", + "version": "4.4.4", + "port-version": 0 + }, { "git-tree": "cfb5cd37a6ed4a1ccab70eeb3112db9ad3d2f026", "version": "4.3.3", From 8dd05eb74a21267043aa913f144c7ea8ee5b2869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 19 Apr 2022 17:32:34 +0200 Subject: [PATCH 044/383] [nanobench] Update to 4.3.7 (#24225) * [nanobench] Update to 4.3.7 * [nanobench] Update version files * [nanobench] Fix build on window x86 * [nanobench] Update version files * [nanobench] Add missing patch file * [nanobench] Update version files --- ports/nanobench/fix-cmakefile.patch | 21 +++++++++++++++++++++ ports/nanobench/portfile.cmake | 17 +++++++++++------ ports/nanobench/vcpkg.json | 16 ++++++++++++++-- versions/baseline.json | 2 +- versions/n-/nanobench.json | 5 +++++ 5 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 ports/nanobench/fix-cmakefile.patch diff --git a/ports/nanobench/fix-cmakefile.patch b/ports/nanobench/fix-cmakefile.patch new file mode 100644 index 00000000000000..9dbbf94fd10724 --- /dev/null +++ b/ports/nanobench/fix-cmakefile.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2f6089..d997097 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,9 +3,6 @@ project(nanobench LANGUAGES CXX) + + # determine whether this is a standalone project or included by other projects + set(NANOBENCH_STANDALONE_PROJECT OFF) +-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) +- set(NANOBENCH_STANDALONE_PROJECT ON) +-endif() + + if (NANOBENCH_STANDALONE_PROJECT) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # generate compile_commands.json +@@ -131,4 +128,6 @@ else() + add_library(nanobench::nanobench ALIAS nanobench) + set_property(TARGET nanobench PROPERTY CXX_STANDARD 17) + target_include_directories(nanobench PUBLIC ${PROJECT_SOURCE_DIR}/src/include) ++ install(TARGETS nanobench LIBRARY DESTINATION lib) ++ install(FILES src/include/nanobench.h DESTINATION include) + endif() diff --git a/ports/nanobench/portfile.cmake b/ports/nanobench/portfile.cmake index 77b60e3805ece7..e683949b221502 100644 --- a/ports/nanobench/portfile.cmake +++ b/ports/nanobench/portfile.cmake @@ -2,15 +2,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/nanobench - REF v4.3.6 - SHA512 03e92a9fe903d273ee76c30bb6474c739858f0a65adebdcdd1e4b9ae294bd790a8e20161cb2d493fc1ea2987dbfa25a2a620cf7c3739d909595f81693f1f17d4 + REF v4.3.7 + SHA512 2f5b9573e220b507586c8586903489bd7dc2a8a09da07bd2454842a4c33c0323b0911ebeb902d5098c7dd9c96925d9bc3d4ca62fc5798f630b4b4d3e75d117a7 HEAD_REF master + PATCHES + fix-cmakefile.patch ) -file( - COPY ${SOURCE_PATH}/src/include/nanobench.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/nanobench/vcpkg.json b/ports/nanobench/vcpkg.json index ebcf47cdc187a0..11967bc5637499 100644 --- a/ports/nanobench/vcpkg.json +++ b/ports/nanobench/vcpkg.json @@ -1,7 +1,19 @@ { "name": "nanobench", - "version": "4.3.6", + "version": "4.3.7", "description": "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20", "homepage": "https://nanobench.ankerl.com", - "license": "MIT" + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "fmt", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index b8f6e9fceed8c3..f5a47f2c4722c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4733,7 +4733,7 @@ "port-version": 1 }, "nanobench": { - "baseline": "4.3.6", + "baseline": "4.3.7", "port-version": 0 }, "nanodbc": { diff --git a/versions/n-/nanobench.json b/versions/n-/nanobench.json index 7be13eb563b6f1..59ceaf25acf74c 100644 --- a/versions/n-/nanobench.json +++ b/versions/n-/nanobench.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6353026a82baa4c84cc43554b4f518b8dbf79794", + "version": "4.3.7", + "port-version": 0 + }, { "git-tree": "b2078ee30dd4414efb21ecb3fe7c54efa854bc95", "version": "4.3.6", From ce77ea78c856e6ab2ebeca12bc3d04ed1f4cfc9c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 18:04:57 +0200 Subject: [PATCH 045/383] [qpid-proton] update and don't build tests (#24227) * [qpid-proton] update and don't build tests * nicole CR Co-authored-by: nicole mazzuca --- ports/qpid-proton/fix-openssl3.patch | 22 ---------------------- ports/qpid-proton/portfile.cmake | 10 ++++++---- ports/qpid-proton/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/q-/qpid-proton.json | 5 +++++ 5 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 ports/qpid-proton/fix-openssl3.patch diff --git a/ports/qpid-proton/fix-openssl3.patch b/ports/qpid-proton/fix-openssl3.patch deleted file mode 100644 index bf33ee53d99c04..00000000000000 --- a/ports/qpid-proton/fix-openssl3.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d75dfdb6..7089c406 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -177,7 +177,7 @@ if (CMAKE_COMPILER_IS_GNUCC) - endif (ENABLE_WARNING_ERROR) - set (COMPILE_WARNING_FLAGS "${WERROR} -Wall -pedantic-errors") - set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS}") -- set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wstrict-prototypes -Wvla -Wsign-compare -Wwrite-strings") -+ set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-deprecated-declarations -Wstrict-prototypes -Wvla -Wsign-compare -Wwrite-strings") - - if (ENABLE_UNDEFINED_ERROR) - set (CATCH_UNDEFINED "-Wl,--no-undefined") -@@ -202,7 +202,7 @@ if (CMAKE_C_COMPILER_ID MATCHES "Clang") - endif (ENABLE_WARNING_ERROR) - # TODO aconway 2016-01-06: we should be able to clean up the code and turn on - # some of these warnings. -- set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-float-equal -Wno-padded -Wno-sign-conversion -Wno-switch-enum -Wno-weak-vtables -Wno-exit-time-destructors -Wno-global-constructors -Wno-shorten-64-to-32 -Wno-documentation -Wno-documentation-unknown-command -Wno-old-style-cast -Wno-missing-noreturn") -+ set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-deprecated-declarations -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-float-equal -Wno-padded -Wno-sign-conversion -Wno-switch-enum -Wno-weak-vtables -Wno-exit-time-destructors -Wno-global-constructors -Wno-shorten-64-to-32 -Wno-documentation -Wno-documentation-unknown-command -Wno-old-style-cast -Wno-missing-noreturn") - endif() - - if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 7737f51118e3b9..388580f109fc48 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -5,11 +5,9 @@ vcpkg_find_acquire_program(PYTHON3) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/qpid-proton - REF dc244b1f7e886883a2bb416407f42ba55d0f5f42 # 0.32.0 - SHA512 19f191dd206fd43a8f5b8db95f6ada57bd60b93eb907cf32f463c23cfe8c5f4914c6f4750ebde50c970387fb62baf4451279803eeb000bc8bb5c200692e5d1d7 + REF fee5e94afb83b92ffa60a6f815d5102a67915166 # 0.37.0 + SHA512 e9fbd02444dd073908186e6873b4e230e0a5971929e9b1a49758240d166f6da4e6c88d701c66d5e5539bea0beca380c763bffcef5b0e1ed5f9fc2691f5f86559 HEAD_REF next - PATCHES - fix-openssl3.patch ) vcpkg_cmake_configure( @@ -20,6 +18,10 @@ vcpkg_cmake_configure( -DENABLE_JSONCPP=ON -DENABLE_LINKTIME_OPTIMIZATION=OFF -DLIB_SUFFIX= + -DENABLE_WARNING_ERROR=OFF + -DENABLE_BENCHMARKS=OFF + -DENABLE_FUZZ_TESTING=OFF + -DBUILD_TESTING=OFF -DPYTHON_EXECUTABLE=${PYTHON3} ) diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index 5ff4eabf32a598..5285646cc308d4 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qpid-proton", - "version": "0.32.0", - "port-version": 5, + "version": "0.37.0", "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f5a47f2c4722c8..c0967972e38390 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5649,8 +5649,8 @@ "port-version": 2 }, "qpid-proton": { - "baseline": "0.32.0", - "port-version": 5 + "baseline": "0.37.0", + "port-version": 0 }, "qscintilla": { "baseline": "2.12.0", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index d4e5f16a975451..a7a727c359d93c 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "720cc65a7b408878662ce7c749211fa7edaf25fd", + "version": "0.37.0", + "port-version": 0 + }, { "git-tree": "bc437ca04548b4ca544af845a2e2327010aa3281", "version": "0.32.0", From 277e5ebed82e65593d4f87242c14db002759fa06 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 19 Apr 2022 18:06:53 +0200 Subject: [PATCH 046/383] [apr] Fix release only builds on Linux (#24220) * [apr] Fix release only builds on Linux * version --- ports/apr/portfile.cmake | 19 ++++++++++++------- ports/apr/vcpkg.json | 3 ++- versions/a-/apr.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index eb0fc8708f93e8..d6253544acacb6 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -73,9 +73,12 @@ else() vcpkg_install_make() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/apr-1.pc" - "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" - ) + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/apr-1.pc" + "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" + ) + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/apr-1.pc" "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" ) @@ -84,11 +87,13 @@ else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}\"" "`dirname $0`/../../..") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\"" "") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../..") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\"" "") + + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\"" "") + endif() endif() # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index afeff1d238ef21..08e5c701fcca78 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -1,9 +1,10 @@ { "name": "apr", "version": "1.7.0", - "port-version": 7, + "port-version": 8, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", + "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ { diff --git a/versions/a-/apr.json b/versions/a-/apr.json index d1baaa28224c6e..67541a0adaf40b 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fd8035a5cce96ad1b89000ac34431551ca39458", + "version": "1.7.0", + "port-version": 8 + }, { "git-tree": "e73f548920cc5add8a47af9b8775a26c89050101", "version": "1.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index c0967972e38390..e1cb259ab249ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -110,7 +110,7 @@ }, "apr": { "baseline": "1.7.0", - "port-version": 7 + "port-version": 8 }, "apr-util": { "baseline": "1.6.1", From 255106a936a705e2ba180bc02e3461ce8fbe6990 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 19 Apr 2022 18:07:38 +0200 Subject: [PATCH 047/383] [argh] Update to 1.3.2 (#24219) * [argh] Update to 1.3.2 * version --- ports/argh/portfile.cmake | 28 ++++---- .../remove_unnamespaced_license_file.patch | 67 ------------------- ports/argh/vcpkg.json | 17 ++++- versions/a-/argh.json | 5 ++ versions/baseline.json | 4 +- 5 files changed, 33 insertions(+), 88 deletions(-) delete mode 100644 ports/argh/remove_unnamespaced_license_file.patch diff --git a/ports/argh/portfile.cmake b/ports/argh/portfile.cmake index ccaec1449ee011..17656776703eec 100644 --- a/ports/argh/portfile.cmake +++ b/ports/argh/portfile.cmake @@ -3,32 +3,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adishavit/argh - REF a1edee559757e076e570b8f6c2f555d8d00b373c - SHA512 a100c7ff20ef9ed39d53efeac5507a6ed59fb99ccba36ac4b5f8f5aaac6782f8e951b2f26b9b50f6c6fdbc53b5bceaabbb9dd9b9539f968fc1037733342e17a6 + REF v1.3.2 + SHA512 66073718ef1fc31fbd0feb9daf366a2e28c759de44fb1882dc46a6d10f7a44635ae1155882dff916f55c51fad88bedebdfe361418f7669fac241feead68f2b5b HEAD_REF master - PATCHES - remove_unnamespaced_license_file.patch # https://github.com/adishavit/argh/pull/51 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE ${CURRENT_PACKAGES_DIR}/README.md) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/argh/remove_unnamespaced_license_file.patch b/ports/argh/remove_unnamespaced_license_file.patch deleted file mode 100644 index f6742c86c634b5..00000000000000 --- a/ports/argh/remove_unnamespaced_license_file.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 83f364a2eb1b137453772ae9fcf5d7973770637f Mon Sep 17 00:00:00 2001 -From: Billy Robert O'Neal III -Date: Wed, 29 Apr 2020 13:01:31 -0700 -Subject: [PATCH] Don't install 'LICENSE' or 'README.md' directly to the - installation directory. - -This change unconditionally uses GNUInstallDirs which will correctly 'namespace' these files with the 'argh' project name. - -========= - -The names 'LICENSE' and 'README.md' are extremely common and likely to be taken by other ports. This happened in a recent full vcpkg catalog rebuild: - -Starting package 757/1254: qt-advanced-docking-system:x86-windows -Building package qt-advanced-docking-system[core]:x86-windows... -Could not locate cached archive: C:\agent\_work\1\s\archives\a1\a1507296ead5788137561997571557204aaac78f.zip --- Downloading https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/661d0c4356ab61d155b53718aa1bf6bab86dad13.tar.gz... --- Extracting source C:/agent/_work/1/s/downloads/githubuser0xFFFF-Qt-Advanced-Docking-System-661d0c4356ab61d155b53718aa1bf6bab86dad13.tar.gz --- Applying patch config_changes.patch --- Using source at C:/agent/_work/1/s/buildtrees/qt-advanced-docking-system/src/bab86dad13-3088149a9b --- Configuring x86-windows --- Building x86-windows-dbg --- Building x86-windows-rel --- Installing: C:/agent/_work/1/s/packages/qt-advanced-docking-system_x86-windows/share/qt-advanced-docking-system/copyright --- Performing post-build validation --- Performing post-build validation done -Stored binary cache: C:\agent\_work\1\s\archives\a1\a1507296ead5788137561997571557204aaac78f.zip -Building package qt-advanced-docking-system[core]:x86-windows... done -Installing package qt-advanced-docking-system[core]:x86-windows... -The following files are already installed in C:/agent/_work/1/s/installed/x86-windows and are in conflict with qt-advanced-docking-system:x86-windows - -Installed by argh:x86-windows - license/LICENSE - -Elapsed time for package qt-advanced-docking-system:x86-windows: 11.09 s ---- - CMakeLists.txt | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13bc879..f6264f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,19 +36,17 @@ endif() - - install(TARGETS argh EXPORT arghTargets) - -+include(GNUInstallDirs) -+install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR}) -+install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR}) -+ - if(CMAKE_SYSTEM_NAME STREQUAL Linux) - # this might be a bit too restrictive, since for other (BSD, ...) this might apply also - # but this can be fixed later in extra pull requests from people on the platform -- include(GNUInstallDirs) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR}) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR}) - install(FILES argh-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh) - install(EXPORT arghTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh) - else() -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION include) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION license) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION .) - install(FILES argh-config.cmake DESTINATION CMake) - install(EXPORT arghTargets DESTINATION CMake) - endif() diff --git a/ports/argh/vcpkg.json b/ports/argh/vcpkg.json index 38835e1cd37936..2329517f071ce5 100644 --- a/ports/argh/vcpkg.json +++ b/ports/argh/vcpkg.json @@ -1,6 +1,17 @@ { "name": "argh", - "version-string": "2018-12-18", - "port-version": 3, - "description": "Argh! A minimalist argument handler." + "version": "1.3.2", + "description": "Argh! A minimalist argument handler.", + "homepage": "https://github.com/adishavit/argh", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/a-/argh.json b/versions/a-/argh.json index a66b81ef4d92dc..0eea9255956e12 100644 --- a/versions/a-/argh.json +++ b/versions/a-/argh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ee3072431f9d1aa18b5810e61398b9373fdc0d7", + "version": "1.3.2", + "port-version": 0 + }, { "git-tree": "09027cc8017226ec7710f564346b5c0bff9e69aa", "version-string": "2018-12-18", diff --git a/versions/baseline.json b/versions/baseline.json index e1cb259ab249ba..3ec95c90aea632 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -133,8 +133,8 @@ "port-version": 1 }, "argh": { - "baseline": "2018-12-18", - "port-version": 3 + "baseline": "1.3.2", + "port-version": 0 }, "argparse": { "baseline": "2.2", From 9836ae4f2671db41e07843f31b4e341f0d3ebfb1 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 19 Apr 2022 09:08:16 -0700 Subject: [PATCH 048/383] [libtorrent] update to 2.0.6 (#24215) * [libtorrent] update to 2.0.6 * update version --- ports/libtorrent/portfile.cmake | 8 ++++---- ports/libtorrent/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libtorrent.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index d80fa99f7be534..645fca72b0dccd 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -30,16 +30,16 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF 44e285c30f06772e48f515580f961998e1037b7e # v2.0.5 - SHA512 c7ce747930ab8c1852d0efdc6268d9faa39643abd6b6560b4b5e0b06a12ab207ec61ac301a0bcc7622521a8ae490cc02cbe0b6e43208bc216c08bf472b40cb85 + REF e9bbf16bdd899f42aef0f0c2b1f214de2c15ac92 # v2.0.6 + SHA512 5bc93be6b1bf5208f1bfc10ffe515e20face41ebf0f9cf7afc8f1c03addc42a88f92ec79a2c2a1d1a4fd0a3014b752d68e7e62cd86349694636b79da31ed8e08 HEAD_REF RC_2_0 ) vcpkg_from_github( OUT_SOURCE_PATH TRYSIGNAL_SOURCE_PATH REPO arvidn/try_signal - REF 334fd139e2bb387017b42d36753a03935e3bca75 - SHA512 a25d439b2d979e975f9dd125a34072f70bfc7a08fab950e3829130742c05c584ae88d9f58fc0f1b4fa0b51df2c0e32c5b24c5828d53b121b4bc183a4c68d6a5a + REF 751a7e5a5be14892bcfdff1e63c653bcbf71cf39 + SHA512 4ccea4f67a79acf49a9943d8aec3999475357d7ad3cfc7b37f0e1c4527f8f4536993c6f6241bb3eb166a1dc939133a4f3b35197f9e47fb2ac9c713b64f8cb96d HEAD_REF master ) diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json index 4b9eac63422315..faf3361412bdcb 100644 --- a/ports/libtorrent/vcpkg.json +++ b/ports/libtorrent/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtorrent", - "version": "2.0.5", + "version": "2.0.6", "maintainers": "Arvid Norberg ", "description": "An efficient feature complete C++ BitTorrent implementation", "homepage": "https://libtorrent.org", diff --git a/versions/baseline.json b/versions/baseline.json index 3ec95c90aea632..ea551577e8a982 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4085,7 +4085,7 @@ "port-version": 2 }, "libtorrent": { - "baseline": "2.0.5", + "baseline": "2.0.6", "port-version": 0 }, "libu2f-server": { diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json index bb12eb92ffc346..015b3e7a2a64f6 100644 --- a/versions/l-/libtorrent.json +++ b/versions/l-/libtorrent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ca0a5e5498fe7a999d78650e6ae935cebf1d764", + "version": "2.0.6", + "port-version": 0 + }, { "git-tree": "e27617cd7ff2be85ee0c2d4a60be16cee95f1302", "version": "2.0.5", From 37ebb4419be4eda7c6fa2400d1170ad81f5ba1d1 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Tue, 19 Apr 2022 12:29:01 -0400 Subject: [PATCH 049/383] [z3] Update to 4.8.15 (#24209) * [z3] Update to 4.8.15 * Update version * Don't build test executables * Update version * Disable examples * Update version * Fix 32 bit builds with upstream patch https://github.com/Z3Prover/z3/commit/3828130791bf8e60038b46b0d6602cb7e43fb344 * Update version --- ports/z3/fix-32-bit-build.patch | 132 +++++++++++++++++++++++++++ ports/z3/portfile.cmake | 18 ++-- ports/z3/remove-flag-overrides.patch | 12 +++ ports/z3/vcpkg.json | 14 ++- versions/baseline.json | 2 +- versions/z-/z3.json | 5 + 6 files changed, 173 insertions(+), 10 deletions(-) create mode 100644 ports/z3/fix-32-bit-build.patch create mode 100644 ports/z3/remove-flag-overrides.patch diff --git a/ports/z3/fix-32-bit-build.patch b/ports/z3/fix-32-bit-build.patch new file mode 100644 index 00000000000000..56b9f4c77688e8 --- /dev/null +++ b/ports/z3/fix-32-bit-build.patch @@ -0,0 +1,132 @@ +From 3828130791bf8e60038b46b0d6602cb7e43fb344 Mon Sep 17 00:00:00 2001 +From: Nikolaj Bjorner +Date: Thu, 24 Mar 2022 14:05:05 -1000 +Subject: [PATCH] fix #5922 use 0u to help type inference + +Signed-off-by: Nikolaj Bjorner +--- + src/api/c++/z3++.h | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/src/api/c++/z3++.h b/src/api/c++/z3++.h +index b00a33ad71..4d60de4338 100644 +--- a/src/api/c++/z3++.h ++++ b/src/api/c++/z3++.h +@@ -2333,7 +2333,7 @@ namespace z3 { + + inline expr pble(expr_vector const& es, int const* coeffs, int bound) { + assert(es.size() > 0); +- context& ctx = es[0].ctx(); ++ context& ctx = es[0u].ctx(); + array _es(es); + Z3_ast r = Z3_mk_pble(ctx, _es.size(), _es.ptr(), coeffs, bound); + ctx.check_error(); +@@ -2341,7 +2341,7 @@ namespace z3 { + } + inline expr pbge(expr_vector const& es, int const* coeffs, int bound) { + assert(es.size() > 0); +- context& ctx = es[0].ctx(); ++ context& ctx = es[0u].ctx(); + array _es(es); + Z3_ast r = Z3_mk_pbge(ctx, _es.size(), _es.ptr(), coeffs, bound); + ctx.check_error(); +@@ -2349,7 +2349,7 @@ namespace z3 { + } + inline expr pbeq(expr_vector const& es, int const* coeffs, int bound) { + assert(es.size() > 0); +- context& ctx = es[0].ctx(); ++ context& ctx = es[0u].ctx(); + array _es(es); + Z3_ast r = Z3_mk_pbeq(ctx, _es.size(), _es.ptr(), coeffs, bound); + ctx.check_error(); +@@ -2357,7 +2357,7 @@ namespace z3 { + } + inline expr atmost(expr_vector const& es, unsigned bound) { + assert(es.size() > 0); +- context& ctx = es[0].ctx(); ++ context& ctx = es[0u].ctx(); + array _es(es); + Z3_ast r = Z3_mk_atmost(ctx, _es.size(), _es.ptr(), bound); + ctx.check_error(); +@@ -2365,7 +2365,7 @@ namespace z3 { + } + inline expr atleast(expr_vector const& es, unsigned bound) { + assert(es.size() > 0); +- context& ctx = es[0].ctx(); ++ context& ctx = es[0u].ctx(); + array _es(es); + Z3_ast r = Z3_mk_atleast(ctx, _es.size(), _es.ptr(), bound); + ctx.check_error(); +@@ -2373,7 +2373,7 @@ namespace z3 { + } + inline expr sum(expr_vector const& args) { + assert(args.size() > 0); +- context& ctx = args[0].ctx(); ++ context& ctx = args[0u].ctx(); + array _args(args); + Z3_ast r = Z3_mk_add(ctx, _args.size(), _args.ptr()); + ctx.check_error(); +@@ -2382,7 +2382,7 @@ namespace z3 { + + inline expr distinct(expr_vector const& args) { + assert(args.size() > 0); +- context& ctx = args[0].ctx(); ++ context& ctx = args[0u].ctx(); + array _args(args); + Z3_ast r = Z3_mk_distinct(ctx, _args.size(), _args.ptr()); + ctx.check_error(); +@@ -2411,14 +2411,14 @@ namespace z3 { + Z3_ast r; + assert(args.size() > 0); + if (args.size() == 1) { +- return args[0]; ++ return args[0u]; + } +- context& ctx = args[0].ctx(); ++ context& ctx = args[0u].ctx(); + array _args(args); +- if (Z3_is_seq_sort(ctx, args[0].get_sort())) { ++ if (Z3_is_seq_sort(ctx, args[0u].get_sort())) { + r = Z3_mk_seq_concat(ctx, _args.size(), _args.ptr()); + } +- else if (Z3_is_re_sort(ctx, args[0].get_sort())) { ++ else if (Z3_is_re_sort(ctx, args[0u].get_sort())) { + r = Z3_mk_re_concat(ctx, _args.size(), _args.ptr()); + } + else { +@@ -2448,7 +2448,7 @@ namespace z3 { + inline expr mk_xor(expr_vector const& args) { + if (args.empty()) + return args.ctx().bool_val(false); +- expr r = args[0]; ++ expr r = args[0u]; + for (unsigned i = 1; i < args.size(); ++i) + r = r ^ args[i]; + return r; +@@ -2771,7 +2771,7 @@ namespace z3 { + assert(!m_end && !m_empty); + m_cube = m_solver.cube(m_vars, m_cutoff); + m_cutoff = 0xFFFFFFFF; +- if (m_cube.size() == 1 && m_cube[0].is_false()) { ++ if (m_cube.size() == 1 && m_cube[0u].is_false()) { + m_cube = z3::expr_vector(m_solver.ctx()); + m_end = true; + } +@@ -3005,7 +3005,7 @@ namespace z3 { + } + array buffer(n); + for (unsigned i = 0; i < n; ++i) buffer[i] = tactics[i]; +- return tactic(tactics[0].ctx(), Z3_tactic_par_or(tactics[0].ctx(), n, buffer.ptr())); ++ return tactic(tactics[0u].ctx(), Z3_tactic_par_or(tactics[0u].ctx(), n, buffer.ptr())); + } + + inline tactic par_and_then(tactic const & t1, tactic const & t2) { +@@ -3804,7 +3804,7 @@ namespace z3 { + } + inline expr re_intersect(expr_vector const& args) { + assert(args.size() > 0); +- context& ctx = args[0].ctx(); ++ context& ctx = args[0u].ctx(); + array _args(args); + Z3_ast r = Z3_mk_re_intersect(ctx, _args.size(), _args.ptr()); + ctx.check_error(); diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index 2641de82023319..7156b7186c04f8 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -5,25 +5,29 @@ vcpkg_add_to_path("${PYTHON2_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.8.14 - SHA512 10170516CA472258D2F9DF28CD036E43023A76A25F1E1670290C62F3890D935BF82770970054A5FD3A0F02559409E7ED4B18FB08347C040FF2F9E0918E152AAB + REF z3-4.8.15 + SHA512 7b08dec5b035a38edc90c4c491f508fd9ed227357de94400169db53d4c59382bd6a81ae6615771023a06534a3aa92668844f0ebfcc2a3b5ef4bba957426a0c6c HEAD_REF master - PATCHES fix-install-path.patch + PATCHES + fix-install-path.patch + remove-flag-overrides.patch + fix-32-bit-build.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(BUILD_STATIC "-DZ3_BUILD_LIBZ3_SHARED=OFF") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${BUILD_STATIC} + -DZ3_BUILD_TEST_EXECUTABLES=OFF + -DZ3_ENABLE_EXAMPLE_TARGETS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/z3 TARGET_PATH share/Z3) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/z3) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/z3/remove-flag-overrides.patch b/ports/z3/remove-flag-overrides.patch new file mode 100644 index 00000000000000..df6a4a16ef80d9 --- /dev/null +++ b/ports/z3/remove-flag-overrides.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 477410ba8..fcca03917 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,6 @@ + # Enforce some CMake policies + cmake_minimum_required(VERSION 3.4) + +-set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") + project(Z3 VERSION 4.8.15.0 LANGUAGES CXX) + + ################################################################################ diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index ba3f5ed5e46ee5..50ec3e9ea7d8c5 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,8 +1,18 @@ { "name": "z3", - "version": "4.8.14", + "version": "4.8.15", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "license": "MIT", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ea551577e8a982..5886a413302c36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7649,7 +7649,7 @@ "port-version": 0 }, "z3": { - "baseline": "4.8.14", + "baseline": "4.8.15", "port-version": 0 }, "z85": { diff --git a/versions/z-/z3.json b/versions/z-/z3.json index f04b7bd925fa4c..26bf54ad69b9a1 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca14e43533889ce4abf89af387b73d015e133c4a", + "version": "4.8.15", + "port-version": 0 + }, { "git-tree": "78366a5b407998768b97ddee528306cf9cbe9847", "version": "4.8.14", From d34bda33008ff23d17cab0afec595706cb96e397 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Illera Date: Wed, 20 Apr 2022 02:38:20 +1000 Subject: [PATCH 050/383] [triton] New version with no boost dependencies (#24081) * update Triton version * add vcpkg versioning --- ports/triton/001-fix-dependency-z3.patch | 28 +++------ ...stone-5.patch => 002-fix-capstone-5.patch} | 0 .../triton/002-fix-dependency-capstone.patch | 60 ------------------- ports/triton/003-fix-python.patch | 28 +++++++++ ports/triton/004-fix-python.patch | 27 --------- ports/triton/portfile.cmake | 10 ++-- ports/triton/vcpkg.json | 5 +- versions/baseline.json | 2 +- versions/t-/triton.json | 5 ++ 9 files changed, 48 insertions(+), 117 deletions(-) rename ports/triton/{003-fix-capstone-5.patch => 002-fix-capstone-5.patch} (100%) delete mode 100644 ports/triton/002-fix-dependency-capstone.patch create mode 100644 ports/triton/003-fix-python.patch delete mode 100644 ports/triton/004-fix-python.patch diff --git a/ports/triton/001-fix-dependency-z3.patch b/ports/triton/001-fix-dependency-z3.patch index fd3ee5f3035b6c..31e654317b90dc 100644 --- a/ports/triton/001-fix-dependency-z3.patch +++ b/ports/triton/001-fix-dependency-z3.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a8bbe47..966ded8 100644 +index c8da1610..106fdb8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -99,9 +99,9 @@ list(APPEND CMAKE_MODULE_PATH "${TRITON_ROOT}/CMakeModules/") +@@ -103,9 +103,9 @@ list(APPEND CMAKE_MODULE_PATH "${TRITON_ROOT}/CMakeModules/") # Find Z3 if(Z3_INTERFACE) message(STATUS "Compiling with Z3 SMT solver") @@ -15,28 +15,16 @@ index a8bbe47..966ded8 100644 # Find bitwuzla diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in -index 683b5f2..5df941e 100644 +index 90cf6bfe..33f27d23 100644 --- a/src/libtriton/Config.cmake.in +++ b/src/libtriton/Config.cmake.in -@@ -19,6 +19,9 @@ message(STATUS "Found Triton: ${CMAKE_CURRENT_LIST_DIR}/tritonConfig.cmake (foun +@@ -47,8 +47,7 @@ endif() - include(CMakeFindDependencyMacro) - find_dependency(Boost) -+if (@Z3_INTERFACE@) + # Z3 include directories + if (TRITON_Z3_INTERFACE) +- include_directories("@Z3_INCLUDE_DIRS@") +- link_directories(BEFORE "@Z3_LIB_DIR@") + find_dependency(Z3 CONFIG) -+endif() - - # Triton include - include_directories("@CMAKE_INSTALL_PREFIX@/include") -@@ -37,11 +40,6 @@ if (TRITON_LLVM_INTERFACE) - include_directories("@LLVM_INCLUDE_DIRS@") endif() --# Z3 include directories --if (TRITON_Z3_INTERFACE) -- include_directories("@Z3_INCLUDE_DIRS@") --endif() -- # Bitwuzla include directories - if (TRITON_BITWUZLA_INTERFACE) - include_directories("@BITWUZLA_INCLUDE_DIRS@") diff --git a/ports/triton/003-fix-capstone-5.patch b/ports/triton/002-fix-capstone-5.patch similarity index 100% rename from ports/triton/003-fix-capstone-5.patch rename to ports/triton/002-fix-capstone-5.patch diff --git a/ports/triton/002-fix-dependency-capstone.patch b/ports/triton/002-fix-dependency-capstone.patch deleted file mode 100644 index d4814709ea0f40..00000000000000 --- a/ports/triton/002-fix-dependency-capstone.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 966ded8..199a3ba 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -129,8 +129,8 @@ endif() - - # Find Capstone - message(STATUS "Compiling with Capstone") --find_package(CAPSTONE REQUIRED) --include_directories(${CAPSTONE_INCLUDE_DIRS}) -+find_package(CAPSTONE CONFIG REQUIRED) -+set(CAPSTONE_LIBRARIES capstone::capstone) - - # Find boost - message(STATUS "Compiling with Boost headers") -diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in -index 5df941e..23c5a27 100644 ---- a/src/libtriton/Config.cmake.in -+++ b/src/libtriton/Config.cmake.in -@@ -19,6 +19,7 @@ message(STATUS "Found Triton: ${CMAKE_CURRENT_LIST_DIR}/tritonConfig.cmake (foun - - include(CMakeFindDependencyMacro) - find_dependency(Boost) -+find_dependency(capstone CONFIG) - if (@Z3_INTERFACE@) - find_dependency(Z3 CONFIG) - endif() -@@ -26,9 +27,6 @@ endif() - # Triton include - include_directories("@CMAKE_INSTALL_PREFIX@/include") - --# Capstone include --include_directories("@CAPSTONE_INCLUDE_DIRS@") -- - # Python include directories - if (TRITON_PYTHON_BINDINGS) - include_directories("@PYTHON_INCLUDE_DIRS@") -diff --git a/src/libtriton/includes/triton/externalLibs.hpp b/src/libtriton/includes/triton/externalLibs.hpp -index 65678a0..d055f88 100644 ---- a/src/libtriton/includes/triton/externalLibs.hpp -+++ b/src/libtriton/includes/triton/externalLibs.hpp -@@ -29,14 +29,10 @@ namespace triton { - * \addtogroup extlibs - * @{ - */ -- #if defined(__unix__) || defined(__APPLE__) -- #include -- #include -- #include -- #include -- #elif _WIN32 -- #include -- #endif -+ #include -+ #include -+ #include -+ #include - /*! @} End of capstone namespace */ - }; - diff --git a/ports/triton/003-fix-python.patch b/ports/triton/003-fix-python.patch new file mode 100644 index 00000000000000..24c1237846983c --- /dev/null +++ b/ports/triton/003-fix-python.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c8da1610..40ab12c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,7 +53,6 @@ if(PYTHON_BINDINGS) + find_package(PythonInterp ${PYTHON_VERSION} REQUIRED) + find_package(PythonLibs ${PYTHON_VERSION} REQUIRED) + include_directories(${PYTHON_INCLUDE_DIRS}) +- add_definitions("-DPYTHON_LIBRARIES=\"${PYTHON_LIBRARIES}\"") + cmake_path(GET PYTHON_LIBRARY PARENT_PATH PYTHON_LIB_DIR) + cmake_path(GET PYTHON_LIBRARY STEM LAST_ONLY PYTHON_LIB_NAME) + string(REGEX REPLACE "^lib" "" PYTHON_LIB_NAME ${PYTHON_LIB_NAME}) +diff --git a/src/libtriton/CMakeLists.txt b/src/libtriton/CMakeLists.txt +index 7101cce8..a052b066 100644 +--- a/src/libtriton/CMakeLists.txt ++++ b/src/libtriton/CMakeLists.txt +@@ -330,9 +330,9 @@ if(PYTHON_BINDINGS) + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) + if(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) ++ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION share/triton) + else() +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) ++ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION share/triton) + endif() + else() + execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import version_info; print(f'lib/python{version_info[0]}.{version_info[1]}/site-packages')" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/ports/triton/004-fix-python.patch b/ports/triton/004-fix-python.patch deleted file mode 100644 index 19c0604f500965..00000000000000 --- a/ports/triton/004-fix-python.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 966ded8..baf0ec3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,7 +52,6 @@ if(PYTHON_BINDINGS) - find_package(PythonInterp ${PYTHON_VERSION} REQUIRED) - find_package(PythonLibs ${PYTHON_VERSION} REQUIRED) - include_directories(${PYTHON_INCLUDE_DIRS}) -- add_definitions("-DPYTHON_LIBRARIES=\"${PYTHON_LIBRARIES}\"") - add_custom_target(test-python - COMMAND ${PYTHONPATH_CMD} ${PYTHON_EXECUTABLE} -m unittest discover ${TRITON_ROOT}/src/testers/unittests - DEPENDS python-triton -diff --git a/src/libtriton/CMakeLists.txt b/src/libtriton/CMakeLists.txt -index 6770b08..701d55b 100644 ---- a/src/libtriton/CMakeLists.txt -+++ b/src/libtriton/CMakeLists.txt -@@ -326,8 +326,8 @@ if(PYTHON_BINDINGS) - ) - execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) - if(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) -+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION share/triton) - else() -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) -+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION share/triton) - endif() - endif() diff --git a/ports/triton/portfile.cmake b/ports/triton/portfile.cmake index 991631203f61dc..3786b0a24837cb 100644 --- a/ports/triton/portfile.cmake +++ b/ports/triton/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JonathanSalwan/Triton - REF 64a2b9b0490c82e41b37e623b1d0da14e2382e7a - SHA512 ff99a270813043df2bc0da765e04aae4b9d5a911d20c6e5ffca1472eae8d6e1fcfff3cd56da023d6a77a647644839430bf72902acd84ec521a0e098f185d275c + REF 243026c9c1e07a5ca834c4aaf628d1079f6a85ea + SHA512 9e46c500203647de545286b78a7d4ae6da1796b8eed30fe7346ae6e51865ef70de1adb858c402c3687c471ad654cc6aefdff8893196f5ef7b45e4cee6dd9c577 PATCHES 001-fix-dependency-z3.patch - 002-fix-dependency-capstone.patch - 003-fix-capstone-5.patch - 004-fix-python.patch + 002-fix-capstone-5.patch + 003-fix-python.patch ) string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DYNAMICLIB) @@ -31,6 +30,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DZ3_INTERFACE=ON + -DTRITON_BOOST_INTERFACE=OFF -DBUILD_SHARED_LIBS=${DYNAMICLIB} -DMSVC_STATIC=${STATICCRT} -DBUILD_EXAMPLES=OFF diff --git a/ports/triton/vcpkg.json b/ports/triton/vcpkg.json index e97ea3d5113773..d23ab93a2ac4f7 100644 --- a/ports/triton/vcpkg.json +++ b/ports/triton/vcpkg.json @@ -1,15 +1,12 @@ { "name": "triton", "version": "0.9", - "port-version": 2, + "port-version": 3, "description": "Triton is a Dynamic Binary Analysis (DBA) framework. It provides internal components like a Dynamic Symbolic Execution (DSE) engine, a dynamic taint engine, AST representations of the x86, x86-64, ARM32 and AArch64 Instructions Set Architecture (ISA), SMT simplification passes, an SMT solver interface and, the last but not least, Python bindings.", "homepage": "https://github.com/JonathanSalwan/Triton", "license": "Apache-2.0", "supports": "!arm", "dependencies": [ - "boost-math", - "boost-multiprecision", - "boost-numeric-conversion", { "name": "capstone", "default-features": false, diff --git a/versions/baseline.json b/versions/baseline.json index 5886a413302c36..bf7a1b59bc9eba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7114,7 +7114,7 @@ }, "triton": { "baseline": "0.9", - "port-version": 2 + "port-version": 3 }, "trompeloeil": { "baseline": "41", diff --git a/versions/t-/triton.json b/versions/t-/triton.json index 2bc40636221edd..4390795e49c0e8 100644 --- a/versions/t-/triton.json +++ b/versions/t-/triton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd0d283c09ee98abf32a81d0833e81a9e5222028", + "version": "0.9", + "port-version": 3 + }, { "git-tree": "220ce7aa574609f64206fc02906b1bd2eafbc8aa", "version": "0.9", From be8bb993307bc77e56bcf2f7d156f523a9beb868 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 19 Apr 2022 18:38:44 +0200 Subject: [PATCH 051/383] [openssl] Fix dynamic build on OSX (#24090) * [openssl] Fix dynamic build on OSX * version * Use SHLIB_VERSION * version --- ports/openssl/unix/CMakeLists.txt | 2 +- ports/openssl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index c375f0f3518e25..d47193512f2a25 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -263,7 +263,7 @@ if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libssl.${SHLIB_VERSION}.dylib" "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" - "${BUILDDIR}/libcrypto.1.1.dylib" + "${BUILDDIR}/libcrypto.${SHLIB_VERSION}.dylib" COMMAND /usr/bin/install_name_tool -change "${CMAKE_INSTALL_PREFIX}/lib/libcrypto.${SHLIB_VERSION}.dylib" "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index dfde151f1768fd..ff3927f0f22bb8 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.0.2", - "port-version": 2, + "port-version": 3, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index bf7a1b59bc9eba..1b62c588b74b1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5158,7 +5158,7 @@ }, "openssl": { "baseline": "3.0.2", - "port-version": 2 + "port-version": 3 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 207c8962730205..10a28745a12690 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f521f59b704e7bebbddd28929f61f3911b8c7cb4", + "version": "3.0.2", + "port-version": 3 + }, { "git-tree": "66e7ff434d21a4fc00cab9bbe6167db295ffefd3", "version": "3.0.2", From 8bce7791e72b6a4bceb579baee10c531eb80561e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 20 Apr 2022 00:39:39 +0800 Subject: [PATCH 052/383] [gumbo] Add Exported CMake Targets (#24153) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add Exported CMake Targets * update version * update version-sting to version * update version * update portfile.cmake * update version * Add configure_file * update version * Add configure_file * update version * Add configure_file * update version * update CMakeLists * update version * install pc file * update version * Update ports/gumbo/CMakeLists.txt Co-authored-by: JackĀ·BoosĀ·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/gumbo/CMakeLists.txt Co-authored-by: JackĀ·BoosĀ·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/gumbo/CMakeLists.txt * Update ports/gumbo/portfile.cmake * update version Co-authored-by: JackĀ·BoosĀ·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/gumbo/CMakeLists.txt | 10 +++++++++- ports/gumbo/portfile.cmake | 22 +++++++++++++++------- ports/gumbo/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 2 +- versions/g-/gumbo.json | 5 +++++ 5 files changed, 44 insertions(+), 12 deletions(-) diff --git a/ports/gumbo/CMakeLists.txt b/ports/gumbo/CMakeLists.txt index 1c90f42bce5316..f5d170d33a3a90 100644 --- a/ports/gumbo/CMakeLists.txt +++ b/ports/gumbo/CMakeLists.txt @@ -24,11 +24,19 @@ endif (MSVC) add_library(gumbo ${gumbo_srcs}) install( - TARGETS gumbo + TARGETS gumbo EXPORT unofficial-gumbo-config RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) + +install(EXPORT unofficial-gumbo-config + NAMESPACE unofficial::gumbo:: + DESTINATION share/unofficial-gumbo + ) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gumbo.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/lib/pkgconfig/gumbo.pc" @ONLY) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib/pkgconfig/gumbo.pc" DESTINATION "lib/pkgconfig") if(NOT DISABLE_INSTALL_HEADERS) install(FILES src/gumbo.h src/tag_enum.h DESTINATION include) endif() diff --git a/ports/gumbo/portfile.cmake b/ports/gumbo/portfile.cmake index 55ece8267fbae3..e6b0764fe59e98 100644 --- a/ports/gumbo/portfile.cmake +++ b/ports/gumbo/portfile.cmake @@ -8,14 +8,22 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gumbo RENAME copyright) +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-gumbo CONFIG_PATH share/unofficial-gumbo) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gumbo" RENAME copyright) diff --git a/ports/gumbo/vcpkg.json b/ports/gumbo/vcpkg.json index 650c5b6f385e30..6ec0a368f1c978 100644 --- a/ports/gumbo/vcpkg.json +++ b/ports/gumbo/vcpkg.json @@ -1,7 +1,18 @@ { "name": "gumbo", - "version-string": "0.10.1", - "port-version": 4, + "version": "0.10.1", + "port-version": 5, "description": "An HTML5 parsing library in pure C99", - "homepage": "https://github.com/google/gumbo-parser" + "homepage": "https://github.com/google/gumbo-parser", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1b62c588b74b1d..d733865fd10573 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2698,7 +2698,7 @@ }, "gumbo": { "baseline": "0.10.1", - "port-version": 4 + "port-version": 5 }, "gzip-hpp": { "baseline": "0.1.0", diff --git a/versions/g-/gumbo.json b/versions/g-/gumbo.json index 8c64b930010854..93cc94f0069402 100644 --- a/versions/g-/gumbo.json +++ b/versions/g-/gumbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33203d45b5dcbc9d4bb0175691909a4e9c930d81", + "version": "0.10.1", + "port-version": 5 + }, { "git-tree": "6c80a646e227f1181f474077dbf80f356555f452", "version-string": "0.10.1", From 6d710fceeb4bdbacb6aeffc1718aecfd4530bea6 Mon Sep 17 00:00:00 2001 From: sbhutch <102490574+sbhutch@users.noreply.github.com> Date: Wed, 20 Apr 2022 02:12:10 +0930 Subject: [PATCH 053/383] [entt] Update to 3.10.0 (#24163) * entt: updated port files * entt: updated version files * entt: added license field to vcpkg.json * entt: updated version files --- ports/entt/portfile.cmake | 4 ++-- ports/entt/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/e-/entt.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index 7b04105f68b3e0..63ba1818e98160 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -8,8 +8,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt - REF v3.9.0 - SHA512 b318ea06deb69350a00b3e824462a22fe443f4c778d0934857b68e43f0e6f1fe30c281889c14e3456067629e62a2bbb54491458c43d52ef543b2db8903133922 + REF v3.10.0 + SHA512 b123ac1909f4062312d872d823846f2476eb8911c40673cdceb6a1480b38c3fb3b86f843173247d0765870cbe87bf1d10f87e076fa2623fa20327743d1d7061b HEAD_REF master ) endif() diff --git a/ports/entt/vcpkg.json b/ports/entt/vcpkg.json index 27a59d978510b0..92b5a87baee967 100644 --- a/ports/entt/vcpkg.json +++ b/ports/entt/vcpkg.json @@ -1,8 +1,9 @@ { "name": "entt", - "version": "3.9.0", + "version": "3.10.0", "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", "homepage": "https://github.com/skypjack/entt", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index d733865fd10573..788dc5116b9de7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2077,7 +2077,7 @@ "port-version": 3 }, "entt": { - "baseline": "3.9.0", + "baseline": "3.10.0", "port-version": 0 }, "epsilon": { diff --git a/versions/e-/entt.json b/versions/e-/entt.json index ab23301a9a3ee4..4b92e1a9d58f28 100644 --- a/versions/e-/entt.json +++ b/versions/e-/entt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a871a9d0c7187960052099119854369e854c3e50", + "version": "3.10.0", + "port-version": 0 + }, { "git-tree": "74ad1980650c2f8ecb6369b8b981711f96f7bd08", "version": "3.9.0", From c25761eb765c380fa70c849795385108a7876eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 19 Apr 2022 18:42:37 +0200 Subject: [PATCH 054/383] [quill] Update to 1.7.0 (#24223) * [quill] update to 1.7.0 * [quill] Update version files * [quill] Add license field * [quill] Update version files * switch to relaxed versioning Co-authored-by: nicole mazzuca --- ports/quill/fix-c4189-warning.patch | 15 --------------- ports/quill/portfile.cmake | 6 ++---- ports/quill/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/q-/quill.json | 5 +++++ 5 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 ports/quill/fix-c4189-warning.patch diff --git a/ports/quill/fix-c4189-warning.patch b/ports/quill/fix-c4189-warning.patch deleted file mode 100644 index 55ae52fc3e3de4..00000000000000 --- a/ports/quill/fix-c4189-warning.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/quill/CMakeLists.txt b/quill/CMakeLists.txt -index 76872c2..c173804 100644 ---- a/quill/CMakeLists.txt -+++ b/quill/CMakeLists.txt -@@ -148,6 +148,10 @@ if (QUILL_NO_EXCEPTIONS) - endif () - endif () - -+if (MSVC) -+ add_definitions(/wd4189) -+endif() -+ - # Add target sources - target_sources(${TARGET_NAME} PRIVATE ${SOURCE_FILES} ${HEADER_FILES}) - diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 3c5470d48aadd8..7a899315107f68 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill - REF v1.6.3 - SHA512 e75aca827fe0833422da0d38df482cbc39db0e43dcc3cb791f3e2649f7022dcc448831a5ede85daf6feada60a2d5eaf312a3411abbba92fb9d76466336a7244d + REF v1.7.0 + SHA512 9acc1d9eb446882f934fb201f92417fa102ea68781144d673d3440037693738d520a595186c713b2ebf8b9fabd6327761ee7b569ad880af54be5480071ec15b5 HEAD_REF master - PATCHES - fix-c4189-warning.patch ) vcpkg_cmake_configure( diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 350321f5c48ff6..dee0985d1bb026 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,9 +1,9 @@ { "name": "quill", - "version-semver": "1.6.3", - "port-version": 4, + "version": "1.7.0", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", + "license": "MIT", "supports": "!(uwp | android)", "dependencies": [ "fmt", diff --git a/versions/baseline.json b/versions/baseline.json index 788dc5116b9de7..799b6220bfd161 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6025,8 +6025,8 @@ "port-version": 7 }, "quill": { - "baseline": "1.6.3", - "port-version": 4 + "baseline": "1.7.0", + "port-version": 0 }, "quirc": { "baseline": "1.1", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index fdd44a202c6ca5..84a96bbe3d3cab 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a267f26f50e991400ca01b2dd40dec6a71cefee3", + "version": "1.7.0", + "port-version": 0 + }, { "git-tree": "19f0208595bbec6d64a4e34e351b530d091212bd", "version-semver": "1.6.3", From 7f7f1a514599b040eed5a876b838b76689ebb291 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 20:47:45 +0200 Subject: [PATCH 055/383] [python2] add support expression (#24192) * [python2] add support expression * lower complexity of supports expression Co-authored-by: nicole mazzuca --- ports/python2/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/p-/python2.json | 5 +++++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ports/python2/vcpkg.json b/ports/python2/vcpkg.json index abe470eb5b662d..ce26b439f40ce8 100644 --- a/ports/python2/vcpkg.json +++ b/ports/python2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "python2", "version": "2.7.18", - "port-version": 4, + "port-version": 5, "description": "The Python programming language as an embeddable library", "homepage": "https://www.python.org", - "license": "Python-2.0" + "license": "Python-2.0", + "supports": "!(arm & osx) & !(arm & windows) & !uwp" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 224e23f4eb9350..8258d4a2f4fb36 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -978,9 +978,6 @@ popsift:x64-windows-static-md=fail portable-snippets:arm-uwp=fail pqp:arm-uwp=fail pqp:x64-uwp=fail -python2:arm64-windows=fail -python2:arm-uwp=fail -python2:x64-uwp=fail # Not yet ready for these platforms. qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index 799b6220bfd161..d570ea47e92b80 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5622,7 +5622,7 @@ }, "python2": { "baseline": "2.7.18", - "port-version": 4 + "port-version": 5 }, "python3": { "baseline": "3.10.2", diff --git a/versions/p-/python2.json b/versions/p-/python2.json index 60a67697bd4fee..8460f25629825a 100644 --- a/versions/p-/python2.json +++ b/versions/p-/python2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33912f36bba22e343da793d7de1a2dde41ab9da0", + "version": "2.7.18", + "port-version": 5 + }, { "git-tree": "355e949adaecb1603d0cdc3d690101e49ad9fb13", "version": "2.7.18", From c37cc7836a0e1cfd55747be8ec472eafa8055276 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 19 Apr 2022 23:31:08 +0200 Subject: [PATCH 056/383] [many ports] Fix use of Readme as copyright (#24201) * [jack2] Update to 1.9.21 * [libxmlmm] Fix license * [volk] Fix license * [tmxlite] Fix license * [tinyxml2] Fix license * [stb] Fix license * [rtmidi] Fix license * [pugixml] Update to 1.12.1 * [physx] Fix license * [physx] License expression * version * lowercase * null * Format * Remove version-string * stb * Format * version * Format * version * [tinyxml] port version * version * Fix license * version * [rtmidi] remove patch * version * [pugixml] Remove unused variable * version * [physx] Remove from CI baseline for testing * [physx] update supports statement * version * [tmxlite] add final newline * version * [libxmlmm] Don't use own copyright file * version * Fix license copy * version --- ports/jack2/portfile.cmake | 6 +++--- ports/jack2/vcpkg.json | 4 ++-- ports/libxmlmm/portfile.cmake | 15 +++++++-------- ports/libxmlmm/vcpkg.json | 10 +++++++--- ports/physx/portfile.cmake | 2 +- ports/physx/vcpkg.json | 5 +++-- ports/pugixml/portfile.cmake | 20 ++++++++++---------- ports/pugixml/vcpkg.json | 16 +++++++++++++--- ports/rtmidi/fix-POSIXname.patch | 17 ----------------- ports/rtmidi/portfile.cmake | 18 ++++++++---------- ports/rtmidi/vcpkg.json | 15 +++++++++++++-- ports/stb/portfile.cmake | 11 ++++++----- ports/stb/vcpkg.json | 7 ++++--- ports/tinyxml2/portfile.cmake | 4 +++- ports/tinyxml2/vcpkg.json | 2 ++ ports/tmxlite/portfile.cmake | 6 +++--- ports/tmxlite/vcpkg.json | 2 ++ ports/volk/portfile.cmake | 4 +--- ports/volk/vcpkg.json | 1 + scripts/ci.baseline.txt | 1 - versions/baseline.json | 22 +++++++++++----------- versions/j-/jack2.json | 5 +++++ versions/l-/libxmlmm.json | 5 +++++ versions/p-/physx.json | 5 +++++ versions/p-/pugixml.json | 5 +++++ versions/r-/rtmidi.json | 5 +++++ versions/s-/stb.json | 5 +++++ versions/t-/tinyxml2.json | 5 +++++ versions/t-/tmxlite.json | 5 +++++ versions/v-/volk.json | 5 +++++ 30 files changed, 145 insertions(+), 88 deletions(-) delete mode 100644 ports/rtmidi/fix-POSIXname.patch diff --git a/ports/jack2/portfile.cmake b/ports/jack2/portfile.cmake index 301bb0ad8e26f5..3ab7e180e06384 100644 --- a/ports/jack2/portfile.cmake +++ b/ports/jack2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jackaudio/jack2 - REF v1.9.19 - SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d + REF v1.9.21 + SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557 HEAD_REF master ) @@ -22,4 +22,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jack2/vcpkg.json b/ports/jack2/vcpkg.json index 3ae06b492d799d..356579f3a8728a 100644 --- a/ports/jack2/vcpkg.json +++ b/ports/jack2/vcpkg.json @@ -1,9 +1,9 @@ { "name": "jack2", - "version-semver": "1.9.19", - "port-version": 1, + "version-semver": "1.9.21", "description": "Cross-platform API that enables device sharing and inter-application audio routing", "homepage": "https://jackaudio.org/", + "license": "GPL-2.0", "supports": "!uwp", "dependencies": [ { diff --git a/ports/libxmlmm/portfile.cmake b/ports/libxmlmm/portfile.cmake index 552bd6cb2436bf..24ff58d0e0be6b 100644 --- a/ports/libxmlmm/portfile.cmake +++ b/ports/libxmlmm/portfile.cmake @@ -6,18 +6,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() - -# Handle copyright -configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libxmlmm/vcpkg.json b/ports/libxmlmm/vcpkg.json index 03fdcba58d95d3..b4469246a606a8 100644 --- a/ports/libxmlmm/vcpkg.json +++ b/ports/libxmlmm/vcpkg.json @@ -1,10 +1,14 @@ { "name": "libxmlmm", - "version-string": "0.6.0", - "port-version": 1, + "version": "0.6.0", + "port-version": 2, "description": "Libxmlmm is a C++ wrapper for libxml 2.0 that only relies on standard C++ and libxml2.", "homepage": "https://github.com/rioki/libxmlmm", "dependencies": [ - "libxml2" + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake index 7fe812dc27b1ee..f4250da917f144 100644 --- a/ports/physx/portfile.cmake +++ b/ports/physx/portfile.cmake @@ -136,4 +136,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/source" "${CURRENT_PACKAGES_DIR}/source" ) -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index fd3665a648d09c..2c5ea8f26c668c 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,10 +1,11 @@ { "name": "physx", "version-semver": "4.1.2", - "port-version": 1, + "port-version": 2, "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs", "homepage": "https://github.com/NVIDIAGameWorks/PhysX", - "supports": "!mingw", + "license": null, + "supports": "!mingw & !(windows & arm)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index c27b1a89daeddb..372e0f8ecaa3a0 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -1,22 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/pugixml - REF v1.11.4 - SHA512 a1fdf4cbd744318fd339362465472279767777b18a3c8c7e8618d5e637213c632bf9dd8144d16ae22a75cfbde007f383e2feb49084e681c930fc89a2e3f2bc4f + REF v1.12.1 + SHA512 c1a80518e8d7b21f2a15b2023b77e87484f5b7581e68ff508785a60cab53d1689b5508f5a652d6f0d4fbcc91f66d59246fdfe499fd6b0e188c7914ed5919980b HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DUSE_POSTFIX=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPUGIXML_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/pugixml) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/pugixml) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pugixml/vcpkg.json b/ports/pugixml/vcpkg.json index 28158b325349cd..4485b70425fff1 100644 --- a/ports/pugixml/vcpkg.json +++ b/ports/pugixml/vcpkg.json @@ -1,7 +1,17 @@ { "name": "pugixml", - "version-string": "1.11.4", - "port-version": 1, + "version": "1.12.1", "description": "Light-weight, simple and fast XML parser for C++ with XPath support", - "homepage": "https://github.com/zeux/pugixml" + "homepage": "https://github.com/zeux/pugixml", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/rtmidi/fix-POSIXname.patch b/ports/rtmidi/fix-POSIXname.patch deleted file mode 100644 index a2a5b0ee1c7351..00000000000000 --- a/ports/rtmidi/fix-POSIXname.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/rtmidi_c.cpp b/rtmidi_c.cpp -index 248c9e5..ec1dd38 100644 ---- a/rtmidi_c.cpp -+++ b/rtmidi_c.cpp -@@ -136,7 +136,11 @@ const char* rtmidi_get_port_name (RtMidiPtr device, unsigned int portNumber) - { - try { - std::string name = ((RtMidi*) device->ptr)->getPortName (portNumber); -- return strdup (name.c_str ()); -+#if defined(_WIN) || defined(WINAPI_FAMILY) //Windows platform -+ return _strdup (name.c_str ()); -+#else // Unix platform -+ return strdup (name.c_str ()); -+#endif - - } catch (const RtMidiError & err) { - device->ok = false; diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake index 9b57212c46f90f..ea74660e7a16c9 100644 --- a/ports/rtmidi/portfile.cmake +++ b/ports/rtmidi/portfile.cmake @@ -5,24 +5,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thestk/rtmidi - REF dda792c5394375769466ab1c1d7773e741bbd950 # 4.0.0 - SHA512 cb1ded29c0b22cf7f38719131a9572a4daba7071fd8cf8b5b8d7306560a218bb0ef42150bf341b76f4ddee0ae087da975116c3b153e7bb908f2a674ecacb9d7a + REF 84a99422a3faf1ab417fe71c0903a48debb9376a # 5.0.0 + SHA512 388e280b7966281e22b0048d6fb2541921df1113d84e49bbc444fff591d2025588edd8d61dbe5ff017afd76c26fd05edc8f9f15d0cce16315ccc15e6aac1d57f HEAD_REF master - PATCHES - fix-POSIXname.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRTMIDI_API_ALSA=OFF -DRTMIDI_API_JACK=OFF + -DRTMIDI_BUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rtmidi/vcpkg.json b/ports/rtmidi/vcpkg.json index 73280aa86fec0a..9b6c4dd339133f 100644 --- a/ports/rtmidi/vcpkg.json +++ b/ports/rtmidi/vcpkg.json @@ -1,8 +1,19 @@ { "name": "rtmidi", "version-semver": "4.0.0", - "port-version": 4, + "port-version": 5, "description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)", "homepage": "https://github.com/thestk/rtmidi", - "supports": "!uwp" + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/stb/portfile.cmake b/ports/stb/portfile.cmake index 439d154a006ef0..922522f02803bc 100644 --- a/ports/stb/portfile.cmake +++ b/ports/stb/portfile.cmake @@ -6,9 +6,10 @@ vcpkg_from_github( HEAD_REF master ) -file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) -file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") +file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindStb.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindStb.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/stb/vcpkg.json b/ports/stb/vcpkg.json index f7dd85dac89ce6..1b05b19b67e3b6 100644 --- a/ports/stb/vcpkg.json +++ b/ports/stb/vcpkg.json @@ -1,7 +1,8 @@ { "name": "stb", - "version-string": "2020-09-14", - "port-version": 1, + "version": "2020-09-14", + "port-version": 2, "description": "public domain header-only libraries", - "homepage": "https://github.com/nothings/stb" + "homepage": "https://github.com/nothings/stb", + "license": "MIT OR CC-PDDC" } diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake index 3c4d0e7d7d0d39..42410759029e19 100644 --- a/ports/tinyxml2/portfile.cmake +++ b/ports/tinyxml2/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dtinyxml2_BUILD_TESTING=OFF ) vcpkg_cmake_install() @@ -19,4 +21,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tinyxml2/vcpkg.json b/ports/tinyxml2/vcpkg.json index c059fc80919957..60601c5d26fea5 100644 --- a/ports/tinyxml2/vcpkg.json +++ b/ports/tinyxml2/vcpkg.json @@ -1,8 +1,10 @@ { "name": "tinyxml2", "version-semver": "9.0.0", + "port-version": 1, "description": "A simple, small, efficient, C++ XML parser", "homepage": "https://github.com/leethomason/tinyxml2", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/tmxlite/portfile.cmake b/ports/tmxlite/portfile.cmake index ff1fb37a83c0ce..aaf079cb776199 100644 --- a/ports/tmxlite/portfile.cmake +++ b/ports/tmxlite/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fallahn/tmxlite - REF v1.3.0 + REF v1.3.0 HEAD_REF master - SHA512 3D432152080F7FDDD14A150FF87C34932695C96D7F676399C7610FF373972223CE54C9483BD9A872FD53668C113E334FCBF8596AE21CFDAF83B6159C7287A4A3 + SHA512 3D432152080F7FDDD14A150FF87C34932695C96D7F676399C7610FF373972223CE54C9483BD9A872FD53668C113E334FCBF8596AE21CFDAF83B6159C7287A4A3 ) vcpkg_cmake_configure( @@ -18,4 +18,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tmxlite/vcpkg.json b/ports/tmxlite/vcpkg.json index 66cbcf47d239df..fdecfa92ae3006 100644 --- a/ports/tmxlite/vcpkg.json +++ b/ports/tmxlite/vcpkg.json @@ -1,7 +1,9 @@ { "name": "tmxlite", "version": "1.3.0", + "port-version": 1, "description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor.", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/volk/portfile.cmake b/ports/volk/portfile.cmake index fe58d799843f54..76fa4af58ebda7 100644 --- a/ports/volk/portfile.cmake +++ b/ports/volk/portfile.cmake @@ -20,6 +20,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/volk) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Put the file containing the license where vcpkg expects it -file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/volk/") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/volk/README.md" "${CURRENT_PACKAGES_DIR}/share/volk/copyright") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/volk/vcpkg.json b/ports/volk/vcpkg.json index 32734f12851ac7..51387523fc5664 100644 --- a/ports/volk/vcpkg.json +++ b/ports/volk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "volk", "version": "1.3.204", + "port-version": 1, "description": [ "Meta loader for Vulkan API.", "Note that the static library target volk::volk is built without platform-specific defines.", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8258d4a2f4fb36..e5a026f2bc7a3f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -953,7 +953,6 @@ pfring:x64-osx=fail # pfring on Linux currently fails because its build scripts enable warnings as # errors, and warnings trigger with the Linux kernel headers in the Azure images. pfring:x64-linux=fail -physx:arm64-windows=fail pixman:arm-uwp=fail platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index d570ea47e92b80..fc44c8d760aff6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3001,8 +3001,8 @@ "port-version": 0 }, "jack2": { - "baseline": "1.9.19", - "port-version": 1 + "baseline": "1.9.21", + "port-version": 0 }, "jaeger-client-cpp": { "baseline": "0.7.0", @@ -4186,7 +4186,7 @@ }, "libxmlmm": { "baseline": "0.6.0", - "port-version": 1 + "port-version": 2 }, "libxmlpp": { "baseline": "5.0.0", @@ -5386,7 +5386,7 @@ }, "physx": { "baseline": "4.1.2", - "port-version": 1 + "port-version": 2 }, "picojson": { "baseline": "1.3.0", @@ -5609,8 +5609,8 @@ "port-version": 0 }, "pugixml": { - "baseline": "1.11.4", - "port-version": 1 + "baseline": "1.12.1", + "port-version": 0 }, "pybind11": { "baseline": "2.9.2", @@ -6262,7 +6262,7 @@ }, "rtmidi": { "baseline": "4.0.0", - "port-version": 4 + "port-version": 5 }, "rttr": { "baseline": "0.9.6", @@ -6766,7 +6766,7 @@ }, "stb": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "stlab": { "baseline": "1.6.2", @@ -7030,7 +7030,7 @@ }, "tinyxml2": { "baseline": "9.0.0", - "port-version": 0 + "port-version": 1 }, "tl-expected": { "baseline": "1.0.0", @@ -7062,7 +7062,7 @@ }, "tmxlite": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "tmxparser": { "baseline": "2.1.0", @@ -7370,7 +7370,7 @@ }, "volk": { "baseline": "1.3.204", - "port-version": 0 + "port-version": 1 }, "vs-yasm": { "baseline": "0.5.0", diff --git a/versions/j-/jack2.json b/versions/j-/jack2.json index 057fecc057b1f0..a3105dccdc5a93 100644 --- a/versions/j-/jack2.json +++ b/versions/j-/jack2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84f683fbf07cae4c021f1d0d5fd5cab7b58d991e", + "version-semver": "1.9.21", + "port-version": 0 + }, { "git-tree": "f5494181c269f8b65a26fd702664bfde1a3f2e3f", "version-semver": "1.9.19", diff --git a/versions/l-/libxmlmm.json b/versions/l-/libxmlmm.json index 184f88ba9a9830..4a3298fbc8b67a 100644 --- a/versions/l-/libxmlmm.json +++ b/versions/l-/libxmlmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "869d2ab96342804f872b8d56ad8ccd5e80b274b6", + "version": "0.6.0", + "port-version": 2 + }, { "git-tree": "4f34eb9988a27e6184d3271ca0e346793b30d836", "version-string": "0.6.0", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 5cbbdf356642f6..22bd529f6220c1 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e20a94664b966271a5e7684e73b2efab2461ba8", + "version-semver": "4.1.2", + "port-version": 2 + }, { "git-tree": "3efd7a1c7727eec4a15ba3ac6f8f013550750760", "version-semver": "4.1.2", diff --git a/versions/p-/pugixml.json b/versions/p-/pugixml.json index a9e37f4b16b2d5..51ec0a49c3bb59 100644 --- a/versions/p-/pugixml.json +++ b/versions/p-/pugixml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffaef9b7ddc94c06bf1293ff4f04906960f0de4c", + "version": "1.12.1", + "port-version": 0 + }, { "git-tree": "2af3faa6e86d241d2d6845f27c21afa51741f391", "version-string": "1.11.4", diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json index ebda6dd64e6b2f..a99857fc340aae 100644 --- a/versions/r-/rtmidi.json +++ b/versions/r-/rtmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d922425c684e2dd87ea1691b2ac8f1c0fd808e4", + "version-semver": "4.0.0", + "port-version": 5 + }, { "git-tree": "9d72ff2345f2c1b08f4808cedaa0caf87156d295", "version-semver": "4.0.0", diff --git a/versions/s-/stb.json b/versions/s-/stb.json index 750f114e6438a7..7686352928ea81 100644 --- a/versions/s-/stb.json +++ b/versions/s-/stb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41ce7d73e93526a943f08e5e4601c6b2325ba527", + "version": "2020-09-14", + "port-version": 2 + }, { "git-tree": "fa6d7e998f98f122efa37f456ffa498d546185b9", "version-string": "2020-09-14", diff --git a/versions/t-/tinyxml2.json b/versions/t-/tinyxml2.json index aebfd80f0e5e6e..9b78a67dab416e 100644 --- a/versions/t-/tinyxml2.json +++ b/versions/t-/tinyxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ef0e856167ad66665f51776d78fcffb1fcc1cb1", + "version-semver": "9.0.0", + "port-version": 1 + }, { "git-tree": "a8b086bdb3eaa94fea466bf8565d7c98b00c9f94", "version-semver": "9.0.0", diff --git a/versions/t-/tmxlite.json b/versions/t-/tmxlite.json index 09092bb6ae9170..2469531f202fcb 100644 --- a/versions/t-/tmxlite.json +++ b/versions/t-/tmxlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b176cf2abbb6262dc616d68625f90f35e65fe4c1", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "a60946b8d791faf0936b14f7ad9868d74b0dd872", "version": "1.3.0", diff --git a/versions/v-/volk.json b/versions/v-/volk.json index c5394f454970e5..56d3b2b1219354 100644 --- a/versions/v-/volk.json +++ b/versions/v-/volk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3c879b8f9516e71bcad0365c64b9c993ec6b254", + "version": "1.3.204", + "port-version": 1 + }, { "git-tree": "83175cabc17042125828c2e0230f75b60d140cc0", "version": "1.3.204", From ac6a9dcfcef2d454a2a845aa581734e4d2991143 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 20 Apr 2022 23:25:21 +0200 Subject: [PATCH 057/383] [vcpkg baseline][duckx] fix deps (#24264) * fix duckx * format * port-version * version stuff * rename file * version update Co-authored-by: Alexander Neumann --- ports/duckx/fix_dependencies.patch | 66 ++++++++++++++++++++++++++++++ ports/duckx/portfile.cmake | 1 + ports/duckx/vcpkg.json | 3 ++ versions/baseline.json | 2 +- versions/d-/duckx.json | 5 +++ 5 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 ports/duckx/fix_dependencies.patch diff --git a/ports/duckx/fix_dependencies.patch b/ports/duckx/fix_dependencies.patch new file mode 100644 index 00000000000000..c48daacb0e0172 --- /dev/null +++ b/ports/duckx/fix_dependencies.patch @@ -0,0 +1,66 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f45218659..1ec4250c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,9 +9,11 @@ endif() + option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) + option(BUILD_SAMPLE "Build provided sample" OFF) + +-set(HEADERS src/duckx.hpp src/zip.h src/miniz.h +- src/pugixml.hpp src/pugiconfig.hpp) +-set(SOURCES src/duckx.cpp src/zip.c src/pugixml.cpp) ++find_package(libzip REQUIRED) ++find_package(pugixml REQUIRED) ++ ++set(HEADERS src/duckx.hpp) ++set(SOURCES src/duckx.cpp) + + if(BUILD_SHARED_LIBS) + add_library(duckx SHARED ${HEADERS} ${SOURCES}) +@@ -19,6 +21,8 @@ else() + add_library(duckx STATIC ${HEADERS} ${SOURCES}) + endif() + ++target_link_libraries(duckx PUBLIC libzip::zip pugixml::pugixml) ++ + add_library(duckx::duckx ALIAS duckx) + + target_include_directories(duckx PUBLIC +@@ -38,12 +42,22 @@ endif() + include(GNUInstallDirs) + install( + TARGETS duckx +- EXPORT duckxConfig ++ EXPORT duckxTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) +-install(EXPORT duckxConfig NAMESPACE duckx:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/duckx) ++install(EXPORT duckxTargets NAMESPACE duckx:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/duckx) ++include(CMakePackageConfigHelpers) ++configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/duckxConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/duckxConfig.cmake" ++ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/duckx" ++ NO_SET_AND_CHECK_MACRO ++ NO_CHECK_REQUIRED_COMPONENTS_MACRO) ++write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/duckxConfigVersion.cmake" COMPATIBILITY ExactVersion) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/duckxConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/duckxConfigVersion.cmake" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/duckx") ++ + install(FILES ${HEADERS} DESTINATION include) + + +diff --git a/duckxConfig.cmake.in b/duckxConfig.cmake.in +new file mode 100644 +index 000000000..960b03b3b +--- /dev/null ++++ b/duckxConfig.cmake.in +@@ -0,0 +1,6 @@ ++@PACKAGE_INIT@ ++ ++include(CMakeFindDependencyMacro) ++find_dependency(libzip) ++find_dependency(pugixml) ++include("${CMAKE_CURRENT_LIST_DIR}/duckxTargets.cmake") +\ No newline at end of file diff --git a/ports/duckx/portfile.cmake b/ports/duckx/portfile.cmake index 3fb2ccfd333ca5..9ee068c1b0667c 100644 --- a/ports/duckx/portfile.cmake +++ b/ports/duckx/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( REPO amiremohamadi/DuckX REF v1.2.2 SHA512 3f1e626973b4638adaffcc0a20f59791f3a70abda1d2d09fddca9312014cef86d097f24873e74ef58c775b27c71a637e44f340da01a301b00ef334600bd412d6 + PATCHES fix_dependencies.patch ) vcpkg_cmake_configure( diff --git a/ports/duckx/vcpkg.json b/ports/duckx/vcpkg.json index d1221aa3eea6bd..36de4bea712197 100644 --- a/ports/duckx/vcpkg.json +++ b/ports/duckx/vcpkg.json @@ -1,10 +1,13 @@ { "name": "duckx", "version": "1.2.2", + "port-version": 1, "description": "DuckX is a library for creation of Office docx files.", "homepage": "https://github.com/amiremohamadi/DuckX", "license": "MIT", "dependencies": [ + "libzip", + "pugixml", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index fc44c8d760aff6..7cab02a702c758 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1958,7 +1958,7 @@ }, "duckx": { "baseline": "1.2.2", - "port-version": 0 + "port-version": 1 }, "duilib": { "baseline": "2019-04-28", diff --git a/versions/d-/duckx.json b/versions/d-/duckx.json index 61ddd2de110381..40f64272107072 100644 --- a/versions/d-/duckx.json +++ b/versions/d-/duckx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bed3914236def15bab45f3969a169005a25d3f1d", + "version": "1.2.2", + "port-version": 1 + }, { "git-tree": "6637b59789032a1ef84a1c6324bc7b672e346152", "version": "1.2.2", From 8223177f4d0e475e4a71466ebbd4a08785d14016 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 20 Apr 2022 14:43:38 -0700 Subject: [PATCH 058/383] [libfreenect2] Fix MACOS build error (#24265) * [libfreenect2] Fix MACOS build error * update vcpkg.json * update version * Disable build example * update version Co-authored-by: Lily Wang --- ports/libfreenect2/fix-macbuild.patch | 22 +++++++++++++++++++++ ports/libfreenect2/portfile.cmake | 28 ++++++++++++--------------- ports/libfreenect2/vcpkg.json | 15 +++++++++++--- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/l-/libfreenect2.json | 5 +++++ 6 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 ports/libfreenect2/fix-macbuild.patch diff --git a/ports/libfreenect2/fix-macbuild.patch b/ports/libfreenect2/fix-macbuild.patch new file mode 100644 index 00000000000000..cb675a6690439c --- /dev/null +++ b/ports/libfreenect2/fix-macbuild.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aedc576..4f16abc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -165,6 +165,8 @@ SET(LIBFREENECT2_DLLS + SET(HAVE_VideoToolbox "no (Apple only)") + IF(APPLE) + FIND_LIBRARY(VIDEOTOOLBOX_LIBRARY VideoToolbox) ++ FIND_LIBRARY(CF_LIBRARY CoreFoundation) ++ FIND_LIBRARY(IOK_LIBRARY IOKit) + + SET(HAVE_VideoToolbox no) + IF(VIDEOTOOLBOX_LIBRARY) +@@ -184,6 +186,8 @@ IF(APPLE) + ${COREFOUNDATION_LIBRARY} + ${COREMEDIA_LIBRARY} + ${COREVIDEO_LIBRARY} ++ ${CF_LIBRARY} ++ ${IOK_LIBRARY} + ) + ENDIF(VIDEOTOOLBOX_LIBRARY) + ENDIF(APPLE) diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake index ba35cee15a7216..32ea1a6889a294 100644 --- a/ports/libfreenect2/portfile.cmake +++ b/ports/libfreenect2/portfile.cmake @@ -4,41 +4,37 @@ vcpkg_from_github( REF v0.2.0 SHA512 3525e3f21462cecd3b198f64545786ffddc2cafdfd8146e5a46f0300b83f29f1ad0739618a07ab195c276149d7e2e909f7662e2d379a2880593cac75942b0666 HEAD_REF master - PATCHES fix-dependency-libusb.patch + PATCHES + fix-dependency-libusb.patch + fix-macbuild.patch ) -file(READ ${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake FINDLIBUSB) +file(READ "${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake" FINDLIBUSB) string(REPLACE "(WIN32)" "(WIN32_DISABLE)" FINDLIBUSB "${FINDLIBUSB}") -file(WRITE ${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake "${FINDLIBUSB}") - -file(READ ${SOURCE_PATH}/examples/CMakeLists.txt EXAMPLECMAKE) -string(REPLACE "(WIN32)" - "(WIN32_DISABLE)" EXAMPLECMAKE "${EXAMPLECMAKE}") -file(WRITE ${SOURCE_PATH}/examples/CMakeLists.txt "${EXAMPLECMAKE}") +file(WRITE "${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake" "${FINDLIBUSB}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS opengl ENABLE_OPENGL opencl ENABLE_OPENCL ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_CUDA=OFF - # FEATURES + -DBUILD_EXAMPLES=OFF ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/freenect2 TARGET_PATH share/freenect2) +vcpkg_cmake_config_fixup(PACKAGE_NAME freenect2 CONFIG_PATH lib/cmake/freenect2) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/GPL2 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/GPL2" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/libfreenect2/vcpkg.json b/ports/libfreenect2/vcpkg.json index fda7d64da6ee37..fd11f7991c6029 100644 --- a/ports/libfreenect2/vcpkg.json +++ b/ports/libfreenect2/vcpkg.json @@ -1,12 +1,21 @@ { "name": "libfreenect2", - "version-string": "0.2.0", - "port-version": 7, + "version": "0.2.0", + "port-version": 8, "description": "Open source drivers for the Kinect for Windows v2 device", "homepage": "https://github.com/OpenKinect/libfreenect2", + "license": "GPL-2.0-only", "dependencies": [ "libjpeg-turbo", - "libusb" + "libusb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "opengl" diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e5a026f2bc7a3f..3dbf567ed465bc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -496,7 +496,6 @@ libevhtp:arm-uwp=fail libexif:arm-uwp=fail libexif:x64-uwp=fail libfreenect2:arm64-windows=fail -libfreenect2:x64-osx=fail libgit2:arm-uwp=fail libgit2:x64-uwp=fail libgo:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 7cab02a702c758..fefaa4ef44a9e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3558,7 +3558,7 @@ }, "libfreenect2": { "baseline": "0.2.0", - "port-version": 7 + "port-version": 8 }, "libftdi": { "baseline": "0.20", diff --git a/versions/l-/libfreenect2.json b/versions/l-/libfreenect2.json index 51d96893507f44..9313d9c6c195b2 100644 --- a/versions/l-/libfreenect2.json +++ b/versions/l-/libfreenect2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce8aefbc76e982371258202989111294d9a5221d", + "version": "0.2.0", + "port-version": 8 + }, { "git-tree": "cdedefe776984f442e8af70b0e0738d12d56fafa", "version-string": "0.2.0", From 2b6b7e80bc474cc3dd0582ff822410f227e9b62f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 20 Apr 2022 23:44:53 +0200 Subject: [PATCH 059/383] [cmake-user] Fix and extend (#24260) * Skip wxwidgets test on Linux On Linux, wxwidgets needs system libs which conflict with vcpkg ports. * Test curl * Execute build to detect wrong libs * Add comment for wxwidgets --- scripts/test_ports/cmake-user/portfile.cmake | 25 +++++++++++++++++++- scripts/test_ports/cmake-user/vcpkg.json | 7 +++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/scripts/test_ports/cmake-user/portfile.cmake b/scripts/test_ports/cmake-user/portfile.cmake index 7d640a194a0498..4bc3a485a300e7 100644 --- a/scripts/test_ports/cmake-user/portfile.cmake +++ b/scripts/test_ports/cmake-user/portfile.cmake @@ -62,6 +62,11 @@ if("find-package" IN_LIST FEATURES) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) list(REMOVE_ITEM packages "Curses") endif() + if(VCPKG_TARGET_IS_LINUX) + # Port wxwidgets requires linux system libraries which conflict with vcpkg ports. + # This line complements the "platform" restriction from vcpkg.json. + list(REMOVE_ITEM packages "wxWidgets") + endif() endif() if(DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) @@ -93,6 +98,7 @@ function(test_cmake_project) set(base_options -G "Ninja" "-DCMAKE_MAKE_PROGRAM=${NINJA}" + "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DCMAKE_TOOLCHAIN_FILE=${SCRIPTS}/buildsystems/vcpkg.cmake" "-DVCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}" "-DCMAKE_INSTALL_PREFIX=${build_dir}/install" @@ -137,7 +143,7 @@ function(test_cmake_project) # To produce better error messages for failing wrappers, # we run execute_process directly here, for each wrapper. string(REPLACE " OFF:" ":" message - " CMake ${cmake_version}: `find_package(@package@)` failed.\n" + " CMake ${cmake_version}: @step@ with `find_package(@package@)` failed.\n" " See logs for more information:\n" " @log_out@\n" " @log_err@\n" @@ -166,8 +172,25 @@ function(test_cmake_project) WORKING_DIRECTORY "${find_package_build_dir}" ) if(package_result) + set(step "configuration") string(CONFIGURE "${message}" package_message @ONLY) message(SEND_ERROR "${package_message}") + else() + set(log_out "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-build-out.log") + set(log_err "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-build-err.log") + execute_process( + COMMAND + "${arg_CMAKE_COMMAND}" --build . + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" + RESULT_VARIABLE package_result + WORKING_DIRECTORY "${find_package_build_dir}" + ) + if(package_result) + set(step "build") + string(CONFIGURE "${message}" package_message @ONLY) + message(SEND_ERROR "${package_message}") + endif() endif() endforeach() endfunction() diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index dac50f93cea39d..34357b6e29370e 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -41,6 +41,10 @@ "$package": "BZip2", "name": "bzip2" }, + { + "$package": "CURL", + "name": "curl" + }, { "$package": "EXPAT", "name": "expat" @@ -79,7 +83,8 @@ }, { "$package": "wxWidgets", - "name": "wxwidgets" + "name": "wxwidgets", + "platform": "!linux" }, { "$package": "ZLIB", From 63c539fdac7489aa336cbc380453e1631d900f2d Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 20 Apr 2022 23:46:06 +0200 Subject: [PATCH 060/383] [atkmm, pangomm] Update and remove local license files (#24254) * [atkmm, pangomm] Move to GitLab * version * Add SHA * version * Enable maintainer mode * version * [mmcommon] New port * Format * Format * version * Hash * version * Python * version * Remove mmcommon * Keep distfile * version * Update download file * Update hash * version --- ports/atkmm/COPYING | 510 ---------------------------------- ports/atkmm/portfile.cmake | 19 +- ports/atkmm/vcpkg.json | 4 +- ports/pangomm/COPYING | 515 ----------------------------------- ports/pangomm/portfile.cmake | 6 +- ports/pangomm/vcpkg.json | 5 +- versions/a-/atkmm.json | 5 + versions/baseline.json | 6 +- versions/p-/pangomm.json | 5 + 9 files changed, 33 insertions(+), 1042 deletions(-) delete mode 100644 ports/atkmm/COPYING delete mode 100644 ports/pangomm/COPYING diff --git a/ports/atkmm/COPYING b/ports/atkmm/COPYING deleted file mode 100644 index 2d2d780e6014b8..00000000000000 --- a/ports/atkmm/COPYING +++ /dev/null @@ -1,510 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the library, -if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James - Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake index 9f7a7256002306..a4c337b6efe423 100644 --- a/ports/atkmm/portfile.cmake +++ b/ports/atkmm/portfile.cmake @@ -2,27 +2,30 @@ if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) endif() +set(ATKMM_VERSION 2.36.1) + +# Keep distfile, don't use GitLab! vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.36/atkmm-2.36.0.tar.xz" - FILENAME "atkmm-2.36.0.tar.xz" - SHA512 8527dfa50191919a7dcf6db6699767352cb0dac800d834ee39ed21694eee3136a41a7532d600b8b3c0fcea52da6129b623e8e61ada728d806aa61fdc8dc8dedf + URLS "https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.36/atkmm-${ATKMM_VERSION}.tar.xz" + FILENAME "atkmm-${ATKMM_VERSION}.tar.xz" + SHA512 23c831afac6bb9a0f9f2e622f8f9ffea29445a33b1cd650e0c07ee77e60b28ae5ee978c029e8e0f9b94e9ff4679d69ebde833f15e0a5403d97914cc7ccf98a6a ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -Dbuild-documentation=false -Dbuild-deprecated-api=true # Build deprecated API and include it in the library - -Dmsvc14x-parallel-installable=false) # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 + -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 +) vcpkg_install_meson() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/atkmm/vcpkg.json b/ports/atkmm/vcpkg.json index ac6b39011ec55a..426760e8f4ac7b 100644 --- a/ports/atkmm/vcpkg.json +++ b/ports/atkmm/vcpkg.json @@ -1,9 +1,9 @@ { "name": "atkmm", - "version": "2.36.0", - "port-version": 2, + "version": "2.36.1", "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.", "homepage": "https://www.gtkmm.org", + "license": "LGPL-2.1", "dependencies": [ "atk", "gettext", diff --git a/ports/pangomm/COPYING b/ports/pangomm/COPYING deleted file mode 100644 index c4792dd27a32d2..00000000000000 --- a/ports/pangomm/COPYING +++ /dev/null @@ -1,515 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. -^L - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. -^L - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. -^L - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. -^L - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. -^L - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. -^L - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. -^L - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS -^L - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper -mail. - -You should also get your employer (if you work as a programmer) or -your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James -Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/ports/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake index 3c2a0c32f0723d..bc19a95163a6fd 100644 --- a/ports/pangomm/portfile.cmake +++ b/ports/pangomm/portfile.cmake @@ -1,3 +1,4 @@ +# Keep distfile, don't use GitLab! vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.50/pangomm-2.50.0.tar.xz" FILENAME "pangomm-2.50.0.tar.xz" @@ -10,9 +11,10 @@ vcpkg_extract_source_archive_ex( ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dmsvc14x-parallel-installable=false + -Dbuild-documentation=false ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' @@ -23,4 +25,4 @@ vcpkg_install_meson() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -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) diff --git a/ports/pangomm/vcpkg.json b/ports/pangomm/vcpkg.json index b2a91c87137cb8..a78702129ccc51 100644 --- a/ports/pangomm/vcpkg.json +++ b/ports/pangomm/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pangomm", "version": "2.50.0", - "port-version": 1, + "port-version": 2, "description": "pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.", - "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pangomm", + "homepage": "https://gitlab.gnome.org/GNOME/pangomm", + "license": "LGPL-2.1", "supports": "!arm", "dependencies": [ "cairo", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index 7f0ed677405574..18d71ff6f33b94 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0bad5eb22d4affecd3eb08be801a8692b5704c6", + "version": "2.36.1", + "port-version": 0 + }, { "git-tree": "bd4ca61c3b3fcfbadf494e019aa13a659eeff930", "version": "2.36.0", diff --git a/versions/baseline.json b/versions/baseline.json index fefaa4ef44a9e3..3dc516163bd209 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -209,8 +209,8 @@ "port-version": 2 }, "atkmm": { - "baseline": "2.36.0", - "port-version": 2 + "baseline": "2.36.1", + "port-version": 0 }, "atlmfc": { "baseline": "0", @@ -5286,7 +5286,7 @@ }, "pangomm": { "baseline": "2.50.0", - "port-version": 1 + "port-version": 2 }, "parallel-hashmap": { "baseline": "1.34", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 1f966eb4791d35..218d435234aa2e 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34d3ec912d605fecbc17c5eee6257db6574c5318", + "version": "2.50.0", + "port-version": 2 + }, { "git-tree": "5aebede0dd324cd7e5db1460e1d9be26d18685ba", "version": "2.50.0", From c0c7d23949a5a2039b03d96ea27cc7e7dd75604d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 20 Apr 2022 21:46:31 +0000 Subject: [PATCH 061/383] [sdl2-image] Fix dependency libpng (#24248) * [sdl2-image] Fix dependency libpng * version * add license * version --- ports/sdl2-image/CMakeLists.txt | 4 ++-- ports/sdl2-image/sdl2-image-config.cmake.in | 7 +++++++ ports/sdl2-image/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/s-/sdl2-image.json | 5 +++++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt index deb52114e525b9..45b2b57e64122d 100644 --- a/ports/sdl2-image/CMakeLists.txt +++ b/ports/sdl2-image/CMakeLists.txt @@ -68,9 +68,9 @@ if(USE_WEBP) endif() if(USE_PNG) - find_package(libpng REQUIRED) + find_package(PNG REQUIRED) add_definitions(-DLOAD_PNG) - target_link_libraries(SDL2_image PRIVATE png) + target_link_libraries(SDL2_image PRIVATE PNG::PNG) endif() if(USE_JPEG) diff --git a/ports/sdl2-image/sdl2-image-config.cmake.in b/ports/sdl2-image/sdl2-image-config.cmake.in index d69bc6a49c3c74..8db8b11d0781be 100644 --- a/ports/sdl2-image/sdl2-image-config.cmake.in +++ b/ports/sdl2-image/sdl2-image-config.cmake.in @@ -1,6 +1,13 @@ include(CMakeFindDependencyMacro) + find_dependency(SDL2 CONFIG) + if(@USE_WEBP@) find_dependency(WebP CONFIG) endif() + +if (@USE_PNG@) + find_dependency(PNG) +endif() + include("${CMAKE_CURRENT_LIST_DIR}/sdl2-image-targets.cmake") diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json index 48df1caa2d8a09..0eb0da92b8ebf3 100644 --- a/ports/sdl2-image/vcpkg.json +++ b/ports/sdl2-image/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sdl2-image", "version": "2.0.5", - "port-version": 5, + "port-version": 6, "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV", "homepage": "https://www.libsdl.org/projects/SDL_image", + "license": "Zlib", "dependencies": [ "libpng", "sdl2", diff --git a/versions/baseline.json b/versions/baseline.json index 3dc516163bd209..3019d40f9af6d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6378,7 +6378,7 @@ }, "sdl2-image": { "baseline": "2.0.5", - "port-version": 5 + "port-version": 6 }, "sdl2-mixer": { "baseline": "2.0.4", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index 0e2c4254b7e078..cc213ea4553f72 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1ed993b97bc76d5a8abdf4e9e8e148903078a70", + "version": "2.0.5", + "port-version": 6 + }, { "git-tree": "623548e8c929f2160320bf9644e2cd5a75d4a608", "version": "2.0.5", From 7ef0c787df2e52e98714de3326f832ccc26a6e9c Mon Sep 17 00:00:00 2001 From: Sean Farrell Date: Wed, 20 Apr 2022 23:47:08 +0200 Subject: [PATCH 062/383] [rsig] Adds new port rsig v0.1.0 (#24246) * Adds rsig v0.1.0 * Applies automated code reviews. - updates new cmake invocation - adds license field vcpkg.json * Fixes versions. * Remove CMakeList and cmake dependency. * Fix version. --- ports/rsig/portfile.cmake | 10 ++++++++++ ports/rsig/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/r-/rsig.json | 9 +++++++++ 4 files changed, 30 insertions(+) create mode 100644 ports/rsig/portfile.cmake create mode 100644 ports/rsig/vcpkg.json create mode 100644 versions/r-/rsig.json diff --git a/ports/rsig/portfile.cmake b/ports/rsig/portfile.cmake new file mode 100644 index 00000000000000..cf1449860d5bc0 --- /dev/null +++ b/ports/rsig/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rioki/rsig + REF v0.1.0 + SHA512 73de6dfe0b18f141a388c9307d8dff9a0709ceb758f58c474a7ddc5d9d77f2f8808fe4d78f3ad88466f81ca61b15ae3504255595d78387b23f87974de46d1d2b + ) + +file(INSTALL ${SOURCE_PATH}/rsig/rsig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/rsig) + +configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/rsig/vcpkg.json b/ports/rsig/vcpkg.json new file mode 100644 index 00000000000000..1a6f81257c90f0 --- /dev/null +++ b/ports/rsig/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rsig", + "version-semver": "0.1.0", + "description": "rioki's signal library", + "homepage": "https://github.com/rioki/rsig", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 3019d40f9af6d4..b440d58084ffcc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6232,6 +6232,10 @@ "baseline": "0.0.7", "port-version": 1 }, + "rsig": { + "baseline": "0.1.0", + "port-version": 0 + }, "rsm-binary-io": { "baseline": "2.0.4", "port-version": 1 diff --git a/versions/r-/rsig.json b/versions/r-/rsig.json new file mode 100644 index 00000000000000..3af215f274d6c1 --- /dev/null +++ b/versions/r-/rsig.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ead8c39f676072093b0b65df27d2f34414ef056a", + "version-semver": "0.1.0", + "port-version": 0 + } + ] +} From dc2b45330b5b996e6269be999597e24392328a04 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 20 Apr 2022 14:47:54 -0700 Subject: [PATCH 063/383] [ceres]update SHA512 (#24156) * update hash * update version * update feature cuda description * overwrite version --- ports/ceres/portfile.cmake | 2 +- ports/ceres/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/ceres.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index a2bf71c932f79c..c3aad82243ccf6 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ceres-solver/ceres-solver REF f68321e7de8929fbcdb95dd42877531e64f72f66 #2.1.0 - SHA512 b482988d837187e348250122b1acacbb4fd6354709efa6335c0322a68234a38292c072499a886b69a30614f85c818d3d2e9eeb3d3d0ca17d8f013a38d9151207 + SHA512 67bbd8a9385a40fe69d118fbc84da0fcc9aa1fbe14dd52f5403ed09686504213a1d931e95a1a0148d293b27ab5ce7c1d618fbf2e8fed95f2bbafab851a1ef449 HEAD_REF master PATCHES 0001_cmakelists_fixes.patch diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index fec4414e7dffce..6b1e2e7b421d4b 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ceres", "version": "2.1.0", + "port-version": 1, "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", "license": "Apache-2.0", @@ -18,7 +19,7 @@ ], "features": { "cuda": { - "description": "Build darknet with support for CUDA", + "description": "Support for CUDA based dense solvers", "supports": "linux | (!osx & !uwp & !(arm64 & windows))", "dependencies": [ "cuda" diff --git a/versions/baseline.json b/versions/baseline.json index b440d58084ffcc..b01a75757da423 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1306,7 +1306,7 @@ }, "ceres": { "baseline": "2.1.0", - "port-version": 0 + "port-version": 1 }, "cfitsio": { "baseline": "3.49", diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index a2d10ae11a13b2..9697d19bef5a7c 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85a5ff9f8727124ce91655f2d37b9a6c77f367e1", + "version": "2.1.0", + "port-version": 1 + }, { "git-tree": "d3ebf81bee31323b13ad3353b6dbf9944b03abe3", "version": "2.1.0", From e0c3408c778c54788393c4a739f6f3507aff77cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Wed, 20 Apr 2022 23:51:12 +0200 Subject: [PATCH 064/383] [tracy] Add Tracy `profiler` and `capture` tools using project files (#24091) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: JackĀ·BoosĀ·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: JackĀ·BoosĀ·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD AndrĆ©a Co-authored-by: JackĀ·BoosĀ·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/capstone/portfile.cmake | 4 +- ports/capstone/vcpkg.json | 1 + ports/tracy/001-fix-vcxproj-vcpkg.patch | 44 +++++++ ports/tracy/002-fix-capstone-5.patch | 26 ++++ ports/tracy/portfile.cmake | 160 +++++++++++++++++++++++- ports/tracy/vcpkg.json | 38 +++++- versions/baseline.json | 4 +- versions/c-/capstone.json | 5 + versions/t-/tracy.json | 5 + 9 files changed, 276 insertions(+), 11 deletions(-) create mode 100644 ports/tracy/001-fix-vcxproj-vcpkg.patch create mode 100644 ports/tracy/002-fix-capstone-5.patch diff --git a/ports/capstone/portfile.cmake b/ports/capstone/portfile.cmake index 544e59c2d1bbc2..86681b824e8e83 100644 --- a/ports/capstone/portfile.cmake +++ b/ports/capstone/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REF d5141c04785678535c7792eddc21f146186e639f # 5.0.0-rc2 REPO "capstone-engine/capstone" - SHA512 de9cf7da9fc3e502165b28b998b472791c8d5366e1a1a1fabd6bb8856a6fae80bf7d1fc4d268572d69c3526161bb0509a598ad4d94207e25a62aff6a5f9e9404 + REF 000561b4f74dc15bda9af9544fe714efda7a6e13 # 5.0.0-rc2 + SHA512 66b09a7d2fda297836bbedaeece71dcfe39bdbd633d9b6ecb68ee2e5aa094b697226136ab172cdc4550e8b2ef1448d001c8ee4e0d456c6d277afe0b3d1aab5a1 HEAD_REF next PATCHES 001-silence-windows-crt-secure-warnings.patch diff --git a/ports/capstone/vcpkg.json b/ports/capstone/vcpkg.json index 3b0362641e34dc..06ffbd96857db2 100644 --- a/ports/capstone/vcpkg.json +++ b/ports/capstone/vcpkg.json @@ -1,6 +1,7 @@ { "name": "capstone", "version": "5.0.0-rc2", + "port-version": 1, "description": "Multi-architecture disassembly framework", "homepage": "https://github.com/capstone-engine/capstone", "dependencies": [ diff --git a/ports/tracy/001-fix-vcxproj-vcpkg.patch b/ports/tracy/001-fix-vcxproj-vcpkg.patch new file mode 100644 index 00000000000000..cef0a0ad22664a --- /dev/null +++ b/ports/tracy/001-fix-vcxproj-vcpkg.patch @@ -0,0 +1,44 @@ +diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj +index 8215cc7..f427953 100644 +--- a/profiler/build/win32/Tracy.vcxproj ++++ b/profiler/build/win32/Tracy.vcxproj +@@ -57,7 +57,7 @@ + Disabled + true + _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) +- ..\..\..\imgui;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) ++ ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + true + false + true +@@ -67,9 +67,8 @@ + Fast + + +- brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Windows +- ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib + + + true +@@ -83,7 +82,7 @@ + true + true + NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) +- ..\..\..\imgui;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) ++ ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + true + true + AdvancedVectorExtensions2 +@@ -94,9 +93,8 @@ + + true + true +- brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Windows +- ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib + + + true diff --git a/ports/tracy/002-fix-capstone-5.patch b/ports/tracy/002-fix-capstone-5.patch new file mode 100644 index 00000000000000..2c9f4c7533b851 --- /dev/null +++ b/ports/tracy/002-fix-capstone-5.patch @@ -0,0 +1,26 @@ +diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp +index cc56298..7b9370a 100644 +--- a/server/TracySourceView.cpp ++++ b/server/TracySourceView.cpp +@@ -2,7 +2,7 @@ + #include + #include + +-#include ++#include + + #include "imgui.h" + #include "TracyCharUtil.hpp" +diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp +index fcb1718..2433e59 100644 +--- a/server/TracyWorker.cpp ++++ b/server/TracyWorker.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + + #define ZDICT_STATIC_LINKING_ONLY + #include "../zstd/zdict.h" diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index d5063151dcc514..38607261d5034e 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -1,24 +1,174 @@ + +# It is possible to run into some issues when profiling when we uses Tracy client as a shared client +# As as safety measure let's build Tracy as a static library for now +# More details on Tracy Discord (e.g. https://discord.com/channels/585214693895962624/585214693895962630/953599951328403506) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF 9ba7171c3dd6f728268a820ee268a62c75f2dfb6 - SHA512 a2898cd04a532a5cc71fd6c5fd3893ebff68df25fc38e8d988ba4a8a6cbe33e3d0049661029d002160b94b57421e5c5b7400658b404e51bfab721d204dd0cc5d + REF e83e83dae9852a9d4d451589f324776710b34ee6 + SHA512 1286a54bc9c874b076ca36be63055b78ed8af3df0f10da06478bd5a7036538ce0ee26f3e7bec771e1408b78bc8094d6e7a9f420645b6a0da8eef415fb2717133 HEAD_REF master + PATCHES + 001-fix-vcxproj-vcpkg.patch + 002-fix-capstone-5.patch ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} ) - vcpkg_cmake_install() -vcpkg_copy_pdbs() +if(VCPKG_TARGET_IS_LINUX) + set(any_tracy_tool_requested OFF) + if(profiler IN_LIST FEATURES) + message(WARNING +"Tracy currently requires the following libraries from the system package manager to build its tools: + gtk+-3.0 + tbb + +These can be installed on Ubuntu systems via sudo apt install libgtk-3-dev libtbb-dev") + set(any_tracy_tool_requested ON) + else() + foreach(CLI_TOOL capture csvexport import-chrome update) + if(${CLI_TOOL} IN_LIST FEATURES) + message(WARNING +"Tracy currently requires the following libraries from the system package manager to build its tools: + tbb + +These can be installed on Ubuntu systems via sudo apt install libtbb-dev") + set(any_tracy_tool_requested ON) + break() + endif() + endforeach() + endif() + +endif() + +vcpkg_list(SET tracy_tools) +if("cli-tools" IN_LIST FEATURES) + vcpkg_list(APPEND tracy_tools capture csvexport import-chrome update) +endif() +if("gui-tools" IN_LIST FEATURES) + vcpkg_list(APPEND tracy_tools profiler) +endif() + +function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME) + foreach(buildtype IN ITEMS "debug" "release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}") + if("${buildtype}" STREQUAL "debug") + set(short_buildtype "-dbg") + set(path_suffix "/debug") + else() + set(short_buildtype "-rel") + set(path_suffix "") + endif() + + file(COPY "${SOURCE_PATH}/${tracy_TOOL}/build/unix" DESTINATION "${SOURCE_PATH}/${tracy_TOOL}/_build") + file(RENAME "${SOURCE_PATH}/${tracy_TOOL}/_build/unix" "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}") + file(REMOVE_RECURSE "${SOURCE_PATH}/${tracy_TOOL}/_build") + + set(path_makefile_dir "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}") + cmake_path(RELATIVE_PATH path_makefile_dir + BASE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}" + OUTPUT_VARIABLE relative_path_makefile_dir) + vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig") + + message(STATUS "Building ${tracy_TOOL_NAME} ${TARGET_TRIPLET}${short_buildtype}") + vcpkg_build_make( + BUILD_TARGET ${buildtype} + SUBPATH ${relative_path_makefile_dir} + LOGFILE_ROOT "build-${tracy_TOOL}" + ) + vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) + + file(INSTALL "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}/${tracy_TOOL_NAME}-${buildtype}" DESTINATION "${CURRENT_PACKAGES_DIR}${path_suffix}/tools/${PORT}" RENAME "${tracy_TOOL_NAME}") + endif() + endforeach() +endfunction() + +if("capture" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "capture/build/win32/capture.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(capture capture) + endif() +endif() + +if("csvexport" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "csvexport/build/win32/csvexport.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(csvexport csvexport) + endif() +endif() + +if("import-chrome" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "import-chrome/build/win32/import-chrome.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(import-chrome import-chrome) + endif() +endif() + +if("profiler" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "profiler/build/win32/Tracy.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(profiler Tracy) + endif() +endif() + +if("update" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "update/build/win32/update.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(update update) + endif() +endif() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy) vcpkg_fixup_pkgconfig() +foreach(TOOL capture csvexport import-chrome profiler update) + if(${TOOL} IN_LIST tracy_tools) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() + break() + endif() +endforeach() + # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Cleanup file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 9821d14bf10bb9..a66c50e6c2e8a1 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,8 +1,10 @@ { "name": "tracy", - "version": "0.8.0", + "version-semver": "0.8.0", + "port-version": 1, "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", + "license": "BSD-3-Clause", "supports": "!(windows & (arm | uwp))", "dependencies": [ { @@ -17,5 +19,37 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "cli-tools": { + "description": "Build Tracy command-line tools: `capture`, `csvexport`, `import-chrome` and `update`", + "supports": "!(windows & x86)", + "dependencies": [ + { + "name": "capstone", + "features": [ + "arm", + "arm64", + "x86" + ] + } + ] + }, + "gui-tools": { + "description": "Build Tracy GUI tool: `profiler` (aka `Tracy` executable)", + "supports": "!(windows & x86)", + "dependencies": [ + { + "name": "capstone", + "features": [ + "arm", + "arm64", + "x86" + ] + }, + "freetype", + "glfw3" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index b01a75757da423..6baba1f9611740 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1246,7 +1246,7 @@ }, "capstone": { "baseline": "5.0.0-rc2", - "port-version": 0 + "port-version": 1 }, "cargs": { "baseline": "1.0.3", @@ -7090,7 +7090,7 @@ }, "tracy": { "baseline": "0.8.0", - "port-version": 0 + "port-version": 1 }, "transwarp": { "baseline": "2.2.2", diff --git a/versions/c-/capstone.json b/versions/c-/capstone.json index 008cc376f89476..acdfcd871d5ad1 100644 --- a/versions/c-/capstone.json +++ b/versions/c-/capstone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f31ba3baba34c74dea464d864cca666c8793b1e7", + "version": "5.0.0-rc2", + "port-version": 1 + }, { "git-tree": "f7b26d8f672f30156cad79a647525b8dd8c9781b", "version": "5.0.0-rc2", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index 8274402c9f5606..e95ccfb6f1dc88 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65aeedc7adaa4e1b13998f781e702d7672b2aca5", + "version-semver": "0.8.0", + "port-version": 1 + }, { "git-tree": "b34c2e1fb20aa7f46e350fbf5b90e8dda71aaf3a", "version": "0.8.0", From 9f074ffa17fae7db02aafc15b6fc63cf2d747e18 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Thu, 21 Apr 2022 09:02:13 -0700 Subject: [PATCH 065/383] [llvm] fix abi-breaking-checks to always be disabled (#24278) * [llvm] fix abi-breaking-checks to always be disabled in Debug builds, LLVM_ABI_BREAKING_CHECKS was on by default; however, they use the release headers (which set it to OFF) this results in a mismatch, and means you can't link LLVM * update port version * version Co-authored-by: nicole mazzuca Co-authored-by: JackBoosY --- ports/llvm/portfile.cmake | 7 +++++-- ports/llvm/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/llvm.json | 5 +++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 205d250396b6cb..1915dadcdd3ad6 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -76,13 +76,16 @@ elseif("disable-assertions" IN_LIST FEATURES) endif() # LLVM_ABI_BREAKING_CHECKS can be WITH_ASSERTS (default), FORCE_ON or FORCE_OFF. -# By default abi-breaking checks are enabled if assertions are enabled. +# By default in LLVM, abi-breaking checks are enabled if assertions are enabled. +# however, this breaks linking with the debug versions, since the option is +# baked into the header files; thus, we always turn off LLVM_ABI_BREAKING_CHECKS +# unless the user asks for it if("enable-abi-breaking-checks" IN_LIST FEATURES) # Force enable abi-breaking checks. list(APPEND FEATURE_OPTIONS -DLLVM_ABI_BREAKING_CHECKS=FORCE_ON ) -elseif("disable-abi-breaking-checks" IN_LIST FEATURES) +else() # Force disable abi-breaking checks. list(APPEND FEATURE_OPTIONS -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 29be0e7bb0924d..9e8435ca57ab44 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "llvm", "version": "13.0.0", - "port-version": 3, + "port-version": 5, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", @@ -99,7 +99,7 @@ ] }, "disable-abi-breaking-checks": { - "description": "Build LLVM with LLVM_ABI_BREAKING_CHECKS=FORCE_OFF." + "description": "Deprecated; this is the default" }, "disable-assertions": { "description": "Build LLVM without assertions." diff --git a/versions/baseline.json b/versions/baseline.json index 6baba1f9611740..706db365506569 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4254,7 +4254,7 @@ }, "llvm": { "baseline": "13.0.0", - "port-version": 3 + "port-version": 5 }, "lmdb": { "baseline": "0.9.29", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index ee0a089ff7ab9a..09fea1d5e9b8d1 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c835fcc79ad542a73ac25fd939556039ff75cd1", + "version": "13.0.0", + "port-version": 5 + }, { "git-tree": "15418b7e938058677963d920b616403240eca37f", "version": "13.0.0", From 3f2dfb8d7633577884e998e3e16a98f9e7c09bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 21 Apr 2022 16:06:18 +0000 Subject: [PATCH 066/383] [vcpkg baseline][qpid-proton] Fix dependencies (#24267) * [vcpkg baseline][qpid-proton] Fix dependencies * version * Re-fix jsoncpp * version * typo * version * okay fix for reals Co-authored-by: nicole mazzuca --- ports/qpid-proton/fix-dependencies.patch | 117 ++++++++++++++++++++++ ports/qpid-proton/portfile.cmake | 48 ++++----- ports/qpid-proton/qpid-protonConfig.cmake | 4 - ports/qpid-proton/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/q-/qpid-proton.json | 5 + 6 files changed, 150 insertions(+), 29 deletions(-) create mode 100644 ports/qpid-proton/fix-dependencies.patch delete mode 100644 ports/qpid-proton/qpid-protonConfig.cmake diff --git a/ports/qpid-proton/fix-dependencies.patch b/ports/qpid-proton/fix-dependencies.patch new file mode 100644 index 00000000000000..3c679af0bb8e17 --- /dev/null +++ b/ports/qpid-proton/fix-dependencies.patch @@ -0,0 +1,117 @@ +diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt +index 27b40e7..1931b65 100644 +--- a/c/CMakeLists.txt ++++ b/c/CMakeLists.txt +@@ -727,11 +727,6 @@ install (FILES + ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfigVersion.cmake + DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton) +-install (FILES +- ../tools/cmake/Modules/FindCyrusSASL.cmake +- ../tools/cmake/Modules/FindOpenSSL.cmake +- ../tools/cmake/Modules/FindThreads.cmake +- DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton) + + if (ENABLE_BENCHMARKS) + add_subdirectory(benchmarks) +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 03fe80a..fd6a31d 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -26,12 +26,15 @@ find_package(Threads) + include(versions.cmake) + + # Check for JSON-CPP support for connection configuration +-find_package(JsonCpp) +-option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" ${JsonCpp_FOUND}) ++option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" OFF) + if (ENABLE_JSONCPP) +- include_directories(${JsonCpp_INCLUDE_DIRS}) ++ find_package(jsoncpp CONFIG REQUIRED) + set(CONNECT_CONFIG_SRC src/connect_config.cpp) +- set(CONNECT_CONFIG_LIBS ${JsonCpp_LIBRARY}) ++ if (TARGET jsoncpp_lib) ++ set(CONNECT_CONFIG_LIBS jsoncpp_lib) ++ elseif (TARGET jsoncpp_static) ++ set(CONNECT_CONFIG_LIBS jsoncpp_static) ++ endif() + else() + set(CONNECT_CONFIG_SRC src/connect_config_dummy.cpp) + endif() + +--- a/c/src/ProtonConfig.cmake.in ++++ b/c/src/ProtonConfig.cmake.in +@@ -20,39 +20,40 @@ + # Name: Proton + # Description: Qpid Proton C library + # Version: @PN_VERSION@ + # URL: http://qpid.apache.org/proton/ + + @PACKAGE_INIT@ +-if (NOT Proton_USE_STATIC_LIBS) ++include(CMakeFindDependencyMacro) ++if (1) + include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargets.cmake") + else() + include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargetsStatic.cmake") + endif() + + set(Proton_VERSION @PN_VERSION@) + + # find dependencies, because static libs don't transitively pull them +-if (Proton_USE_STATIC_LIBS) +- set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH}) +- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") ++if (1) ++ #set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH}) ++ #set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + + set(CyrusSASL_FOUND @CyrusSASL_FOUND@) + if (CyrusSASL_FOUND) +- find_package (CyrusSASL REQUIRED) ++ find_dependency (CyrusSASL) + endif() + + set(OPENSSL_FOUND @OPENSSL_FOUND@) + set(OpenSSL_FOUND @OpenSSL_FOUND@) + if (OPENSSL_FOUND OR OpenSSL_FOUND) +- find_package (OpenSSL REQUIRED) ++ find_dependency (OpenSSL) + endif() + +- find_package (Threads REQUIRED) ++ find_dependency (Threads) + +- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD}) ++ #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD}) + endif() + + set (Proton_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@) + set (Proton_LIBRARIES Proton::qpid-proton) + set (Proton_FOUND True) + +--- a/cpp/ProtonCppConfig.cmake.in ++++ b/cpp/ProtonCppConfig.cmake.in +@@ -20,19 +20,21 @@ + # Name: Proton + # Description: Qpid Proton C library + # Version: @PN_VERSION@ + # URL: http://qpid.apache.org/proton/ + + @PACKAGE_INIT@ +-if (NOT ProtonCpp_USE_STATIC_LIBS) ++include(CMakeFindDependencyMacro) ++find_dependency(Proton CONFIG) ++if (1) + include("${CMAKE_CURRENT_LIST_DIR}/ProtonCppTargets.cmake") + else() + include("${CMAKE_CURRENT_LIST_DIR}/ProtonCppTargetsStatic.cmake") + endif() + + set (ProtonCpp_VERSION @PN_VERSION@) + + set (ProtonCpp_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@) + set (ProtonCpp_LIBRARIES Proton::cpp) + set (ProtonCpp_FOUND True) + + check_required_components(ProtonCpp) diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 388580f109fc48..347d89883f824c 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -1,17 +1,23 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -vcpkg_find_acquire_program(PYTHON3) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/qpid-proton REF fee5e94afb83b92ffa60a6f815d5102a67915166 # 0.37.0 SHA512 e9fbd02444dd073908186e6873b4e230e0a5971929e9b1a49758240d166f6da4e6c88d701c66d5e5539bea0beca380c763bffcef5b0e1ed5f9fc2691f5f86559 HEAD_REF next + PATCHES fix-dependencies.patch ) +file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindPython.cmake") +file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindOpenSSL.cmake") +file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindJsonCpp.cmake") + +vcpkg_find_acquire_program(PYTHON3) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # It may cause call CHECK_LIBRARY_EXISTS before call project to set the language OPTIONS -DBUILD_GO=no -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON @@ -22,36 +28,32 @@ vcpkg_cmake_configure( -DENABLE_BENCHMARKS=OFF -DENABLE_FUZZ_TESTING=OFF -DBUILD_TESTING=OFF - -DPYTHON_EXECUTABLE=${PYTHON3} + -DPython_EXECUTABLE=${PYTHON3} ) vcpkg_cmake_install() +# qpid-proton installs tests into share/proton; this is not desireable +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/proton") + vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) -set(configFiles - "${CURRENT_PACKAGES_DIR}/share/${PORT}/Proton/ProtonConfig.cmake" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/ProtonCpp/ProtonCppConfig.cmake" +vcpkg_cmake_config_fixup( + PACKAGE_NAME Proton + CONFIG_PATH lib/cmake/Proton + DO_NOT_DELETE_PARENT_CONFIG_PATH +) +vcpkg_cmake_config_fixup( + PACKAGE_NAME ProtonCpp + CONFIG_PATH lib/cmake/ProtonCpp ) -foreach(configFile IN LISTS configFiles) - vcpkg_replace_string("${configFile}" - "IMPORTED_LOCATION_DEBUG \"\${_IMPORT_PREFIX}/lib" - "IMPORTED_LOCATION_DEBUG \"\${_IMPORT_PREFIX}/debug/lib" - ) - vcpkg_replace_string("${configFile}" - "debug \${_IMPORT_PREFIX}/lib" - "debug \${_IMPORT_PREFIX}/debug/lib" - ) -endforeach() vcpkg_fixup_pkgconfig() -configure_file(${CMAKE_CURRENT_LIST_DIR}/qpid-protonConfig.cmake - ${CURRENT_PACKAGES_DIR}/share/${PORT}/qpid-protonConfig.cmake COPYONLY) -file(RENAME "${CURRENT_PACKAGES_DIR}/share/proton/LICENSE.txt" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/proton") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proton/version.h" "#define PN_INSTALL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/ports/qpid-proton/qpid-protonConfig.cmake b/ports/qpid-proton/qpid-protonConfig.cmake deleted file mode 100644 index 3ad039bd6f9138..00000000000000 --- a/ports/qpid-proton/qpid-protonConfig.cmake +++ /dev/null @@ -1,4 +0,0 @@ -get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) -set(_IMPORT_PREFIX "${PACKAGE_PREFIX_DIR}") -include(${CMAKE_CURRENT_LIST_DIR}/Proton/ProtonConfig.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/ProtonCpp/ProtonCppConfig.cmake) diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index 5285646cc308d4..604cb1df4db42d 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qpid-proton", "version": "0.37.0", + "port-version": 1, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "license": "Apache-2.0", @@ -12,7 +13,7 @@ }, { "name": "openssl", - "platform": "!windows & !uwp" + "platform": "!windows" }, { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 706db365506569..de6fc7f9047262 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5650,7 +5650,7 @@ }, "qpid-proton": { "baseline": "0.37.0", - "port-version": 0 + "port-version": 1 }, "qscintilla": { "baseline": "2.12.0", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index a7a727c359d93c..2b30ab71e1571f 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "543baa82530f5eb5ed9b3d6348a14b5e24ccda64", + "version": "0.37.0", + "port-version": 1 + }, { "git-tree": "720cc65a7b408878662ce7c749211fa7edaf25fd", "version": "0.37.0", From 96ec7fb25da25e0463446e552d59715a47c95e73 Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Thu, 21 Apr 2022 20:01:54 +0300 Subject: [PATCH 067/383] [boost] update to 1.79.0 (#24210) * [scripts/boost] update to v1.79.0 * [boost-*] re-generate ports * update versions * [boost-wave] fix build * update version * [fbthrift] fix build compatibility with Boost 1.79.0 * update versions * [scripts/boost] use vcpkg_replace_string * update versions --- ports/boost-accumulators/portfile.cmake | 4 +- ports/boost-accumulators/vcpkg.json | 3 +- ports/boost-algorithm/portfile.cmake | 4 +- ports/boost-algorithm/vcpkg.json | 3 +- ports/boost-align/portfile.cmake | 4 +- ports/boost-align/vcpkg.json | 3 +- ports/boost-any/portfile.cmake | 4 +- ports/boost-any/vcpkg.json | 3 +- ports/boost-array/portfile.cmake | 4 +- ports/boost-array/vcpkg.json | 3 +- ports/boost-asio/portfile.cmake | 4 +- ports/boost-asio/vcpkg.json | 3 +- ports/boost-assert/portfile.cmake | 4 +- ports/boost-assert/vcpkg.json | 3 +- ports/boost-assign/portfile.cmake | 4 +- ports/boost-assign/vcpkg.json | 3 +- .../0001-fix-compilation-for-uwp.patch | 81 ----- ports/boost-atomic/portfile.cmake | 14 +- ports/boost-atomic/vcpkg.json | 3 +- ports/boost-beast/portfile.cmake | 4 +- ports/boost-beast/vcpkg.json | 3 +- ports/boost-bimap/portfile.cmake | 4 +- ports/boost-bimap/vcpkg.json | 3 +- ports/boost-bind/portfile.cmake | 4 +- ports/boost-bind/vcpkg.json | 3 +- ports/boost-build/portfile.cmake | 4 +- ports/boost-build/vcpkg.json | 4 +- ports/boost-callable-traits/portfile.cmake | 4 +- ports/boost-callable-traits/vcpkg.json | 3 +- ports/boost-chrono/portfile.cmake | 7 +- ports/boost-chrono/vcpkg.json | 3 +- ports/boost-circular-buffer/portfile.cmake | 4 +- ports/boost-circular-buffer/vcpkg.json | 3 +- ports/boost-compatibility/portfile.cmake | 4 +- ports/boost-compatibility/vcpkg.json | 3 +- ports/boost-compute/portfile.cmake | 4 +- ports/boost-compute/vcpkg.json | 3 +- ports/boost-concept-check/portfile.cmake | 4 +- ports/boost-concept-check/vcpkg.json | 3 +- ports/boost-config/portfile.cmake | 4 +- ports/boost-config/vcpkg.json | 3 +- ports/boost-container-hash/portfile.cmake | 4 +- ports/boost-container-hash/vcpkg.json | 3 +- ports/boost-container/portfile.cmake | 7 +- ports/boost-container/vcpkg.json | 3 +- ports/boost-context/portfile.cmake | 16 +- ports/boost-context/vcpkg.json | 3 +- ports/boost-contract/portfile.cmake | 7 +- ports/boost-contract/vcpkg.json | 3 +- ports/boost-conversion/portfile.cmake | 4 +- ports/boost-conversion/vcpkg.json | 3 +- ports/boost-convert/portfile.cmake | 4 +- ports/boost-convert/vcpkg.json | 3 +- ports/boost-core/portfile.cmake | 4 +- ports/boost-core/vcpkg.json | 3 +- ports/boost-coroutine/portfile.cmake | 7 +- ports/boost-coroutine/vcpkg.json | 3 +- ports/boost-coroutine2/portfile.cmake | 4 +- ports/boost-coroutine2/vcpkg.json | 3 +- ports/boost-crc/portfile.cmake | 4 +- ports/boost-crc/vcpkg.json | 3 +- ports/boost-date-time/portfile.cmake | 7 +- ports/boost-date-time/vcpkg.json | 3 +- ports/boost-describe/portfile.cmake | 4 +- ports/boost-describe/vcpkg.json | 3 +- ports/boost-detail/portfile.cmake | 4 +- ports/boost-detail/vcpkg.json | 3 +- ports/boost-dll/portfile.cmake | 4 +- ports/boost-dll/vcpkg.json | 3 +- ports/boost-dynamic-bitset/portfile.cmake | 4 +- ports/boost-dynamic-bitset/vcpkg.json | 3 +- ports/boost-endian/portfile.cmake | 4 +- ports/boost-endian/vcpkg.json | 3 +- ports/boost-exception/portfile.cmake | 7 +- ports/boost-exception/vcpkg.json | 3 +- ports/boost-fiber/fix-build-numa.patch | 15 - ports/boost-fiber/portfile.cmake | 15 +- ports/boost-fiber/vcpkg.json | 3 +- ports/boost-filesystem/portfile.cmake | 7 +- ports/boost-filesystem/vcpkg.json | 4 +- ports/boost-flyweight/portfile.cmake | 4 +- ports/boost-flyweight/vcpkg.json | 3 +- ports/boost-foreach/portfile.cmake | 4 +- ports/boost-foreach/vcpkg.json | 3 +- ports/boost-format/portfile.cmake | 4 +- ports/boost-format/vcpkg.json | 3 +- ports/boost-function-types/portfile.cmake | 4 +- ports/boost-function-types/vcpkg.json | 3 +- ports/boost-function/portfile.cmake | 4 +- ports/boost-function/vcpkg.json | 3 +- ports/boost-functional/portfile.cmake | 4 +- ports/boost-functional/vcpkg.json | 3 +- ports/boost-fusion/portfile.cmake | 4 +- ports/boost-fusion/vcpkg.json | 3 +- ports/boost-geometry/portfile.cmake | 4 +- ports/boost-geometry/vcpkg.json | 3 +- ports/boost-gil/portfile.cmake | 4 +- ports/boost-gil/vcpkg.json | 3 +- ports/boost-graph-parallel/portfile.cmake | 7 +- ports/boost-graph-parallel/vcpkg.json | 3 +- ports/boost-graph/portfile.cmake | 7 +- ports/boost-graph/vcpkg.json | 3 +- ports/boost-hana/portfile.cmake | 4 +- ports/boost-hana/vcpkg.json | 3 +- ports/boost-heap/portfile.cmake | 4 +- ports/boost-heap/vcpkg.json | 3 +- ports/boost-histogram/portfile.cmake | 4 +- ports/boost-histogram/vcpkg.json | 3 +- ports/boost-hof/portfile.cmake | 4 +- ports/boost-hof/vcpkg.json | 3 +- ports/boost-icl/portfile.cmake | 4 +- ports/boost-icl/vcpkg.json | 3 +- ports/boost-integer/portfile.cmake | 4 +- ports/boost-integer/vcpkg.json | 4 +- ports/boost-interprocess/portfile.cmake | 4 +- ports/boost-interprocess/vcpkg.json | 3 +- ports/boost-interval/portfile.cmake | 4 +- ports/boost-interval/vcpkg.json | 3 +- ports/boost-intrusive/portfile.cmake | 4 +- ports/boost-intrusive/vcpkg.json | 3 +- ports/boost-io/portfile.cmake | 4 +- ports/boost-io/vcpkg.json | 3 +- ports/boost-iostreams/portfile.cmake | 7 +- ports/boost-iostreams/vcpkg.json | 3 +- ports/boost-iterator/portfile.cmake | 4 +- ports/boost-iterator/vcpkg.json | 3 +- .../0001-json-array-erase-relocate.patch | 20 ++ ports/boost-json/portfile.cmake | 15 +- ports/boost-json/vcpkg.json | 5 +- ports/boost-lambda/portfile.cmake | 4 +- ports/boost-lambda/vcpkg.json | 3 +- ports/boost-lambda2/portfile.cmake | 4 +- ports/boost-lambda2/vcpkg.json | 3 +- ports/boost-leaf/portfile.cmake | 4 +- ports/boost-leaf/vcpkg.json | 3 +- ports/boost-lexical-cast/portfile.cmake | 4 +- ports/boost-lexical-cast/vcpkg.json | 3 +- ports/boost-local-function/portfile.cmake | 4 +- ports/boost-local-function/vcpkg.json | 3 +- ports/boost-locale/portfile.cmake | 7 +- ports/boost-locale/vcpkg.json | 3 +- ports/boost-lockfree/portfile.cmake | 4 +- ports/boost-lockfree/vcpkg.json | 3 +- ports/boost-log/portfile.cmake | 16 +- ports/boost-log/vcpkg.json | 3 +- ports/boost-logic/portfile.cmake | 4 +- ports/boost-logic/vcpkg.json | 3 +- ports/boost-math/portfile.cmake | 7 +- ports/boost-math/vcpkg.json | 3 +- ports/boost-metaparse/portfile.cmake | 4 +- ports/boost-metaparse/vcpkg.json | 3 +- .../boost-modular-build.cmake | 2 +- ports/boost-modular-build-helper/vcpkg.json | 3 +- ports/boost-move/portfile.cmake | 4 +- ports/boost-move/vcpkg.json | 3 +- ports/boost-mp11/portfile.cmake | 4 +- ports/boost-mp11/vcpkg.json | 3 +- ports/boost-mpi/portfile.cmake | 7 +- ports/boost-mpi/vcpkg.json | 3 +- ports/boost-mpl/portfile.cmake | 4 +- ports/boost-mpl/vcpkg.json | 3 +- ports/boost-msm/portfile.cmake | 4 +- ports/boost-msm/vcpkg.json | 3 +- ports/boost-multi-array/portfile.cmake | 4 +- ports/boost-multi-array/vcpkg.json | 3 +- ports/boost-multi-index/portfile.cmake | 4 +- ports/boost-multi-index/vcpkg.json | 3 +- ...ection-logic-in-intel_intrinsics.hpp.patch | 29 -- ports/boost-multiprecision/portfile.cmake | 5 +- ports/boost-multiprecision/vcpkg.json | 4 +- ports/boost-nowide/portfile.cmake | 14 +- ports/boost-nowide/vcpkg.json | 3 +- ports/boost-numeric-conversion/portfile.cmake | 4 +- ports/boost-numeric-conversion/vcpkg.json | 3 +- ports/boost-odeint/portfile.cmake | 4 +- ports/boost-odeint/vcpkg.json | 3 +- ports/boost-optional/portfile.cmake | 4 +- ports/boost-optional/vcpkg.json | 3 +- ports/boost-outcome/portfile.cmake | 4 +- ports/boost-outcome/vcpkg.json | 3 +- ports/boost-parameter-python/portfile.cmake | 4 +- ports/boost-parameter-python/vcpkg.json | 3 +- ports/boost-parameter/portfile.cmake | 4 +- ports/boost-parameter/vcpkg.json | 3 +- ports/boost-pfr/portfile.cmake | 4 +- ports/boost-pfr/vcpkg.json | 3 +- ports/boost-phoenix/portfile.cmake | 4 +- ports/boost-phoenix/vcpkg.json | 3 +- ports/boost-poly-collection/portfile.cmake | 4 +- ports/boost-poly-collection/vcpkg.json | 3 +- ports/boost-polygon/portfile.cmake | 4 +- ports/boost-polygon/vcpkg.json | 3 +- ports/boost-pool/portfile.cmake | 4 +- ports/boost-pool/vcpkg.json | 3 +- ports/boost-predef/portfile.cmake | 4 +- ports/boost-predef/vcpkg.json | 3 +- ports/boost-preprocessor/portfile.cmake | 4 +- ports/boost-preprocessor/vcpkg.json | 3 +- ports/boost-process/fix_include.patch | 13 - ports/boost-process/portfile.cmake | 5 +- ports/boost-process/vcpkg.json | 3 +- ports/boost-program-options/portfile.cmake | 7 +- ports/boost-program-options/vcpkg.json | 3 +- .../portfile.cmake | 4 +- ports/boost-property-map-parallel/vcpkg.json | 4 +- ports/boost-property-map/portfile.cmake | 4 +- ports/boost-property-map/vcpkg.json | 3 +- ports/boost-property-tree/portfile.cmake | 4 +- ports/boost-property-tree/vcpkg.json | 3 +- ports/boost-proto/portfile.cmake | 4 +- ports/boost-proto/vcpkg.json | 3 +- ports/boost-ptr-container/portfile.cmake | 4 +- ports/boost-ptr-container/vcpkg.json | 3 +- ports/boost-python/portfile.cmake | 7 +- ports/boost-python/vcpkg.json | 3 +- ports/boost-qvm/portfile.cmake | 4 +- ports/boost-qvm/vcpkg.json | 3 +- ports/boost-random/portfile.cmake | 7 +- ports/boost-random/vcpkg.json | 3 +- ports/boost-range/portfile.cmake | 4 +- ports/boost-range/vcpkg.json | 3 +- ports/boost-ratio/portfile.cmake | 4 +- ports/boost-ratio/vcpkg.json | 3 +- ports/boost-rational/portfile.cmake | 4 +- ports/boost-rational/vcpkg.json | 3 +- ports/boost-regex/portfile.cmake | 7 +- ports/boost-regex/vcpkg.json | 3 +- ports/boost-safe-numerics/portfile.cmake | 4 +- ports/boost-safe-numerics/vcpkg.json | 3 +- ports/boost-scope-exit/portfile.cmake | 4 +- ports/boost-scope-exit/vcpkg.json | 3 +- ports/boost-serialization/portfile.cmake | 7 +- ports/boost-serialization/vcpkg.json | 3 +- ports/boost-signals2/portfile.cmake | 4 +- ports/boost-signals2/vcpkg.json | 3 +- ports/boost-smart-ptr/portfile.cmake | 4 +- ports/boost-smart-ptr/vcpkg.json | 3 +- ports/boost-sort/portfile.cmake | 4 +- ports/boost-sort/vcpkg.json | 3 +- ports/boost-spirit/portfile.cmake | 4 +- ports/boost-spirit/vcpkg.json | 3 +- ports/boost-stacktrace/portfile.cmake | 7 +- ports/boost-stacktrace/vcpkg.json | 3 +- ports/boost-statechart/portfile.cmake | 4 +- ports/boost-statechart/vcpkg.json | 3 +- ports/boost-static-assert/portfile.cmake | 4 +- ports/boost-static-assert/vcpkg.json | 3 +- ports/boost-static-string/portfile.cmake | 4 +- ports/boost-static-string/vcpkg.json | 3 +- ports/boost-stl-interfaces/portfile.cmake | 4 +- ports/boost-stl-interfaces/vcpkg.json | 3 +- ports/boost-system/portfile.cmake | 7 +- ports/boost-system/vcpkg.json | 3 +- ports/boost-test/portfile.cmake | 14 +- ports/boost-test/vcpkg.json | 3 +- ports/boost-thread/portfile.cmake | 7 +- ports/boost-thread/vcpkg.json | 3 +- ports/boost-throw-exception/portfile.cmake | 4 +- ports/boost-throw-exception/vcpkg.json | 3 +- ports/boost-timer/portfile.cmake | 7 +- ports/boost-timer/vcpkg.json | 3 +- ports/boost-tokenizer/portfile.cmake | 4 +- ports/boost-tokenizer/vcpkg.json | 3 +- ports/boost-tti/portfile.cmake | 4 +- ports/boost-tti/vcpkg.json | 3 +- ports/boost-tuple/portfile.cmake | 4 +- ports/boost-tuple/vcpkg.json | 3 +- ports/boost-type-erasure/portfile.cmake | 7 +- ports/boost-type-erasure/vcpkg.json | 3 +- ports/boost-type-index/portfile.cmake | 4 +- ports/boost-type-index/vcpkg.json | 3 +- ports/boost-type-traits/portfile.cmake | 4 +- ports/boost-type-traits/vcpkg.json | 3 +- ports/boost-typeof/portfile.cmake | 4 +- ports/boost-typeof/vcpkg.json | 3 +- ports/boost-ublas/portfile.cmake | 4 +- ports/boost-ublas/vcpkg.json | 3 +- ports/boost-uninstall/vcpkg.json | 5 +- ports/boost-units/portfile.cmake | 4 +- ports/boost-units/vcpkg.json | 3 +- ports/boost-unordered/portfile.cmake | 4 +- ports/boost-unordered/vcpkg.json | 5 +- ports/boost-utility/portfile.cmake | 4 +- ports/boost-utility/vcpkg.json | 3 +- ports/boost-uuid/portfile.cmake | 4 +- ports/boost-uuid/vcpkg.json | 3 +- ports/boost-variant/portfile.cmake | 4 +- ports/boost-variant/vcpkg.json | 3 +- ports/boost-variant2/portfile.cmake | 4 +- ports/boost-variant2/vcpkg.json | 3 +- ports/boost-vcpkg-helpers/portfile.cmake | 2 +- ports/boost-vcpkg-helpers/vcpkg.json | 4 +- ports/boost-vmd/portfile.cmake | 4 +- ports/boost-vmd/vcpkg.json | 3 +- ports/boost-wave/portfile.cmake | 12 +- ports/boost-wave/vcpkg.json | 4 +- ports/boost-winapi/portfile.cmake | 4 +- ports/boost-winapi/vcpkg.json | 3 +- ports/boost-xpressive/portfile.cmake | 4 +- ports/boost-xpressive/vcpkg.json | 3 +- ports/boost-yap/portfile.cmake | 4 +- ports/boost-yap/vcpkg.json | 3 +- ports/boost/vcpkg.json | 3 +- ...-fix-compatibility-with-boost-1.79.0.patch | 60 ++++ ports/fbthrift/portfile.cmake | 1 + ports/fbthrift/vcpkg.json | 1 + scripts/boost/generate-ports.ps1 | 18 +- scripts/boost/post-source-stubs/atomic.cmake | 6 +- scripts/boost/post-source-stubs/context.cmake | 9 +- scripts/boost/post-source-stubs/fiber.cmake | 7 +- scripts/boost/post-source-stubs/json.cmake | 7 +- scripts/boost/post-source-stubs/log.cmake | 9 +- scripts/boost/post-source-stubs/nowide.cmake | 7 +- scripts/boost/post-source-stubs/test.cmake | 7 +- scripts/boost/post-source-stubs/wave.cmake | 5 + versions/b-/boost-accumulators.json | 5 + versions/b-/boost-algorithm.json | 5 + versions/b-/boost-align.json | 5 + versions/b-/boost-any.json | 5 + versions/b-/boost-array.json | 5 + versions/b-/boost-asio.json | 5 + versions/b-/boost-assert.json | 5 + versions/b-/boost-assign.json | 5 + versions/b-/boost-atomic.json | 5 + versions/b-/boost-beast.json | 5 + versions/b-/boost-bimap.json | 5 + versions/b-/boost-bind.json | 5 + versions/b-/boost-build.json | 5 + versions/b-/boost-callable-traits.json | 5 + versions/b-/boost-chrono.json | 5 + versions/b-/boost-circular-buffer.json | 5 + versions/b-/boost-compatibility.json | 5 + versions/b-/boost-compute.json | 5 + versions/b-/boost-concept-check.json | 5 + versions/b-/boost-config.json | 5 + versions/b-/boost-container-hash.json | 5 + versions/b-/boost-container.json | 5 + versions/b-/boost-context.json | 5 + versions/b-/boost-contract.json | 5 + versions/b-/boost-conversion.json | 5 + versions/b-/boost-convert.json | 5 + versions/b-/boost-core.json | 5 + versions/b-/boost-coroutine.json | 5 + versions/b-/boost-coroutine2.json | 5 + versions/b-/boost-crc.json | 5 + versions/b-/boost-date-time.json | 5 + versions/b-/boost-describe.json | 5 + versions/b-/boost-detail.json | 5 + versions/b-/boost-dll.json | 5 + versions/b-/boost-dynamic-bitset.json | 5 + versions/b-/boost-endian.json | 5 + versions/b-/boost-exception.json | 5 + versions/b-/boost-fiber.json | 5 + versions/b-/boost-filesystem.json | 5 + versions/b-/boost-flyweight.json | 5 + versions/b-/boost-foreach.json | 5 + versions/b-/boost-format.json | 5 + versions/b-/boost-function-types.json | 5 + versions/b-/boost-function.json | 5 + versions/b-/boost-functional.json | 5 + versions/b-/boost-fusion.json | 5 + versions/b-/boost-geometry.json | 5 + versions/b-/boost-gil.json | 5 + versions/b-/boost-graph-parallel.json | 5 + versions/b-/boost-graph.json | 5 + versions/b-/boost-hana.json | 5 + versions/b-/boost-heap.json | 5 + versions/b-/boost-histogram.json | 5 + versions/b-/boost-hof.json | 5 + versions/b-/boost-icl.json | 5 + versions/b-/boost-integer.json | 5 + versions/b-/boost-interprocess.json | 5 + versions/b-/boost-interval.json | 5 + versions/b-/boost-intrusive.json | 5 + versions/b-/boost-io.json | 5 + versions/b-/boost-iostreams.json | 5 + versions/b-/boost-iterator.json | 5 + versions/b-/boost-json.json | 5 + versions/b-/boost-lambda.json | 5 + versions/b-/boost-lambda2.json | 5 + versions/b-/boost-leaf.json | 5 + versions/b-/boost-lexical-cast.json | 5 + versions/b-/boost-local-function.json | 5 + versions/b-/boost-locale.json | 5 + versions/b-/boost-lockfree.json | 5 + versions/b-/boost-log.json | 5 + versions/b-/boost-logic.json | 5 + versions/b-/boost-math.json | 5 + versions/b-/boost-metaparse.json | 5 + versions/b-/boost-modular-build-helper.json | 5 + versions/b-/boost-move.json | 5 + versions/b-/boost-mp11.json | 5 + versions/b-/boost-mpi.json | 5 + versions/b-/boost-mpl.json | 5 + versions/b-/boost-msm.json | 5 + versions/b-/boost-multi-array.json | 5 + versions/b-/boost-multi-index.json | 5 + versions/b-/boost-multiprecision.json | 5 + versions/b-/boost-nowide.json | 5 + versions/b-/boost-numeric-conversion.json | 5 + versions/b-/boost-odeint.json | 5 + versions/b-/boost-optional.json | 5 + versions/b-/boost-outcome.json | 5 + versions/b-/boost-parameter-python.json | 5 + versions/b-/boost-parameter.json | 5 + versions/b-/boost-pfr.json | 5 + versions/b-/boost-phoenix.json | 5 + versions/b-/boost-poly-collection.json | 5 + versions/b-/boost-polygon.json | 5 + versions/b-/boost-pool.json | 5 + versions/b-/boost-predef.json | 5 + versions/b-/boost-preprocessor.json | 5 + versions/b-/boost-process.json | 5 + versions/b-/boost-program-options.json | 5 + versions/b-/boost-property-map-parallel.json | 5 + versions/b-/boost-property-map.json | 5 + versions/b-/boost-property-tree.json | 5 + versions/b-/boost-proto.json | 5 + versions/b-/boost-ptr-container.json | 5 + versions/b-/boost-python.json | 5 + versions/b-/boost-qvm.json | 5 + versions/b-/boost-random.json | 5 + versions/b-/boost-range.json | 5 + versions/b-/boost-ratio.json | 5 + versions/b-/boost-rational.json | 5 + versions/b-/boost-regex.json | 5 + versions/b-/boost-safe-numerics.json | 5 + versions/b-/boost-scope-exit.json | 5 + versions/b-/boost-serialization.json | 5 + versions/b-/boost-signals2.json | 5 + versions/b-/boost-smart-ptr.json | 5 + versions/b-/boost-sort.json | 5 + versions/b-/boost-spirit.json | 5 + versions/b-/boost-stacktrace.json | 5 + versions/b-/boost-statechart.json | 5 + versions/b-/boost-static-assert.json | 5 + versions/b-/boost-static-string.json | 5 + versions/b-/boost-stl-interfaces.json | 5 + versions/b-/boost-system.json | 5 + versions/b-/boost-test.json | 5 + versions/b-/boost-thread.json | 5 + versions/b-/boost-throw-exception.json | 5 + versions/b-/boost-timer.json | 5 + versions/b-/boost-tokenizer.json | 5 + versions/b-/boost-tti.json | 5 + versions/b-/boost-tuple.json | 5 + versions/b-/boost-type-erasure.json | 5 + versions/b-/boost-type-index.json | 5 + versions/b-/boost-type-traits.json | 5 + versions/b-/boost-typeof.json | 5 + versions/b-/boost-ublas.json | 5 + versions/b-/boost-uninstall.json | 5 + versions/b-/boost-units.json | 5 + versions/b-/boost-unordered.json | 5 + versions/b-/boost-utility.json | 5 + versions/b-/boost-uuid.json | 5 + versions/b-/boost-variant.json | 5 + versions/b-/boost-variant2.json | 5 + versions/b-/boost-vcpkg-helpers.json | 5 + versions/b-/boost-vmd.json | 5 + versions/b-/boost-wave.json | 5 + versions/b-/boost-winapi.json | 5 + versions/b-/boost-xpressive.json | 5 + versions/b-/boost-yap.json | 5 + versions/b-/boost.json | 5 + versions/baseline.json | 310 +++++++++--------- versions/f-/fbthrift.json | 5 + 467 files changed, 1665 insertions(+), 901 deletions(-) delete mode 100644 ports/boost-atomic/0001-fix-compilation-for-uwp.patch delete mode 100644 ports/boost-fiber/fix-build-numa.patch create mode 100644 ports/boost-json/0001-json-array-erase-relocate.patch delete mode 100644 ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch delete mode 100644 ports/boost-process/fix_include.patch create mode 100644 ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch create mode 100644 scripts/boost/post-source-stubs/wave.cmake diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index 157442c128c4a9..8a666948b43c80 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/accumulators - REF boost-1.78.0 - SHA512 b72d1d2eac58261487ec9c87a2bb6fdd0eed229c39fef62fa83b188f423e9ad96bfd6e5d177b01dec2e541d2e94ca9e548f823a05af24338d97ad98f8d85ef9c + REF boost-1.79.0 + SHA512 4f3531ac9a008a22cb252c7fd81fcfc10d93e9b643bdcdfe19bdc80a34cb2823eecbb09f83425485f3b31ba34c36910d2993b33acef8c5deb63a6572cbf124ee HEAD_REF master ) diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json index dca627d17a68c7..f3eb83b523cc70 100644 --- a/ports/boost-accumulators/vcpkg.json +++ b/ports/boost-accumulators/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-accumulators", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost accumulators module", "homepage": "https://github.com/boostorg/accumulators", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 32a88d3bab4215..735cd44755dc64 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/algorithm - REF boost-1.78.0 - SHA512 1536de626708ecef49d5d059258c5f00ea5d56a5ad8526bdb867494f7749ea7af25c10d90f642cd9d25a931dde87b2ab9eea1c2a20a2531ecd9d6b7e73ad4a4a + REF boost-1.79.0 + SHA512 457f894e538182990c066fed06ce4ae1749e742eb31677bb00a60faab0072a3fddfbc993c467695ef52b7e0d72f13ee2bc5bf5d10176c091c68a59676426624b HEAD_REF master ) diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json index 94af0f62625613..4c645ab218172a 100644 --- a/ports/boost-algorithm/vcpkg.json +++ b/ports/boost-algorithm/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-algorithm", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost algorithm module", "homepage": "https://github.com/boostorg/algorithm", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index eeed844f33c65c..0fc01d0e38d705 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/align - REF boost-1.78.0 - SHA512 2d7efe0a2a87942fe4e6b8e18871631c514d271f690a272e5b30e775eed60c389a2d2e7b1c6fdc7575d5ccea2d2a71a96169af60a0548d182ba9b90e5015a7b7 + REF boost-1.79.0 + SHA512 9249c21cea651ea193b93d816de63e79d9cc014f6fb5d8087c96a0c193d98381db8b0e78e757d294ff078160f41d80c56f87cb03f84aa1bad942bd173086c41b HEAD_REF master ) diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json index 8bd47b5e73a779..f840bc0af7ddd2 100644 --- a/ports/boost-align/vcpkg.json +++ b/ports/boost-align/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-align", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost align module", "homepage": "https://github.com/boostorg/align", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index f5c102e966f837..c51c3be87e5cba 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/any - REF boost-1.78.0 - SHA512 fd9670fc4d7086fc28131c8d02b5dcd0d4bbcfdf54720df1859c50079d77d19d6c08a70421b1c0ec7c13f3b31b8606eaa8f8db847fd359cf03e24f913b0e660c + REF boost-1.79.0 + SHA512 7085eacd189e8a1339e04c878cc20c2f45529d72048d992b0f9e8e35b7c002368f27ac54e495abcca0ecb998606db1a858df5ecb80b10301512da613b366876c HEAD_REF master ) diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json index ee3b5952a86e93..1e3b7b55cec7c9 100644 --- a/ports/boost-any/vcpkg.json +++ b/ports/boost-any/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-any", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost any module", "homepage": "https://github.com/boostorg/any", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index eaf03c0bb75e15..de8a95dfc98d4b 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/array - REF boost-1.78.0 - SHA512 1d07d224f3e0fd4a2d5beb4704d102a64e4f4f95bd6fb218c5b63b28acba8e5b3cac140505df94dab9082a0eae70e11821d827b2c586e6203562262dd9b8a1f2 + REF boost-1.79.0 + SHA512 924a5b99721bda3e3ee4912858b02a44e6b94671718e1657340715d9929b5cdfb0fa394bab8f49b8c2bf553c285bc91c4e083c816352878a2ea6c08e79a28e9b HEAD_REF master ) diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json index e678bdd00a29af..4c95cd9a272990 100644 --- a/ports/boost-array/vcpkg.json +++ b/ports/boost-array/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-array", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost array module", "homepage": "https://github.com/boostorg/array", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index b5da68b829af67..850ead9d50117f 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/asio - REF boost-1.78.0 - SHA512 78c58a64d669eaeabb5ba003200c581065412d33912e641143186ee95c11e0fb0411ed8dbb9a9acced8c8ecd258e0de33872b2e22dfc4a572315cd9a665db8a6 + REF boost-1.79.0 + SHA512 f4e84e4616ad9cc4fae1077e5d3de1ca4e93cf25c83b1fc4bf0130727b41cb3888516e212c89745831c33a9282cf6697742b716bc340c76939cd6335f035716f HEAD_REF master PATCHES windows_alloca_header.patch ) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index c0c49aa903d523..36be45fba3d155 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-asio", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", + "license": "BSL-1.0", "dependencies": [ "boost-align", "boost-array", diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index 9509e3e80965ab..c7f7ad244bb711 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assert - REF boost-1.78.0 - SHA512 8ad826aa3c3865d77d4155c4c2b318b2f6204e0861f9fb3699efa9e8c22752d6f419bba92ec0a035f3e2583aa7236d4c2ad83fdcf0cd625cc20d40690669bd2c + REF boost-1.79.0 + SHA512 fc7f97ca1d58fc5e7ef8ebe45239cdbec6b239afe7cb137aed629051a59c356d9bd82c2a9e0e6ce4c0e9b779cac8c68f1969910ca4b936ce15770083182e34d8 HEAD_REF master ) diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json index d486490dd7cbd3..0ea351ed3f62c7 100644 --- a/ports/boost-assert/vcpkg.json +++ b/ports/boost-assert/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-assert", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost assert module", "homepage": "https://github.com/boostorg/assert", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-vcpkg-helpers" diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index ac380be7841b3b..48b30c19b221a1 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assign - REF boost-1.78.0 - SHA512 72cb3460624d3f4fa12859edc1086ed966ffb83be94dc22c257e088ba10c9686129baa410d7b524237794dd29c983d92c25f65fad6c7c84288275a4ca77b95e8 + REF boost-1.79.0 + SHA512 0db0b6f4a93f8bd6d86a4db6390b7edc7717a490323121418c120e2d2b20322b73a6c7d9b18a4d7df357c7d36e111b548e78c72d32888089b460956476b8360b HEAD_REF master ) diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json index 50824920f4e43e..70e6dfe5f968f2 100644 --- a/ports/boost-assign/vcpkg.json +++ b/ports/boost-assign/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-assign", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost assign module", "homepage": "https://github.com/boostorg/assign", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-config", diff --git a/ports/boost-atomic/0001-fix-compilation-for-uwp.patch b/ports/boost-atomic/0001-fix-compilation-for-uwp.patch deleted file mode 100644 index d4ad812af3f40f..00000000000000 --- a/ports/boost-atomic/0001-fix-compilation-for-uwp.patch +++ /dev/null @@ -1,81 +0,0 @@ -From bf08155d16ea8c359d1bfab6bac684cdfada4a5b Mon Sep 17 00:00:00 2001 -From: Andrey Semashev -Date: Wed, 15 Dec 2021 02:06:11 +0300 -Subject: [PATCH] Fix compilation for UWP. - -UWP does not support APIs related to dynamic symbol binding and dlls. -Disable runtime detection of WaitOnAddress & co. for that target. These -APIs should be enabled at compile time on Windows 8. - -Fixes https://github.com/boostorg/atomic/issues/54. ---- - doc/changelog.qbk | 4 ++++ - src/wait_on_address.cpp | 16 ++++++++++++++++ - 2 files changed, 20 insertions(+) - -diff --git a/doc/changelog.qbk b/doc/changelog.qbk -index 9c370c9..ffbd902 100644 ---- a/doc/changelog.qbk -+++ b/doc/changelog.qbk -@@ -7,6 +7,10 @@ - - [section:changelog Changelog] - -+[heading Boost 1.79] -+ -+* Fixed compilation for Universal Windows Platform (UWP). ([github_issue 54]) -+ - [heading Boost 1.78] - - * Use process-local futex operations on Android for non-IPC waiting and notifying operations. -diff --git a/src/wait_on_address.cpp b/src/wait_on_address.cpp -index 7cf5bd0..6f8a165 100644 ---- a/src/wait_on_address.cpp -+++ b/src/wait_on_address.cpp -@@ -25,6 +25,8 @@ - #include - #include - -+#if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM -+ - #include - #include - #include -@@ -33,6 +35,8 @@ - - #include - -+#endif // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM -+ - #include - - namespace boost { -@@ -43,6 +47,8 @@ BOOST_ATOMIC_DECL wait_on_address_t* wait_on_address = NULL; - BOOST_ATOMIC_DECL wake_by_address_t* wake_by_address_single = NULL; - BOOST_ATOMIC_DECL wake_by_address_t* wake_by_address_all = NULL; - -+#if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM -+ - BOOST_ATOMIC_DECL once_flag wait_functions_once_flag = { 2u }; - - BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT -@@ -90,6 +96,16 @@ BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT - } - } - -+#else // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM -+ -+BOOST_ATOMIC_DECL once_flag wait_functions_once_flag = { 0u }; -+ -+BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT -+{ -+} -+ -+#endif // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM -+ - } // namespace detail - } // namespace atomics - } // namespace boost --- -2.34.1.windows.1 - diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index a04914fb5befc5..d365cd29715c92 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -3,22 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.78.0 - SHA512 a6eba43c7038228fa7ce537b05429e263397bc914235d9ad9aa47badce5455f4905e15e5f1979c19088b47faca3091bd0dfcdb017290f796d34a36b682592345 + REF boost-1.79.0 + SHA512 0ac0c72b3455440ad93b3659ce3796916cf718ce4161d9391a397c8f687d2f73efe2a68bb134b178f4d004de769fc75ff75717802ca6c56968c28f46c50ce1eb HEAD_REF master - PATCHES 0001-fix-compilation-for-uwp.patch ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" - _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-atomic requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index 45840b8c9541f1..02b16d207563f3 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-atomic", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", + "license": "BSL-1.0", "dependencies": [ "boost-align", "boost-assert", diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index 186e878b1c658a..68308327ea1759 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/beast - REF boost-1.78.0 - SHA512 6b8c46d50833265642093d612c6a1c29e764e9fbee65e8514c377390ee69469a8a170ab5829de2d0f28641d5b15d11d7f174367d3c68eb0f36dbdd2b3bd08392 + REF boost-1.79.0 + SHA512 d3f17b37fd503d9e65f0490832302d14318898a6b598864143fbd5310f69ade026499efe6947c66fd7309770ec63bb0dad1688cf3f750910426a058d53127e10 HEAD_REF master ) diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json index 5ea44a9744b2eb..bc2c62664dd5d9 100644 --- a/ports/boost-beast/vcpkg.json +++ b/ports/boost-beast/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-beast", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost beast module", "homepage": "https://github.com/boostorg/beast", + "license": "BSL-1.0", "supports": "!emscripten", "dependencies": [ "boost-asio", diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 23ab830ecd33c6..6ce6c2ec589a17 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bimap - REF boost-1.78.0 - SHA512 ab681674da7c1d5cf14f93f9832d5f0010661b42dc0fff2299dd7dced026fd0a474633363d070260a57bad0b3e956431c02ab5116e7d990d04bf37cf2f274c8a + REF boost-1.79.0 + SHA512 85e6c549433027a43f99e18d422be70055aa59e9548785c9ab1d166e49c21702b1d939070187c58b296ea20635a6ef6fa4d1040c9746eba96790f26200de7201 HEAD_REF master ) diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json index ff6b9d7c060be7..67fe38b38af6ee 100644 --- a/ports/boost-bimap/vcpkg.json +++ b/ports/boost-bimap/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-bimap", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost bimap module", "homepage": "https://github.com/boostorg/bimap", + "license": "BSL-1.0", "dependencies": [ "boost-concept-check", "boost-config", diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index b23a81f8057c6f..0df740c4a641af 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bind - REF boost-1.78.0 - SHA512 8fc9484da8aeacd8a9fb60ad3dc061de278ae854d9abb6e513f330e38452d3af8cfa9342f185a15c7fff907b0dec02b7e54fbb8661633639aa34d9e9cd7ae7e2 + REF boost-1.79.0 + SHA512 30ebcb26d0a719df2bfd23e25e86c15e8080219f6398c71c1d6cf230f1a10cccb0aee4d84e2bc116039c6597620ddae9bc5d7a40f0f5802644eff074e0c8e7af HEAD_REF master ) diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json index fb4e45d7bbd4ec..55fd5cd5115f81 100644 --- a/ports/boost-bind/vcpkg.json +++ b/ports/boost-bind/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-bind", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost bind module", "homepage": "https://github.com/boostorg/bind", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index ec913ceaf73ed0..ad45054ade14a1 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -4,13 +4,13 @@ if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME return() endif() -set(BOOST_VERSION 1.78.0) +set(BOOST_VERSION 1.79.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build REF boost-${BOOST_VERSION} - SHA512 867966e3d254c0e996786587fb64ad1bda6f96546e5302c15231b17d66537798770bbd9e89f800d445a1f0a4d3be06dff8aed42dfd3a77b563d0f5d715e79324 + SHA512 638f2883b9c49265d5566eadc8c93d16cb351edeb941110bad8a17871ea7d53df8eb13c80aaefb94f354b71a22454958af1ecb9a441686dbaa9631e33682a9f2 HEAD_REF master PATCHES 0001-don-t-skip-install-targets.patch diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index a425121de423a4..75df22fac6ede7 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,9 +1,9 @@ { "name": "boost-build", - "version": "1.78.0", - "port-version": 1, + "version": "1.79.0", "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", + "license": "BSL-1.0", "dependencies": [ "boost-uninstall" ] diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index 3366f1866dfd9d..264d3edca13ffc 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/callable_traits - REF boost-1.78.0 - SHA512 7bdd11a059bbf81e648e44750d77d1089674f34b167d86bfcfc653d2b6a6841188bccac2e7e9769a76022e052bba5b6d4c0b72bec1f630196a5ea290ffe5ee24 + REF boost-1.79.0 + SHA512 1b937aa3ee79cf2d835a87922748fb891b6ffc5400d29fe6956114c840b90ab1cc4001076c8f7d63801d01c517dbbf0b0698b473041f5665a507e28a2c797c75 HEAD_REF master ) diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json index 5a384b18a0bbaa..aea6f2896ba676 100644 --- a/ports/boost-callable-traits/vcpkg.json +++ b/ports/boost-callable-traits/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-callable-traits", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost callable_traits module", "homepage": "https://github.com/boostorg/callable_traits", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index 67632cdcd15a71..1448db29254720 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/chrono - REF boost-1.78.0 - SHA512 5e4f289508f58fda3cdebe17a65b1e6eb911473b8e7ec382fdf834661e46c7645b4d864abac7a124100feb4e46bbac78cbc2d7101053c0c3538d6b74ff6830e3 + REF boost-1.79.0 + SHA512 b4809a49ca65bd7062a2bcc73dc044e7d47dfe058e31102977d1c394b78f806aa7b448a314aceef86d0939505a32a72cfd8101617be9037f4b591f1f04d8f303 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-chrono requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json index f6e6002cfa3eb8..7ef5d70c141542 100644 --- a/ports/boost-chrono/vcpkg.json +++ b/ports/boost-chrono/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-chrono", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost chrono module", "homepage": "https://github.com/boostorg/chrono", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index 31d0e7d9293d0e..d851cb8f657351 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/circular_buffer - REF boost-1.78.0 - SHA512 07b8cbec9a4f50b06c7da5ca496c86d697d8c78fb36588a9d6b36e9042ca53d2c28a0bb6cd97904a049efe60990b81d45b14693bffc91133dde4ab253deb0ea1 + REF boost-1.79.0 + SHA512 1779cc3a149c1be7686dd44c83efb6f1f4e5141d6d7905ef89cdabbbd3e93d56aaf0da7f81f4c8be0adada997e29b525cc2a41ad787fee6a7b453e7680417d03 HEAD_REF master ) diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json index bd6a20a0da0218..c2e9fa61c6be92 100644 --- a/ports/boost-circular-buffer/vcpkg.json +++ b/ports/boost-circular-buffer/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-circular-buffer", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost circular_buffer module", "homepage": "https://github.com/boostorg/circular_buffer", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-concept-check", diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index 78a4b6151649e5..fa0f6a7fe970df 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compatibility - REF boost-1.78.0 - SHA512 902f006406d376dc5ee68d4c2429ccf7fc5159e23e9b2b8238f5008bab87505bb2ff8c92084f6c7585a24c9874d73933bc6d6b92f36cd6cd0b83da9733a4b0e0 + REF boost-1.79.0 + SHA512 38a1c87c94ae91437b39fc2283b33150368dc7b90ef288da1d3d30969179e56040a3c697d28ba87a0e6a69b3697609b02835ffd29fb940b3f5b9e44b86694da8 HEAD_REF master ) diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json index fd584bd61d23b5..a9f342df1e4295 100644 --- a/ports/boost-compatibility/vcpkg.json +++ b/ports/boost-compatibility/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-compatibility", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost compatibility module", "homepage": "https://github.com/boostorg/compatibility", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index f7ca475fb9019e..2bb58e281a9746 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compute - REF boost-1.78.0 - SHA512 5e9daaaf875e636825ece0c38f16f503f102e42c1acb02539623c4488244e966689d8af850afc4c4d2abd7009f416ddb2e0c76cd43de4e2f7b022355a3409a36 + REF boost-1.79.0 + SHA512 de8a38259c65e4ab0945dbad42ee507ac46974660beb2dce92212f5fd64fb963f7fa8eb9db907e435b72c430dff15405d7f04c3d4d8687c969608e88774e35e8 HEAD_REF master ) diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json index a5cfddc6c6119c..620dd5bd0a13c1 100644 --- a/ports/boost-compute/vcpkg.json +++ b/ports/boost-compute/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-compute", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost compute module", "homepage": "https://github.com/boostorg/compute", + "license": "BSL-1.0", "dependencies": [ "boost-algorithm", "boost-array", diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index cdb17c36d7ddfe..e492b8cb74b5de 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/concept_check - REF boost-1.78.0 - SHA512 b9d7caba37731ce3aeaa32016f7055f91e15843a8a6022e6863fd9ad86af4b0b8c0b7f3828d7601906deb5c84597546f155d5ad600c4b764c6a54e1fa2f6a869 + REF boost-1.79.0 + SHA512 dd8a43492d1eae6f3e2c5b1f6e011f04605817dec7e1358c18704a1e0432390f4304093670dc1892ec1080e438a33b17f80cae9c10b4fc99eb640a67b44d4004 HEAD_REF master ) diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index 685451d6303b22..053d3a21039038 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-concept-check", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-preprocessor", diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 204d3b3dd95d5f..bd6ad84aecd327 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/config - REF boost-1.78.0 - SHA512 116820d81ff268e8231bfdd9160cf803bbf6f9987ab2261630bc7c21b283db9e7ef3b9576c4d3444a52ce2533fde653ff75f98f6c1cd5e78d5936df674f6f8ee + REF boost-1.79.0 + SHA512 e8d4f44d08865f83599b7580612055ab76b482c7ce6196d4e44c39480a39293685f1b4c683987c6eebe992141deb9c6be1f69ade4c68cbd30f7f97aa92134ebb HEAD_REF master ) diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index 2b650f63a1aa69..dc7268f2d6dda1 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-config", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost config module", "homepage": "https://github.com/boostorg/config", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index 7b009e656cd030..28c84d479b8409 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container_hash - REF boost-1.78.0 - SHA512 344ed155031904336c48c61b66a23b420cb63e5601ea1f5eb614dcac576aff8900b3cd79889b5313f2f7558ece81efc3a1944c07d0374a00a3766eb4b1dda3e0 + REF boost-1.79.0 + SHA512 97623e7b71944c0c3472aa96322a60e53a4231482938c3170d4493e090d999f6431f4e2f2ba7405fc37f2267869bf5265f674723a8d642e838a0f63ec0ff28d4 HEAD_REF master ) diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json index 8584253804c5a7..7afac8c0005d63 100644 --- a/ports/boost-container-hash/vcpkg.json +++ b/ports/boost-container-hash/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-container-hash", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost container_hash module", "homepage": "https://github.com/boostorg/container_hash", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index 447dedabf89108..57eb5f90ad1886 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container - REF boost-1.78.0 - SHA512 f20ca062d061c24caf262b6524525f4face4e7fc9e924d16b9160f7d7720c4490f131abc08f5ff9a04ea59c04cffef4f1cebf33a1d524aaed8903eb355b55700 + REF boost-1.79.0 + SHA512 934e136095d80ce1c862fa699b070908dffd9f278cdeeed3da6a0469f36fad7820ffd3cd9407bad8e8fd4606057c408cf31444140d8749db05b18934c3dd35fb HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-container requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json index 0e6166c1b50b55..2102cd57dc7fc1 100644 --- a/ports/boost-container/vcpkg.json +++ b/ports/boost-container/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-container", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost container module", "homepage": "https://github.com/boostorg/container", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index 26e5bf522fb0f3..97412ce79a1d20 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -3,18 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/context - REF boost-1.78.0 - SHA512 ea2695df5301853209ed0db70cff632e27066dbd2dcfb3946022633427a45ad07f104eee7ac554038a45f4bf89fb8b39ee4d07f873aebb4571ed392d1e343879 + REF boost-1.79.0 + SHA512 25fc307a3ffa9b2b87199e0d7faf87ccd899c619d5043d3780e65476a0356a3edb0fcd55400bd2898f12de149952edf2fde58c79b62d993b534b81561bd174ea HEAD_REF master ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-context requires a newer version of vcpkg in order to build.") -endif() +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) configure_file( "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in" diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index 15d0080bfd495e..c77e45fe044404 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-context", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost context module", "homepage": "https://github.com/boostorg/context", + "license": "BSL-1.0", "supports": "!uwp & !emscripten", "dependencies": [ "boost-assert", diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index f3053c69b39344..2561d51b32c833 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/contract - REF boost-1.78.0 - SHA512 c746ff575a33ef21245c927249142a017bb3616b4790d30bca0473ed70c626427be67d647f49693357440f6f9a540c6152df445de922bf4e6b55756197e5fbde + REF boost-1.79.0 + SHA512 511df371ee4c1bc9e443a4df1c1156138187f94b549df0944cc46613bf3ce07e7002d3003a41385b7e0f43326590ae4d932a15fdf0cc4d883b4be05ce79c3a94 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-contract requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json index 68ea09dc957502..370c506bf71e7d 100644 --- a/ports/boost-contract/vcpkg.json +++ b/ports/boost-contract/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-contract", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost contract module", "homepage": "https://github.com/boostorg/contract", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-assert", diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index a9a1139b5b8520..eca7221e90e923 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/conversion - REF boost-1.78.0 - SHA512 0a3d649eccf90d3a2327139f236498dd11e49e308f30b559e7c91d955685eb859a76bb92d9cec6aa066dd898a35dc1c4cbfa60751db75331261f381bee1cc600 + REF boost-1.79.0 + SHA512 dc2ff45cd1e046039fddb4af2ea2651eabbacb047255e55be395e4d3a71bde719b6dcf5071143800f14b70522f8f9e5dde2acab871e1d0aa36c9be7d1f38ed3b HEAD_REF master ) diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json index c9f65045e4ba31..2e341ca48073fb 100644 --- a/ports/boost-conversion/vcpkg.json +++ b/ports/boost-conversion/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-conversion", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost conversion module", "homepage": "https://github.com/boostorg/conversion", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index 5a58a616852fda..77a6f775fe4ec9 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/convert - REF boost-1.78.0 - SHA512 0a1b91d5b8e750de42ca774b98eb59b0b5287890546548facf049b9157e82bfdd741f8aeafba311dd9a99235da93a4224db0cabbfc4e0f8e7ac9c5c1f6d528bf + REF boost-1.79.0 + SHA512 deb3b28c8c356f4d36c9f5af01f682572c14f10b3466acb34619aa56ee398b687a95a731cd144e870b3c6581540b7ae48a1cfe4b6926a9781470aac6e07da9c4 HEAD_REF master ) diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json index 0e98735229ba57..d0bc0df7628dee 100644 --- a/ports/boost-convert/vcpkg.json +++ b/ports/boost-convert/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-convert", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost convert module", "homepage": "https://github.com/boostorg/convert", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index 1403a0004b7645..d0b92b175f7a6f 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/core - REF boost-1.78.0 - SHA512 df3a14047bf50dd98d21f1251c74685440c306948301f2017525f3ad638664f5b13c353cbfd78cb1f5b35b91eb0f8c5818fcf3939e9ce52c1d00b4a50a22e311 + REF boost-1.79.0 + SHA512 f1fc5f371f52a0b12e72d9a9f11a57f561383195091b7252bc9fda39837504b29481e22750a526b54bd169ec3cc44b3d0d6bbd296027913858eb8c9326b56cdb HEAD_REF master ) diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json index d9eb92039bda7a..fb0b225dab9f2c 100644 --- a/ports/boost-core/vcpkg.json +++ b/ports/boost-core/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-core", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost core module", "homepage": "https://github.com/boostorg/core", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index 96bd3e99247e71..cab75fa11e6d53 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine - REF boost-1.78.0 - SHA512 ebb8319388b2a57143a3fb5a66cc930547a804fd8b04374632c2fbaff8f28a1d9b22ea5862e39c1e653c2062c2137e97d38fa5cb44ce5699b07cc5c7526f311f + REF boost-1.79.0 + SHA512 a969a25627713fd0cf440ee1c60979c10465df95589dc829f8ee480c5a5cfd833ee3ea5f90616d175f06cf1b01750d682886e8d7e64038e159bfc15b184a5de4 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-coroutine requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index 47fa52783e940a..89754e5e50a347 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-coroutine", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", + "license": "BSL-1.0", "supports": "!arm & !uwp & !emscripten", "dependencies": [ "boost-assert", diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index 8fa27a2f95ca84..e795fd594b6a36 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine2 - REF boost-1.78.0 - SHA512 e25ac3a97fe4ffd12449b324d311c4e8bb1f64db6166b460c087b09bffdcfa0746bf7731e08258b936639d319944b7f6d193ec92231d7f5d8cbee2f64d0f23e7 + REF boost-1.79.0 + SHA512 a93c43fea67d2963e90d9e84e7a6b2832d1f6a9810385092198300af35f1d27b4a33367eff256c7bd32beed0041d84ada62a12aeda45f5f7641fc801b94f0aeb HEAD_REF master ) diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json index 5707c0f8c1de0b..44a94ff00c9663 100644 --- a/ports/boost-coroutine2/vcpkg.json +++ b/ports/boost-coroutine2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-coroutine2", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost coroutine2 module", "homepage": "https://github.com/boostorg/coroutine2", + "license": "BSL-1.0", "supports": "!emscripten", "dependencies": [ "boost-assert", diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 6904b3539fd899..1c9c39f433cbd2 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/crc - REF boost-1.78.0 - SHA512 e913075402e98eb4a8e216bce3307d5339c924206640a1f389dfaeeca0336be29714852d1c8a40ab9a7c4f40efd37d433cc7c717324911d48ee4b845c1ebdf83 + REF boost-1.79.0 + SHA512 31d3b5f0f7e7beee47b4bee9531a598b7fe27681ea6719e68f6dfae4047aff0c453f5cd8668de2e0441cf8d04ae38a83f530ef56dc2e7262a975e567cdc0439d HEAD_REF master ) diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json index f7fd45e507fdb3..0803357c17b5ad 100644 --- a/ports/boost-crc/vcpkg.json +++ b/ports/boost-crc/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-crc", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost crc module", "homepage": "https://github.com/boostorg/crc", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-config", diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 7285a90ba91dfc..195b3ff12fc025 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/date_time - REF boost-1.78.0 - SHA512 a4fda022d4658fa4db22114cc696acbc369505eda9fab722bbc7d5149af22f8c5c4e0e12f86b1ae07223cef82d791c278c656a7f492a0f89200921964c7057fd + REF boost-1.79.0 + SHA512 e24b9c1c2564395b673b32a8b2308f21846cdf74476a8391ff54af12bccea3a3522b035567318cea03393ad6729a7910210008780c450c126433a4117874a10d HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-date-time requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json index 2a371659153f2c..a878773ff5f64c 100644 --- a/ports/boost-date-time/vcpkg.json +++ b/ports/boost-date-time/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-date-time", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost date_time module", "homepage": "https://github.com/boostorg/date_time", + "license": "BSL-1.0", "dependencies": [ "boost-algorithm", "boost-assert", diff --git a/ports/boost-describe/portfile.cmake b/ports/boost-describe/portfile.cmake index ee73f521284f67..2fedfe00cc7168 100644 --- a/ports/boost-describe/portfile.cmake +++ b/ports/boost-describe/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/describe - REF boost-1.78.0 - SHA512 2a3601bdd98dc3248402baca147000cece14458f9478af1726c919037190f1affae0e82f26124d17531da9e0dc8180998646babe7dc14756aa36cc5d51fde1cd + REF boost-1.79.0 + SHA512 0a8ca55ac3c6b3a80c003d2817b16c1b2fd4730554cd392673efeb675a3ea54907abd4a54447fc3f83068ead9acf462af38fa9f3dbc6cce9644237892f5cc03e HEAD_REF master ) diff --git a/ports/boost-describe/vcpkg.json b/ports/boost-describe/vcpkg.json index 284565557a7618..db52e9ea958d66 100644 --- a/ports/boost-describe/vcpkg.json +++ b/ports/boost-describe/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-describe", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost describe module", "homepage": "https://github.com/boostorg/describe", + "license": "BSL-1.0", "dependencies": [ "boost-mp11", "boost-vcpkg-helpers" diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index 72829444a9f1b7..f603c550707fae 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/detail - REF boost-1.78.0 - SHA512 7d3206d42a2af1692807845077abf2dd9330d0628a7a2dbd221f73b405bada294c5f380e3765a16df647bd4ffe4bacc5fda4a40f7c5b6c8f7dc77f20152e778f + REF boost-1.79.0 + SHA512 ca51c9127db37971b8ad32276d0aa666544a1382dc60298972a3075b81846b89257850cfd4ce7f9409bfb92c088c7df96618633a3b00f578dce86728074965b7 HEAD_REF master ) diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json index 125895bc65e8a0..5807a65411962e 100644 --- a/ports/boost-detail/vcpkg.json +++ b/ports/boost-detail/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-detail", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost detail module", "homepage": "https://github.com/boostorg/detail", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index 58964d27654ec4..c85b3452b3f86e 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dll - REF boost-1.78.0 - SHA512 bc7869b43cc2aaf69a168c8fab02d3f0eb9283ab47dd8f6d3fc15cd7f82d561f092fa77564cc70f43d14af9220f7a59addfb3c9e40744e3223aa8be6f3c5bb57 + REF boost-1.79.0 + SHA512 cf77949934d835d9100cdf4e09b225085b94a73e4a2652aa939aa99a90cacce32fc90124a062d64677976a7c9573373ee97d274d1bda701127a7aa77fc010e2e HEAD_REF master ) diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json index abb260d6e0f308..02a91abd862764 100644 --- a/ports/boost-dll/vcpkg.json +++ b/ports/boost-dll/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-dll", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost dll module", "homepage": "https://github.com/boostorg/dll", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 66a24c146c9567..08d1b037c8ebb0 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dynamic_bitset - REF boost-1.78.0 - SHA512 cb3b6542f16d97126eac963a48ace71b795bcc32148c2a8608694045afd833520c104c5ac7ad98ba8196bfa182040e4edd4c54d9af88b257aee0e390251c74a7 + REF boost-1.79.0 + SHA512 c9aa196ddf479e2c6d3f92abcf1cd2fb5e459af8f47fac2dae7dd4355bb16ffba7ddcfd5750681cb0a5ba76503f2824bf5c0bbb7f3f8dc8320ba977df3baacab HEAD_REF master ) diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json index 1ab3c838d2f680..daecb6557adcd8 100644 --- a/ports/boost-dynamic-bitset/vcpkg.json +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-dynamic-bitset", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost dynamic_bitset module", "homepage": "https://github.com/boostorg/dynamic_bitset", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index 9f370038ebed66..4900f75c71671f 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/endian - REF boost-1.78.0 - SHA512 f010f4c1d301637fc8fbd9220eb7456cd9f0ce04cfc56af2c25092a7a53a4f7e541cfc65bab46e65fe6007184d335b99b03ec0d26ab7935ffd5d622c99caf817 + REF boost-1.79.0 + SHA512 b2fa5408e863a250d749c7a86bf755d1e77243d410b11fa5d67c4361014d641feb6510c2e36393dcb3ebe4a2b81dde7858b976af4c46094e0e25bae904705207 HEAD_REF master ) diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json index 84f7432ac68f78..eb070039005594 100644 --- a/ports/boost-endian/vcpkg.json +++ b/ports/boost-endian/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-endian", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost endian module", "homepage": "https://github.com/boostorg/endian", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index e96f086ccdab37..107f7a23c56e9d 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/exception - REF boost-1.78.0 - SHA512 b1e70fd27fb918cd3e6bd77307de96ccade192bbde8ddb2f27301d7b242e1d8acb1dc7590c361fb4036b0abe303b222d2b2d28263036de540044461850d31804 + REF boost-1.79.0 + SHA512 a43b5b296f5af17ca447dd8ca5d89abbddf37969fef858f2d5966f57b336f5620b7e77ac5c99fe796d4440d66ecd376564c00b7936a5393a67045cbf148d520e HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-exception requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json index 6e0ec47c301d18..f6009b54ab8bf9 100644 --- a/ports/boost-exception/vcpkg.json +++ b/ports/boost-exception/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-exception", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost exception module", "homepage": "https://github.com/boostorg/exception", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/ports/boost-fiber/fix-build-numa.patch b/ports/boost-fiber/fix-build-numa.patch deleted file mode 100644 index d1b93f2409b435..00000000000000 --- a/ports/boost-fiber/fix-build-numa.patch +++ /dev/null @@ -1,15 +0,0 @@ - build/Jamfile.v2 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 -index 3efdb96..8a6b6dd 100644 ---- a/build/Jamfile.v2 -+++ b/build/Jamfile.v2 -@@ -130,6 +130,7 @@ lib boost_fiber_numa - numa/algo/work_stealing.cpp - : - @numa -+ boost_fiber - [ requires cxx11_auto_declarations - cxx11_constexpr - cxx11_defaulted_functions diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index 08851ff7290eb0..de6e376e6b0266 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -3,19 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.78.0 - SHA512 271454964e12c0006ed9ef52911cf76d004141da54d5f96e63d106a216841d9a939d3dcd802fc9e860ac6a21d0b7fab9f385e8647ebbd2fd669e48fc9b6a80c9 + REF boost-1.79.0 + SHA512 c264fe03b9cf08973acadeef3e00ea8b76610420b0b1a256a137a963f79f3b9114f07ceca6b604c4ea86e4088c954d3780f90bc13167d35f1ff38be237a216fb HEAD_REF master - PATCHES fix-build-numa.patch ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-fiber requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index a7145abf7057b1..1dd1d73fa9c0c6 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-fiber", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", + "license": "BSL-1.0", "supports": "!osx & !uwp & !arm & !emscripten", "dependencies": [ "boost-algorithm", diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index 0d5b3bfccc19f6..68bad85a2c94a2 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/filesystem - REF boost-1.78.0 - SHA512 5a17a3084db574325394e56dc5fb740dfe6d0aa53026040ce98e6248a62501cf7b8f37721d7f6d6d0366ab5bdcbc52be9084ebf3147c91c6208fd9a67bfbac1c + REF boost-1.79.0 + SHA512 6f3ff9f3006110622642ec27c7913157bacdc3d5d1f19044d67bafb9be2f26e9feea26e91e6556f9806999524ae59d59527ccfd1d52b4bea7c9363ecbff4454d HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-filesystem requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json index 57abd3b2cc884f..8c9bc68646647f 100644 --- a/ports/boost-filesystem/vcpkg.json +++ b/ports/boost-filesystem/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-filesystem", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost filesystem module", "homepage": "https://github.com/boostorg/filesystem", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-assert", @@ -24,6 +25,7 @@ "boost-predef", "boost-smart-ptr", "boost-system", + "boost-throw-exception", "boost-type-traits", "boost-vcpkg-helpers", "boost-winapi", diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index eec3b10798ba3e..e1dcc33a368126 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/flyweight - REF boost-1.78.0 - SHA512 192a9985ab4026284d703993e71db88feccc045bc3039763daa87078cd5881e0fee9e65024f264813d508d4cf53b41661befef50dbec911d4ad5063eb11da144 + REF boost-1.79.0 + SHA512 cd0b8d481989602a2deea71332434da4ef358e0a0ca81cdd7adedd01b70cba189aa93e3e7a92ea6dcb9614247ed063f18e099712fc7a42044da2461160435496 HEAD_REF master ) diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json index 2b348bff57307d..e7ff5774999965 100644 --- a/ports/boost-flyweight/vcpkg.json +++ b/ports/boost-flyweight/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-flyweight", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index 3338bf2c2928c0..86e818cd9ef97c 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/foreach - REF boost-1.78.0 - SHA512 dfc27c7f6353270e910a26511abef83d1f89cfbeeb6fe6da3cd51d1d6f832369734449b0c56e0476631216688d005047e5724a13df03cd3eeaba2b30b4c926d2 + REF boost-1.79.0 + SHA512 3f003e96806543cebe888014e870d0e0030ad8fd3762332e548f6d9c146a45996a8bb1b29d2c91b5f3a39e7731a9c6c8447f95631e5e6dc12293e07f5bda55e2 HEAD_REF master ) diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json index 4b9f839305246b..559acef07225d7 100644 --- a/ports/boost-foreach/vcpkg.json +++ b/ports/boost-foreach/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-foreach", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index 95ff3d4955f56a..c93a1427f994dc 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/format - REF boost-1.78.0 - SHA512 5d104eaff0d91984c5ac712af1e53f0d73215dad4252b065dec119bbad5dde72a35bf23f56dc2f765902045ca94d5472c1ab15241ef631fdf784cd950a98e86f + REF boost-1.79.0 + SHA512 46ef8394324925a427f5ba574c897d0b3d27389aed0a6085f4b8dc600c6a720f9f3f1ced3a368c5438f42ac8d204da833df228187e4a6fe7129be755cd16ae90 HEAD_REF master ) diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json index 92004164869b17..53e9743a10fcb5 100644 --- a/ports/boost-format/vcpkg.json +++ b/ports/boost-format/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-format", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost format module", "homepage": "https://github.com/boostorg/format", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index d4fd306c40ceeb..9daab85d8599dd 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function_types - REF boost-1.78.0 - SHA512 9cd5a8c91e3fa32e3d5aed48da82c5b22c4a3309eecb18adf07e716393e58bd61ae273a5077222ad4c036561b317591934c876392effeb47b231554a20ff291b + REF boost-1.79.0 + SHA512 95fbe35406c1276a8170b7f83dcdc7285ee04ee2e14329544cbb2ccb3a8a24d05ca7cd2b762f88223505f4c4b379a523068492e625c58bb8eb961a6333966019 HEAD_REF master ) diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json index 37bf9d59c5e4b4..3b9e49da2e1382 100644 --- a/ports/boost-function-types/vcpkg.json +++ b/ports/boost-function-types/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-function-types", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index 922f9dcd6ec9a6..3ae65a5b5a7f9e 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function - REF boost-1.78.0 - SHA512 b8a1da6c586948f3a7981c8adf0b3bc556da8aff9cae5dbb3bf4a7610e035a1969e89e3039d09105d28bcf73c04fd041b2c972fde9706657ac3996a9062fa96d + REF boost-1.79.0 + SHA512 a1f0e4ff828c286e9eb29a8cb8c203248605b9ddc9e81e0797ff62f1513f7debfe3c48fd158383cb2e963a442959e33de5fa7fb641690649ed402e782b411947 HEAD_REF master ) diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index 13efb0089beb3f..67a1e839552be2 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-function", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost function module", "homepage": "https://github.com/boostorg/function", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index e1b2257ba83db8..f705fafb212507 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/functional - REF boost-1.78.0 - SHA512 d4fea4d4c5af107fb26b025c30dca05e5875e0ee2046f54f86a1acf3ea25864776783fdedc3922cd9fa8124cb10ad68c778dcd82f7575f70e6c14d6ff9b339f8 + REF boost-1.79.0 + SHA512 17ab121ec3e9f2bdd9a3404861f6c2952ffda84bf2731fb3300e736c993cf4d49460d4e35edd6cccc123fe87d5c0b32ac0fa0c71770cfb74d8b3a7f14cbda991 HEAD_REF master ) diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json index 5ffb24d9a11406..99b1ec1c3719fd 100644 --- a/ports/boost-functional/vcpkg.json +++ b/ports/boost-functional/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-functional", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index 9d6d94a2bd2e8e..f845397ede5065 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fusion - REF boost-1.78.0 - SHA512 dd76b330c21943ca05789756705dd62be3c987eb5023cf4ae9330e90a0020065cd7544bb8b7238b9e4c85ce5ed0db2b3f5895aecd222c0db3275b855323f2e7c + REF boost-1.79.0 + SHA512 87347852c8aaed2287c409468b8fddba378698454bfc451c2832e99eb0b9dd3340c9d3c160e5313a72598c0787b4c28032bb4a0326cec505c93601afb0f5b06a HEAD_REF master ) diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json index 90ab4bb8b178ee..67c0c521d10d38 100644 --- a/ports/boost-fusion/vcpkg.json +++ b/ports/boost-fusion/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-fusion", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-container-hash", diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index d8b6b6f4b46b96..b832776bc047dd 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/geometry - REF boost-1.78.0 - SHA512 8b348420555d070412e543190e201b85b1e090911e6e299fd5cf375d1927e63092f95c8b17723d6477f96b7fb9edffaea2b0070a7794c1b2af2b63e62704c40e + REF boost-1.79.0 + SHA512 0f6e92d4dd9fc98598101bc0b581ffd22b7771686824aa37c713fd247cb19a4c60d750842a40da44438376a66ed067846381fba5b4cdc19a7182bf37d2d6fc77 HEAD_REF master ) diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json index deb8974651fa68..7ea8abcbb96277 100644 --- a/ports/boost-geometry/vcpkg.json +++ b/ports/boost-geometry/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-geometry", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", + "license": "BSL-1.0", "dependencies": [ "boost-algorithm", "boost-any", diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index 88602ed17d7ca2..f16d2bc2ea8fa9 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/gil - REF boost-1.78.0 - SHA512 6f8b94bb75cf5a1e8781454490d6873bf8c91e85ba7c98f81ece382000051c42512dc76939c693b9b24e97a3496f5fd97581a5665508bdb2ba11e570bc77bdfe + REF boost-1.79.0 + SHA512 a682481b9a7d75f9db477388c707eb277ded72bcc72a4e1d71ea5521f72d7dececb5ad3c558a449b630eb4eec15c805152f650f8a7981eaf15a0c1d819bc77d4 HEAD_REF master ) diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index 32e00e207409e6..081c1b74912eb5 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-gil", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-concept-check", diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index 6d0ca9b8e975ad..340f21c46ba1e5 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph_parallel - REF boost-1.78.0 - SHA512 50efce738dcdb001c5d429274f1d699caa45e68998f60dfdd5c0a572981ca72a2d08159619adda8a011c1d6237bf615572f74ebe10f2fb98334984a54c9f653d + REF boost-1.79.0 + SHA512 18c4a3272d08445bf6dfe23546d5380740979014207620b67890e20df21a7cd0d2c9c9f9b96ea240ceab5f4e1af98cc09518667959b4782595f36fa290e88a8e HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-graph-parallel requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json index d663fdd369c83a..a05c2dd3888c54 100644 --- a/ports/boost-graph-parallel/vcpkg.json +++ b/ports/boost-graph-parallel/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-graph-parallel", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-algorithm", diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index b74e7915768b0b..1d9422d962da9f 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph - REF boost-1.78.0 - SHA512 af51d2d0c07bc3d6c880b114c34aec2ebde9f4c1b2ee73a7e8be4edf2a8175ae341b0ce8fb36fe7b4899aebaafe054720f573233b72849648ca0a97c92098d77 + REF boost-1.79.0 + SHA512 abf24abcccc14145463d9a2b465137352703fd6d5fbb7bc2d8e1d7f126f165826a858a47d3d8ae0f2bec897875f77a138d03708dbcfa4b7ff31910fd6f1a7d63 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-graph requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json index b89fa9f637defb..18bfed79048e13 100644 --- a/ports/boost-graph/vcpkg.json +++ b/ports/boost-graph/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-graph", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", + "license": "BSL-1.0", "dependencies": [ "boost-algorithm", "boost-any", diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index 1e7c706aae4e5b..006fbfe36d4cdf 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hana - REF boost-1.78.0 - SHA512 407cc2dbf4fee28182564925cf2a11074728322e03b2c5acbc9d34ed4d7e30befde9f74176270b63179f09504b42375249f09d336546ebdf2e24b4956d2fb885 + REF boost-1.79.0 + SHA512 e50511f768c16ba5eb41a4240e4df85f944443ae6b35848f079fec0ed65e27ba70c643f1cea58bf1fae2034a6c88be81ce23639e21c3030e43c2295652514f96 HEAD_REF master ) diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json index 6b588031404c19..0b59037c82cbf2 100644 --- a/ports/boost-hana/vcpkg.json +++ b/ports/boost-hana/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-hana", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 64c78f82bc8da1..5288cd0bfe3dda 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/heap - REF boost-1.78.0 - SHA512 f8360f4cd5772e5e2fc62b4174778b227c34876fbda6b4a245d959ef895a20eb3fc88084de7f9f22caa89a9a6b4be50b5aff9088a8c81c4216450b5ebcdc5dc3 + REF boost-1.79.0 + SHA512 f538cf751dd8909010613579a5b10da58b6d8474d9f58e9a6e2ab6ad95b52cd08c8e6a6c6d3abd5426508bc1de432a11a355652c6241ba474ddfeffa285f4411 HEAD_REF master ) diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json index 204c7c05d0438c..ff2b95818df910 100644 --- a/ports/boost-heap/vcpkg.json +++ b/ports/boost-heap/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-heap", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index 743a0744979d4f..1bff93ad5d4fef 100644 --- a/ports/boost-histogram/portfile.cmake +++ b/ports/boost-histogram/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/histogram - REF boost-1.78.0 - SHA512 1124b52f68f6a240ca5fc8e1514fe3350a1f16260b137b5fbdd67c9fd68573f11a9d95cfcc6f370201ef6ae95a35098e1c8a457180c26ffaeb9b29bb6fbb0a2a + REF boost-1.79.0 + SHA512 abc02ad88428550899d03fc54b35e5c31ce967028e7453bb46c28cfc99272319a3aea145054eeb22ea3b75358548f863eb561228efbe47a3e732d1e3be1b698b HEAD_REF master ) diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json index 60a7ce773bcdf7..d9e4f8122fc7ae 100644 --- a/ports/boost-histogram/vcpkg.json +++ b/ports/boost-histogram/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-histogram", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index d82fb2460fb720..dacb488940d310 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hof - REF boost-1.78.0 - SHA512 120ff5db96651321eb2512b672c204219e6e6612e2a5764c933cd3b3d7afd82e2fe5ec57a0a293e83d276ee171aaca06eaa856dc8b7e5f891fdbd3bc536373a7 + REF boost-1.79.0 + SHA512 78e02a1b1f5f7b484d9c8e91d239147c9e37f58d7bda944bad5ec302a4dad0b4ea39efd3cc839540a12c5f17ec7944f6f27d9fc529b7992426393cdf30a2dcec HEAD_REF master ) diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json index 3839b5919bb221..883a6b393ecc35 100644 --- a/ports/boost-hof/vcpkg.json +++ b/ports/boost-hof/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-hof", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index 5d3ecbfad05640..30297b929ebea2 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/icl - REF boost-1.78.0 - SHA512 83d4f74ef6c4dbe7e6e9eaf1665bc2e013fa4236a92ea5b702889cb67e86d2c141897a8a9b627ef693c6514ddd148ea9f2120fc606e255238dd7ebd083a5fc47 + REF boost-1.79.0 + SHA512 4a6297454579052d9fdcb76a2b1659dd5767cff751d35770ad34f9c48a9308a548d914b8ff7156f1c64866751538f68926e81ae1a09d8f7d8da14442ee90c679 HEAD_REF master ) diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json index 6e0df276f6cfd1..743875af8d2e50 100644 --- a/ports/boost-icl/vcpkg.json +++ b/ports/boost-icl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-icl", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-concept-check", diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index abc67f88303329..36aa39949a0ecf 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/integer - REF boost-1.78.0 - SHA512 c0d87b0c8ccfc3923d61862429b22dcf09b9905c57927277bbef7c45ca1ae2ba57c35fd7d7ec3aec19eedf73598c4c1bf2d49c9d66af297fc2978cb196b6a64d + REF boost-1.79.0 + SHA512 97607006e8acf9c988dc951ca6c04d912bfbcbf86762b00cb5675dfb3e205ec60fa95c2b13c08dcbff4bccbd4775323fa6c2a2faddfbe1a9a2730b9e769761c7 HEAD_REF master ) diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json index 4b6ac510f8b641..fc0f9b0afc2b1a 100644 --- a/ports/boost-integer/vcpkg.json +++ b/ports/boost-integer/vcpkg.json @@ -1,14 +1,16 @@ { "name": "boost-integer", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", "boost-core", "boost-static-assert", "boost-throw-exception", + "boost-type-traits", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index 35c64ee14e56c2..31fc9e8046cbfd 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interprocess - REF boost-1.78.0 - SHA512 47ac928bc47f4fe0d504031e51c344f733820db2c40bb1e55187778692d480e692a3c3fee62e05d24b389b0117761ee8147fe8aaff1510a088047fb38a703986 + REF boost-1.79.0 + SHA512 ab6f9fda45ba3896a7908a1f7659da690f4ebf988f084dc90f46197ee83bd8c824d14f44c1e080954c3e4c886cb447a980b8c1e5df91f552cec9c9b20f98d0c5 HEAD_REF master ) diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json index 771a5c3e42d838..bf29bb5f093b43 100644 --- a/ports/boost-interprocess/vcpkg.json +++ b/ports/boost-interprocess/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-interprocess", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 9388382e23b5fc..5c2ea2ace96258 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interval - REF boost-1.78.0 - SHA512 8de185456a462e76a73b01b016e71ab4586a2676cbaaa666e52dbddd37341a6ba313bd51814f3d2bb22541c4cc067626b3d3c8346a02e7a0a38d6cae6cc59f80 + REF boost-1.79.0 + SHA512 46af32271e33f2e004df2b8da5c117eff0a65bb229be788cae888ccc24e9f6e43d87ff151c5c242e90731a8e54fd95e7d3c6562e3a019bb551475c83e5a61a7f HEAD_REF master ) diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json index 7d7f46270b53ef..846b2768643190 100644 --- a/ports/boost-interval/vcpkg.json +++ b/ports/boost-interval/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-interval", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-detail", diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index 598bc378665713..92cd55b23d7b0a 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/intrusive - REF boost-1.78.0 - SHA512 8a9431af2346348c0981d296f5bf9126833d6831c50fee91c85b3bcafd117d9b39454837a40a3aca4385ebf1d59b795ea7ee8a5c0a6c8adbfe3f3de8a2e805d4 + REF boost-1.79.0 + SHA512 4536cc104c2538d2c7a4e22882a27c47732b69ead76fd49d75592f582bc1873a0731753eb421ad67576467d731169333a1e95a39efb0e977512a58b407d59fb4 HEAD_REF master ) diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json index bd09c4b4be9899..10191e751a8b61 100644 --- a/ports/boost-intrusive/vcpkg.json +++ b/ports/boost-intrusive/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-intrusive", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index cca5ca4e5db52a..7097641f494c36 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/io - REF boost-1.78.0 - SHA512 349333ed588658ed631a615a62808757216a09931fc1f4cb2ced9f7e8d5206fbe44fb29015f623dd174f6b743427ad6df6e69463b281b9824d29581736b1d658 + REF boost-1.79.0 + SHA512 e647ef4eefcf452b6b5f64ac39bd0661a39c78660a360e0bb009e8788b8d251a5d3bcde3c1edaedd7bbd588eb88eba495d52a52d504eac72e429ba0ae0a87482 HEAD_REF master ) diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json index d3bb556c1c5c4d..3f15640eda1f71 100644 --- a/ports/boost-io/vcpkg.json +++ b/ports/boost-io/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-io", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost io module", "homepage": "https://github.com/boostorg/io", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-vcpkg-helpers" diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index 3160968abfdfc3..b1aac26495af2f 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -3,15 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iostreams - REF boost-1.78.0 - SHA512 ad766d5b922bf959480dbaaae80c82211118a11db2a1cc7790ac2885a9c2d85d883d320f6dc19a4cadb0d857398f4a21c173fd3ccf2ff2068718b32dc5cb67c1 + REF boost-1.79.0 + SHA512 f733c586df4f267dba7b7181caa2e7ca1418d2cd843cf032121c06ffcda936c194fd7a78ebe292133217a8aae4bb83fd2c2890b52739da74c4833ecd950d0555 HEAD_REF master PATCHES Removeseekpos.patch ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-iostreams requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 080cec0a1a5794..6d01ed79d5f516 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-iostreams", - "version": "1.78.0", - "port-version": 2, + "version": "1.79.0", "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "license": "BSL-1.0", diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index 6d970bfd37d093..f269042497bebe 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iterator - REF boost-1.78.0 - SHA512 a6cea7025926b9482e3e0b0c19d9ba6d2bd2fe358c418d27b69ee8f9aa25204869f29412639242e244acb5eb5a7d5e79786d3bae649b1603f9123eeae16dc32b + REF boost-1.79.0 + SHA512 26b0308126df522725887fcb9578d7e645f181cd8a6850915a5ce0c832a5f2e5521ba75a17f29a5eba788e3d8bd46d61ebb4b61fa40f233c33e99f83949516f6 HEAD_REF master ) diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json index a9859042394741..68f227529faefa 100644 --- a/ports/boost-iterator/vcpkg.json +++ b/ports/boost-iterator/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-iterator", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-concept-check", diff --git a/ports/boost-json/0001-json-array-erase-relocate.patch b/ports/boost-json/0001-json-array-erase-relocate.patch new file mode 100644 index 00000000000000..1a8ade170643f1 --- /dev/null +++ b/ports/boost-json/0001-json-array-erase-relocate.patch @@ -0,0 +1,20 @@ + include/boost/json/impl/array.ipp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/include/boost/json/impl/array.ipp b/include/boost/json/impl/array.ipp +index 4d067fb..a2c7fd6 100644 +--- a/include/boost/json/impl/array.ipp ++++ b/include/boost/json/impl/array.ipp +@@ -491,8 +491,11 @@ erase( + auto const p = &(*t_)[0] + + (pos - &(*t_)[0]); + destroy(p, p + 1); +- relocate(p, p + 1, 1); + --t_->size; ++ if(t_->size > 0) ++ relocate(p, p + 1, ++ t_->size - (p - ++ &(*t_)[0])); + return p; + } + diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake index 3e8c8f3a7fbc59..c72a076367ccf0 100644 --- a/ports/boost-json/portfile.cmake +++ b/ports/boost-json/portfile.cmake @@ -3,18 +3,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/json - REF boost-1.78.0 - SHA512 245eb006392cea71fc4da0100a804cff0f4f0a63baf5e4d95ea3b8234a8b2a72344090ccf827a6334fe1819dc207d84a2c1709c62f71361a8e8824d84a51edab + REF boost-1.79.0 + SHA512 1243e4bdf5f2570c1f92e12dbe9cdef55d72d73d0e6abc6253eae928280ba913bfbc3a4d92d09a9c9b98e06ef95345c2c99dd0983d8dd2a7f1d8f0826530e1dd HEAD_REF master + PATCHES 0001-json-array-erase-relocate.patch ) -file(READ "${SOURCE_PATH}/build/Jamfile" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-json requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json index 28efe2fca4e4fa..3fa10d633a5c4b 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-json", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost json module", "homepage": "https://github.com/boostorg/json", + "license": "BSL-1.0", "dependencies": [ "boost-align", "boost-assert", @@ -12,6 +13,7 @@ }, "boost-config", "boost-container", + "boost-core", "boost-exception", { "name": "boost-modular-build-helper", @@ -20,7 +22,6 @@ "boost-mp11", "boost-system", "boost-throw-exception", - "boost-utility", "boost-vcpkg-helpers", { "name": "vcpkg-cmake", diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index 28adb4a18958cb..bf54ef65ba0e5b 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda - REF boost-1.78.0 - SHA512 b3d923435133ba4bcffd0fb722d92ccf4f7b739a51390319db10ac43452141c1d786755ae143149102324548d4beb7e87e5767381b93cc814593ce9123f2dffb + REF boost-1.79.0 + SHA512 4baa279ae5ba4a0b63c3177bebb30a15f539f56e8786a4049a027a6593c73a07f6d397b3bdc07fedaa0407015a7320f1577a499ba463c8bfdb13d1fdad2394b7 HEAD_REF master ) diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json index 3687066be5e2e3..74f2616870f623 100644 --- a/ports/boost-lambda/vcpkg.json +++ b/ports/boost-lambda/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-lambda", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", + "license": "BSL-1.0", "dependencies": [ "boost-bind", "boost-config", diff --git a/ports/boost-lambda2/portfile.cmake b/ports/boost-lambda2/portfile.cmake index 43c1d15afb5914..d4336f7bf96b65 100644 --- a/ports/boost-lambda2/portfile.cmake +++ b/ports/boost-lambda2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda2 - REF boost-1.78.0 - SHA512 56c8e14dea12e32d8b049c6de2c5ed4ea299b169fc43d76c65aa1057dc5cad9e1182fdf9761381855c3b940ed4e34a794ea8aeca11fde116bc25c4ae1065cc58 + REF boost-1.79.0 + SHA512 352b7070627458c63866c2b00829c84aa76c0188b772555fa019603d80314f446c38311b08e30c07d9fb337988a335109112aaa5cb188723effc54b7356d0a67 HEAD_REF master ) diff --git a/ports/boost-lambda2/vcpkg.json b/ports/boost-lambda2/vcpkg.json index 068794a9375584..a7f426306259b1 100644 --- a/ports/boost-lambda2/vcpkg.json +++ b/ports/boost-lambda2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-lambda2", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost lambda2 module", "homepage": "https://github.com/boostorg/lambda2", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-leaf/portfile.cmake b/ports/boost-leaf/portfile.cmake index 1159bbf456f28d..05189dc98ad85d 100644 --- a/ports/boost-leaf/portfile.cmake +++ b/ports/boost-leaf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/leaf - REF boost-1.78.0 - SHA512 07f15896fe8dd1029aefe2988c82b688243b11f344fafe7ad80a93e70e75c7b35083d1a84944bc564aa591a086f20dfcb4010fc701b1e6780f93ac2dd5701c6b + REF boost-1.79.0 + SHA512 1f567029d8b737f6e7cb4fcd8df03f0aaf89bedf5c127b5cbd02ce27910934361254e2d03ba95614a7e41f2e2c4a09a346b41ea53aacc68dcf64e77e58b7fa23 HEAD_REF master ) diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json index a4f670c4f41609..77395c01e03757 100644 --- a/ports/boost-leaf/vcpkg.json +++ b/ports/boost-leaf/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-leaf", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 40c52885331a28..46a076bf6ecc88 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lexical_cast - REF boost-1.78.0 - SHA512 01b544b29f8c4e7de7cb1f4d11835bf4c434fd65fa48983794cd4ec2847d3fc12692722025177552b4653f213d033811bafecf64ce3572885ea7cf522ab3f406 + REF boost-1.79.0 + SHA512 9d0b28cd20c88638d048ff48d2f0209627f15558c1ff2619ed28cc07207c71352799289004d4108c20187b1099720064a2d1ca517b8b19e523e6702acb8fe018 HEAD_REF master ) diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json index 7da42431e0693b..1fcb7717e0c287 100644 --- a/ports/boost-lexical-cast/vcpkg.json +++ b/ports/boost-lexical-cast/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-lexical-cast", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index 3c44ceac6986aa..fc2d6f97c90387 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/local_function - REF boost-1.78.0 - SHA512 4df1e13e9314dc31fabd2e0451e09a69b6f976efa41b2fae87766bb9ba271ab47604f15ae138c694b8e15ea51289ca8c2e882179ca55b9abd904bd166b0bd2b4 + REF boost-1.79.0 + SHA512 c6dd1e1b397bea700c9692a1a71d2943c5221afbd0f82e5c67093154923537127a3cb1d727e532454363a58210feef638ebe1a2ebec22ae93c16f52f3c29203b HEAD_REF master ) diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json index a54f8896163e23..e4a494a1241676 100644 --- a/ports/boost-local-function/vcpkg.json +++ b/ports/boost-local-function/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-local-function", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-mpl", diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index f20b7733406cb1..396f9c54f80236 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -3,17 +3,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.78.0 - SHA512 17870d13898fe1c8df3958757aba81f385924ee063e9f92f821ced912346b89d106b2256d659239323efba125ecd8507a8f3fbc326285cc243befdab5dcaf72d + REF boost-1.79.0 + SHA512 2f036406e8343895b3749bd7769b1dadb48d7552862898842b43eccf51c62153f4683c46cef91fd97228d6022e60a9bdb0726a00bcc74f519e0539b3a69dc0bf HEAD_REF master PATCHES 0001-Fix-boost-ICU-support.patch allow-force-finding-iconv.patch ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-locale requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) configure_file( "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in" diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index 47c2adc8fd52d0..f09d93643756a7 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-locale", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-assert", diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index b714183733fb37..6d641d6e0fe3e5 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lockfree - REF boost-1.78.0 - SHA512 f0e56532c369dcf9adb20ea1da6f647d083a67aea067109d7743e5eb4d26ebe2b21b8e2b131265db03f8155845d6948197acfbecb2da41f9f54c11f80e078ba9 + REF boost-1.79.0 + SHA512 3251573a8ed7c974ea8cddbca086124d7b2503c1da482d3f6a024d5c69632606f36c00e33b13b2de44b5f41a1ed67d06d39014f0cdfb960c109b155f5c7eb3a4 HEAD_REF master ) diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json index 65fb1c8965cde4..defe38b84d98da 100644 --- a/ports/boost-lockfree/vcpkg.json +++ b/ports/boost-lockfree/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-lockfree", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", + "license": "BSL-1.0", "dependencies": [ "boost-align", "boost-array", diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index f3d3e8da871cd5..59d7b0dcb46d0f 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/log - REF boost-1.78.0 - SHA512 86f2c99647236f49a8a18a10a3c4a7409f15e5d5cdf8f925a7bd87a7eb196d3c53595b7ddc7fd56354181d5b7c433645f3ee349db59d5b971583166366550613 + REF boost-1.79.0 + SHA512 da3fff9756f991a6b3a1529499c4f58fa4ac6167c2dfaf1b7debd45e5a2c1f0687dee1e0edb21d28859971f9e0afab3e1aae3a48b6a39a98dc6d52a697b0f2c4 HEAD_REF master ) @@ -12,17 +12,11 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") string(REPLACE " @select-arch-specific-sources" "#@select-arch-specific-sources" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") - -file(READ ${SOURCE_PATH}/build/log-arch-config.jam _contents) -string(REPLACE +vcpkg_replace_string("${SOURCE_PATH}/build/log-arch-config.jam" "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" - _contents "${_contents}") -file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-log requires a newer version of vcpkg in order to build.") -endif() +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json index 131e173ab03230..4907092d19fd45 100644 --- a/ports/boost-log/vcpkg.json +++ b/ports/boost-log/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-log", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost log module", "homepage": "https://github.com/boostorg/log", + "license": "BSL-1.0", "supports": "!uwp & !emscripten", "dependencies": [ "boost-align", diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index c51df05187eec1..96e7708b7550e2 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/logic - REF boost-1.78.0 - SHA512 0f190c66e1f6ae30173c95db14c7a4373ffc55d3f48a0c54a1814e222b1cba05cf6668e6d90a780506dfa40b5060c0c0c1a4a0c76929fb420770d2134a8cbcd0 + REF boost-1.79.0 + SHA512 9b3689d4b08cc0edc69aa9f2ea2f182e94d734a407b030b9b41ebaccae20055fae8f8662324abfa1b8217bf10edbc996b6e218df9f9a4bb9dc8952460b5f3cef HEAD_REF master ) diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json index fd1fc2c5258c5c..33bf21e279e1f2 100644 --- a/ports/boost-logic/vcpkg.json +++ b/ports/boost-logic/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-logic", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index 668a22fa8d2b82..e246791214f0db 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -3,15 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/math - REF boost-1.78.0 - SHA512 a5de0dfddca56ef67c750db55d103e41822ae3823c023f884211a1d993ebd4a35cceab024b405e48f51acc7f2ae7d1e97aa7e4c603eca929027b62ca2d234ff9 + REF boost-1.79.0 + SHA512 97d7d11b80c5d583ceed3548f294876180d4ff8e0aab5b39c1dc5249300a124c4ac2d8894b3c4e8bec9f7fa42e3886f679a47b8b86feb7c1d9e8389b767bb499 HEAD_REF master PATCHES 001-remove-checks.patch ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-math requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json index 86a66c666cf831..9571b8de36f5cd 100644 --- a/ports/boost-math/vcpkg.json +++ b/ports/boost-math/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-math", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost math module", "homepage": "https://github.com/boostorg/math", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 23eaea290a3b69..4bc880c411f656 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/metaparse - REF boost-1.78.0 - SHA512 d068680be7609e3a9c87f8c027373eb68fe3c212944fe63369bca94842fd8ceb032a43a455a93248bf5578170acdb76c99aa1d04abc53901636d8e74c261755c + REF boost-1.79.0 + SHA512 851b34afc5badece71dbc2bd017e72dc6871ffc246fdedcc3f699b7afdda8b7140016f1f9f44af891aa25bf61aab990ac11e8541ae53a4cae1c25b05131f0a74 HEAD_REF master ) diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json index 41ccb894447674..1c1b5ce97b890a 100644 --- a/ports/boost-metaparse/vcpkg.json +++ b/ports/boost-metaparse/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-metaparse", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-mpl", diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 344deb615620bc..dc192d7c7df78e 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -4,7 +4,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY) -set(BOOST_VERSION 1.78.0) +set(BOOST_VERSION 1.79.0) string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" BOOST_VERSION_MATCH "${BOOST_VERSION}") if("${CMAKE_MATCH_3}" GREATER 0) set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}") diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index a70e222808d242..3d70fd245557dd 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-modular-build-helper", - "version": "1.78.0", - "port-version": 3, + "version": "1.79.0", "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index 3bed2eb82acbc7..6cc86d66767a0e 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/move - REF boost-1.78.0 - SHA512 e17ceeaf96375e2fed7ad8be88970cdcb9b94ff3e101bdf4291ef48bf64485da3c1b7449f77881a7a757a9f5a81568cb387733e1b1b3c66f99058db1487e7554 + REF boost-1.79.0 + SHA512 1c62ca4673ca70dd1334ac6380f74db2f3827631d1419f658461bd4ab22a81406a2b1229adf48f92cf827a627e1997409c9911d8bc9ed6a5d5ac320127818fb0 HEAD_REF master ) diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json index 513b88ea0dec06..479998601e2b26 100644 --- a/ports/boost-move/vcpkg.json +++ b/ports/boost-move/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-move", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost move module", "homepage": "https://github.com/boostorg/move", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index a8d399799ffb79..75ad22305c3872 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mp11 - REF boost-1.78.0 - SHA512 e98ca08ffa766760f20f3e94a97cfe82a024c4a3ed7d1101e2a5a790c9d50dc19d83a2a9a934432f452c2746de1a8fb81c105e379703c4e2be745ef697c38a42 + REF boost-1.79.0 + SHA512 0955d8b9df916b8386edca235e0e142f43bf80e93fb44cb6c75ef9190668be04d07bccb68907d55222fa21c01729105e2c18d6a407b953eb62835622ad41b0d9 HEAD_REF master ) diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json index 77700e66be6ca1..e99a6d0da271ce 100644 --- a/ports/boost-mp11/vcpkg.json +++ b/ports/boost-mp11/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-mp11", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index 628897c5aa02e0..4af9f1642e192d 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -3,15 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.78.0 - SHA512 22037c92eb0f2a8e26b39637003b0b470d1e34f85cb6c83cb6d63d84ff9b57adcf172ff4ecf86a30d07bd89f422a4b39eb12a7e5940648f6ebb2b7af66a00f2e + REF boost-1.79.0 + SHA512 280b35c991741480a4ee9ae97c11ed14a108b200344ac5b4af2e5956041275dceeb1370320a90e30ac12a0ab0667afd80910776b1f0e404d5bc3637f53993010 HEAD_REF master PATCHES fix-build-boost_mpi_python-on-windows.patch ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-mpi requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json index 8e0512dc96e4ae..8d65e241f4b638 100644 --- a/ports/boost-mpi/vcpkg.json +++ b/ports/boost-mpi/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-mpi", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-assert", diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index 4f454995b7e038..5c086ddf7461a1 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpl - REF boost-1.78.0 - SHA512 0aa3d20b10f5a4a655d07499372ac74114458a6209dc536a3a061e13683a12c98c9b129e3e5d103d95773fcf14afc6f94ac82ddb84d21dee55338bb5bbf2a47f + REF boost-1.79.0 + SHA512 55d1e6481269070d7ec45b11f19dc437f56ad72c869b82b312278cbddf5b4ae83dc70d74b2f0e99741f68d7c07d401b3c5c48a119f15825dea7164ea3cfcd275 HEAD_REF master ) diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json index 5677301d2f0129..eb4badfe4fccdb 100644 --- a/ports/boost-mpl/vcpkg.json +++ b/ports/boost-mpl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-mpl", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index 159e23fa2832dc..f73c01846a5c81 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/msm - REF boost-1.78.0 - SHA512 0cc80428548b5fbde38efd8426bca954205e26ea2b9da1d9c682cd9315b298759c8db0540d0e216ff57bd613cebe9317764b2b52d24143ebee6c1eb080908eb1 + REF boost-1.79.0 + SHA512 29ddbf189b699d1313950b7c30d2ad98e0e242508f9a8d81e98c384572808dfe55072af41f5c036bd2a51d39d7081d10c3c79d9f8f7a9245a67d3840974cb1b9 HEAD_REF master ) diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json index 6c3e65a0679ad7..fe38a7327d35ee 100644 --- a/ports/boost-msm/vcpkg.json +++ b/ports/boost-msm/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-msm", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-assert", diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index e6e85919b955d4..ad92053dec0b89 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_array - REF boost-1.78.0 - SHA512 835a43e508ef2b2e03ecc8268770eb2e523414406d0da34ab5fdedf65e65b0f6d3dcfa8efbd2f4ee226331a56cb977106d8bdf8f285aa36f9055017be5be080b + REF boost-1.79.0 + SHA512 5665ffa1b298320cd525b3d22a5e59c1c88a148672ed98295a00957b05316943f081821102c3881ba03b565d0c0879d11b0d3bdf1221a92fbfe4dddb98820074 HEAD_REF master ) diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json index 6ed7ba4f523084..92ca481d6b8d86 100644 --- a/ports/boost-multi-array/vcpkg.json +++ b/ports/boost-multi-array/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-multi-array", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index 19dd38b065884e..f0a2fe3b66abf9 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_index - REF boost-1.78.0 - SHA512 ea183d2e87d5d8655f96085ace78e8ee12678ae4603077773c658f6aa4d7bd86e1c120e0e0b6fef3b4fb42bf9ecbb79c4819c508eae4f5bf71c0ac6b50ec712a + REF boost-1.79.0 + SHA512 359d68e58977e84c6fab0a0e6a1a64ae7589437b0847c0a492ba6bd0089b023729bebfae1c7f4e2f21a5289e11bd0dfa643f34fa913dda59dcecb49dd8adfe63 HEAD_REF master ) diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json index 2b7da5ec72dfc9..778c02abfe531a 100644 --- a/ports/boost-multi-index/vcpkg.json +++ b/ports/boost-multi-index/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-multi-index", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch b/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch deleted file mode 100644 index 3f393ce110a9f6..00000000000000 --- a/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e1ae1e4dc3d450e47693f3b190520b598f88fc60 Mon Sep 17 00:00:00 2001 -From: jzmaddock -Date: Sat, 18 Dec 2021 16:58:47 +0000 -Subject: [PATCH] Fix selection logic in intel_intrinsics.hpp To correctly - exclude msvc+arm. Fixes https://github.com/boostorg/multiprecision/issues/405 - ---- - include/boost/multiprecision/cpp_int/intel_intrinsics.hpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp -index fcfacef1..eb4624bb 100644 ---- a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp -+++ b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp -@@ -31,9 +31,9 @@ - #undef BOOST_MP_HAS_IMMINTRIN_H - #endif - --#if defined(BOOST_MSVC) && !defined(_M_IX86) && !defined(_M_ARM64) && !defined(_M_X64) -+#if defined(BOOST_MSVC) && !defined(_M_IX86) && !defined(_M_X64) && !defined(_M_AMD64) - // --// When targeting platforms such as ARM, msvc still has the INtel headers in it's include path -+// When targeting platforms such as ARM, msvc still has the Intel headers in it's include path - // even though they're not usable. See https://github.com/boostorg/multiprecision/issues/321 - // - #undef BOOST_MP_HAS_IMMINTRIN_H --- -2.34.1.windows.1 - diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 1169ef02feb735..4d01bbd480b52a 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.78.0 - SHA512 eef97b9a53e85e921d29dcea521ba8f751d71f03782d53eda345628d1ba400b83c7f656f41340128ded0a54a6d7955b1493cdca3804bea586158aa28b02fc941 + REF boost-1.79.0 + SHA512 feb6f97d124032a22fe48989fd783242ca2db1adc3f821e36b6798fd068e038037dd32cc6c7cb0c3c76fe96074c9e7ff287809edc944d4f1c4f1aff686fda57d HEAD_REF master - PATCHES 0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json index 6ab23e8796e070..6b7a99432415b3 100644 --- a/ports/boost-multiprecision/vcpkg.json +++ b/ports/boost-multiprecision/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-multiprecision", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", @@ -12,6 +13,7 @@ "boost-math", "boost-predef", "boost-random", + "boost-throw-exception", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index e5520a7ed28f85..cc1035d63aeef8 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -3,18 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/nowide - REF boost-1.78.0 - SHA512 115ec3a2c98e316ecc1c657467c79cdddb28a07181929d3ac496db34f1b29faad460dfd47d98f110374534f2257db4b52088ed234ff1feeabff15a52ff525426 + REF boost-1.79.0 + SHA512 47169153491cf7589f8e0080c609caac55388b5bf89577fac60a1c7e94a46203652652ec904898a8f9b84319fb9f92ccea2eb2a892b49c69b82270f975c2cc25 HEAD_REF master ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-nowide requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index 00befbddf6f82a..67021a29c2b73f 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-nowide", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", + "license": "BSL-1.0", "dependencies": [ { "name": "boost-build", diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index ab35aa1ac5f57c..445031044916ed 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/numeric_conversion - REF boost-1.78.0 - SHA512 de22f330cfa890c2633f021500b1e6ad5836c93905bd6d228bb60acf52fde94783a7594d4722dfd645a957f5a1868f5e71510f7e359e0167bcc7b2161a369de7 + REF boost-1.79.0 + SHA512 87b357355ddf1dfb565e770dbbbaf6b8b3d7005237ab01610170152d9cf4d6f3d7ba4bec8b127bce876abaf322af46e92f921f39b3ae41bd150ed29ff53b021e HEAD_REF master ) diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json index 2018aa80134c08..aa96a68ea64cf7 100644 --- a/ports/boost-numeric-conversion/vcpkg.json +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-numeric-conversion", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-conversion", diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index 573353f4138136..57a5b658e2af15 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/odeint - REF boost-1.78.0 - SHA512 780e08bc8f36e3d6cb3c98dff10ae9c35f84ad468a9358d95238a08475c3091c7ed44d5b76067cc0a6db5ec1c364f3bc43ab58bd120e110353d6f39115022d93 + REF boost-1.79.0 + SHA512 f774cf8f0b38472e99241be3aae5b4f7eae6ed450bba654a6d718c32a0e7c5e38c1e40cbb426d83428e97864a691c6522352c045f8fcdb8ca48ef041b8b1b3e2 HEAD_REF master ) diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index ef06fbd444e4a7..ddf84ae3b876e8 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-odeint", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 3f42b4584b73c3..6773a94e94ecd7 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/optional - REF boost-1.78.0 - SHA512 490eadd8017595a5c019da8c0c3b0e2569829d58ab31b2b575a2bbf9f218b9fc7aa42dcec3f6e9178ca10c438966889bbd77bb6013bf749bde9ba49e7fba2d97 + REF boost-1.79.0 + SHA512 43f2a88c39049d9a419af63fbb9c2cbfcaad8a691289a2085d646b2b98711879801662ec6486cd83509797856c9ec8492010e9deb36da3a4b40e6df81c2dfad0 HEAD_REF master ) diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json index 488c9884740512..9225d5d4af2aac 100644 --- a/ports/boost-optional/vcpkg.json +++ b/ports/boost-optional/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-optional", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index 3749fb302e6041..ddd8ac2fa5803b 100644 --- a/ports/boost-outcome/portfile.cmake +++ b/ports/boost-outcome/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/outcome - REF boost-1.78.0 - SHA512 39ed3377a61c72fcc30256359988df54370423c54bb2586e9e0d6a42157c1825828a0fb710ccc1b2c44a9cc93baae2a33f30fd5a86e4c759f0902081aa65fc64 + REF boost-1.79.0 + SHA512 e0e4587ea19e70047790e86496d85a7c1e310e8b33af99dfbcad330243b9ff390d710cfebda15a94de4497f4a85498c051c043adbe8c41770b747a742a34634c HEAD_REF master ) diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json index eeea24f3a328c9..4ffa96ebc3dee2 100644 --- a/ports/boost-outcome/vcpkg.json +++ b/ports/boost-outcome/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-outcome", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-exception", diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index bb0f0cd749cfa9..dd8c5fefb02cb5 100644 --- a/ports/boost-parameter-python/portfile.cmake +++ b/ports/boost-parameter-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter_python - REF boost-1.78.0 - SHA512 137929b7e257ace791e4b8a27ea481db986d7e47d1e105369bd44dacf6886c8b04cf7f95cb2cbe640e58e50fa33dd16df95034bf56a021ea8aad6a02e171db05 + REF boost-1.79.0 + SHA512 caadacd40b1e51db7b4e0e42e920e8d3492fdcaee29760c398bac64a614df37f8e103c31dadb8496bc11312791a2bdd60b45a16c5019f11c601480019d7bd181 HEAD_REF master ) diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json index e2a22c6e742983..ef3b2eb75dcfb1 100644 --- a/ports/boost-parameter-python/vcpkg.json +++ b/ports/boost-parameter-python/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-parameter-python", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", + "license": "BSL-1.0", "supports": "!emscripten", "dependencies": [ "boost-mpl", diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index caa8be6f0352d3..ad66cbc7d3171e 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter - REF boost-1.78.0 - SHA512 9e524ed3627852962b6a7a8dd324341b1ef181aac5300e78065846ee20dc110cdcfab348e02050d4cd82ff800ef361c980a1b3c95da2c24372aedb581fe8478d + REF boost-1.79.0 + SHA512 cc81271b12af89bb804187dbe004f011d24960419b4f5ee3cc83953eca09522d3578ef9972f0a22e2e03406fbb782abd6d12e584c55f0cac6062296b762c37e1 HEAD_REF master ) diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json index 9f89bcee1500ca..6eb74f2fd8520b 100644 --- a/ports/boost-parameter/vcpkg.json +++ b/ports/boost-parameter/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-parameter", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-pfr/portfile.cmake b/ports/boost-pfr/portfile.cmake index 31215172c5711e..cfbcd21edfcb4b 100644 --- a/ports/boost-pfr/portfile.cmake +++ b/ports/boost-pfr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pfr - REF boost-1.78.0 - SHA512 0c333e25cb63e94b8119341ffe74b805373818e46a5048662152c3c8b23ad19c1efc16c8700a9efcb029b295cf7e853d4f3fd561b6d8569177b1a9d14dd1ddf3 + REF boost-1.79.0 + SHA512 bcecf3f189d2ceae2eed25d2bc0e5a20e858829f6e0ec281c523d7391e4340ab07847a8e9df78a69c2afd3235310f6044c86802b9e34bdbd8f9294176ec991b9 HEAD_REF master ) diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json index 1007cd64d73589..add024455d0d82 100644 --- a/ports/boost-pfr/vcpkg.json +++ b/ports/boost-pfr/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-pfr", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 878b8ed11d3bdf..34df6d961591e7 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/phoenix - REF boost-1.78.0 - SHA512 38d64222a205f76f94ca6822c9f67c41fad7001b0939548fdd725588cd0f95c0acbff64eb8ca93ca3184328d54d4b312bbf768237010ca20dff17c455589a9fc + REF boost-1.79.0 + SHA512 4520aa72f01fd9a57b23262247f68d690eb1df996ca1f3119230d78c6b37b49634bd895b6e32faf4b6ddc8367121d67dc2e8ece0da3330a55eee51a3a66bee31 HEAD_REF master ) diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json index 21f06c4036b5bb..6ac14bf4bbbfd8 100644 --- a/ports/boost-phoenix/vcpkg.json +++ b/ports/boost-phoenix/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-phoenix", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index a21f828324afb1..aa1dcd7d4a5bf4 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/poly_collection - REF boost-1.78.0 - SHA512 24bdc5bcda3b2da29cf34bbf97e47a97881c0e68bbcdb432939f7d25adb5c2994e1a02e5105e2e4b34a9e78d03e70ba7dccaa20b9510601bc4a30b5b2d1e3ab3 + REF boost-1.79.0 + SHA512 f9cc05b4a5537c4aba68c18ee04bbd7363bd2830c6028578955d2e694cd45e47ac10f73326b79616267a8edffaaf4aea44c9e5d3f3c473235887542d3efd10cb HEAD_REF master ) diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json index ff39ee3bf0e3dd..154d38bc056778 100644 --- a/ports/boost-poly-collection/vcpkg.json +++ b/ports/boost-poly-collection/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-poly-collection", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index 3ea715734b484f..f0cbef187e2038 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/polygon - REF boost-1.78.0 - SHA512 9c03be93205e61b344493c5e40deeb59e42d4e47e45b27405c55b5bcdacbfc3a680400aa9c338440ef1fa6b366ffaab63e8a7a87ae2d6a9a7d3e135eb0bec7ad + REF boost-1.79.0 + SHA512 3df76a3777155cffd449c2a08cfe271a2735202e514a37029afd1800e4c1d887403e37980f3c6bdc056a0b1333b55e674bcb9acbe33c2e5ba956ac2995d4ed67 HEAD_REF master ) diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json index 6d187908089c08..8a787a30100fb5 100644 --- a/ports/boost-polygon/vcpkg.json +++ b/ports/boost-polygon/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-polygon", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-vcpkg-helpers" diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index 826a97cdc6f206..6ee1c885053abf 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pool - REF boost-1.78.0 - SHA512 1cf8cd5659bf260f0bfc57c799bc37f8313e8420918c4b96ab8526caedca8ffe344bb7770d3c0c52b0ea421c360df038e1d5c1d2e882c8ab497996feb7d7d90e + REF boost-1.79.0 + SHA512 ea62735a0f53bf0f94fd994055dc422007557f4a42c35d9b76259fa23e01f7ed637334342e3127d725a187610fff9a76bba044837bfc545bac21594ea8d58500 HEAD_REF master ) diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json index c477485f616dbc..590068a8c5e4e7 100644 --- a/ports/boost-pool/vcpkg.json +++ b/ports/boost-pool/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-pool", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index 74a5a6c0296a30..97635dea37e01b 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/predef - REF boost-1.78.0 - SHA512 96755a174f94565485976663d92cbb9bc61e9ec669c678161144f9f2010d98ab9df8eb1bc1afa4a72aa2b39cf876a65a17afd41e221d08709cab2053756c42bf + REF boost-1.79.0 + SHA512 329616d4b1e1e160b92f3f33f3172eeb124c9167616c29443804a817230c747fb51f211b2727b28c9a9a50364b4b7fb535000f22572e6db4f9e4b31b8ca375b9 HEAD_REF master ) diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json index c187728145cb36..fe62d6055d6380 100644 --- a/ports/boost-predef/vcpkg.json +++ b/ports/boost-predef/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-predef", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index a9c84034c03595..528dae4cd08569 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/preprocessor - REF boost-1.78.0 - SHA512 55bbc91f7745a66e1ac02e8cf151cd8e10c143f47fca3d8b65f2fb6caed232a6ed939b7344cffdc1d8ea49caa404d1043bde85efe9e0c17ee2c7cff055a9d657 + REF boost-1.79.0 + SHA512 1c9a03441f11d3f2c0eb33563fee28261ffcb20ef60d1b16c8a4fccf20158472574aea70e674bbcd67cba19b5b76bc93e886b6a7a9cb9de462de7597d00c9f06 HEAD_REF master ) diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json index a3a1f0d7ca4027..4ecfa662499735 100644 --- a/ports/boost-preprocessor/vcpkg.json +++ b/ports/boost-preprocessor/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-preprocessor", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-process/fix_include.patch b/ports/boost-process/fix_include.patch deleted file mode 100644 index 49d30691821059..00000000000000 --- a/ports/boost-process/fix_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/boost/process/detail/traits/wchar_t.hpp b/include/boost/process/detail/traits/wchar_t.hpp -index 812a92c..98026d3 100644 ---- a/include/boost/process/detail/traits/wchar_t.hpp -+++ b/include/boost/process/detail/traits/wchar_t.hpp -@@ -12,6 +12,8 @@ - #include - #include - -+#include -+ - namespace boost { namespace process { namespace detail { - - //template diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index b8d41e445f8e5c..7443b5f2101bff 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/process - REF boost-1.78.0 - SHA512 c7fadf8771f73ae620176eb6404b06233485cf827eacdb7220d18d50950e5649b3e30ad6060ad2abe1b92913ec0e775cb00955237e4393597eefd18ab538f94b + REF boost-1.79.0 + SHA512 f2d4fabb6d1c08d67394733a325b50b9384e6dd6fd7de163a5aab1fa70b881d26f13f2e48e8cb7df53598e2c5989ad36bd99d1aabc736eb8b150a0e4a6c17ff2 HEAD_REF master - PATCHES fix_include.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 44253f3b580964..8a0d8d549f8fc3 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-process", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost process module", "homepage": "https://github.com/boostorg/process", + "license": "BSL-1.0", "supports": "!emscripten", "dependencies": [ "boost-algorithm", diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index 3402cb5206e0d2..fca7622b45ec8a 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/program_options - REF boost-1.78.0 - SHA512 485d09ab4281b6e13e500bb72d8e278a8bc68d70f90c008cf8970595828d2c3e8f5ae43a81440aca3aa6879a51491b2e1c10321eeea7aa689d71373c114e602e + REF boost-1.79.0 + SHA512 250ededd7a3933413354ecd808336cab4e50fbd41cb92e66ee64d7e8dd959872df3040e0a08683b150e043a92da5fc4e3b1373d642adc4af88d8672a02077098 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-program-options requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json index 6c025d5a26b729..b4c55ace0ee312 100644 --- a/ports/boost-program-options/vcpkg.json +++ b/ports/boost-program-options/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-program-options", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-bind", diff --git a/ports/boost-property-map-parallel/portfile.cmake b/ports/boost-property-map-parallel/portfile.cmake index 7ba20d5e8f03ff..c6be30f8d7ec64 100644 --- a/ports/boost-property-map-parallel/portfile.cmake +++ b/ports/boost-property-map-parallel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map_parallel - REF boost-1.78.0 - SHA512 f6c734ca16b19d249a6b6ee66348f9671ee1f3bbb3a33ac8872e236781ecd2139df4c8c77b7bca89c51df973ee84de254ae01c892770a5caa365571ab5e8e852 + REF boost-1.79.0 + SHA512 fc4dc74098abb84d258377e63277ea2ef2d6d8bdd4d1f75bde65c223f4854d231c4f4681454b8475cd5b623f98220f31b51fbba2a9dba0b299f5a9b260a55ad3 HEAD_REF master ) diff --git a/ports/boost-property-map-parallel/vcpkg.json b/ports/boost-property-map-parallel/vcpkg.json index 7e0f7b64100405..bf7ba49db4fff1 100644 --- a/ports/boost-property-map-parallel/vcpkg.json +++ b/ports/boost-property-map-parallel/vcpkg.json @@ -1,11 +1,11 @@ { "name": "boost-property-map-parallel", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost property_map_parallel module", "homepage": "https://github.com/boostorg/property_map_parallel", + "license": "BSL-1.0", "dependencies": [ "boost-assert", - "boost-bind", "boost-concept-check", "boost-config", "boost-function", diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index e27f6ce5340423..5aaed8b5c8d29d 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map - REF boost-1.78.0 - SHA512 0e381bc06ec61e9f6ac30341048c7183b97eb18fed4676a836c4f048cfa19b2e3e2331251bb4a5a66715f28426f8f9feefd85fbb1573b4109aadc0b6f8719be4 + REF boost-1.79.0 + SHA512 5265b559b942b581890d12beb625d83a4a0261cf3efb0cb381b4c5d1ee178f1ffabd7be1782d87747b2b2a0a3e5ceae8587f8728cb30ad4fbff49e1d15f9a645 HEAD_REF master ) diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json index 0283cd3c20c093..e102df02f8aff4 100644 --- a/ports/boost-property-map/vcpkg.json +++ b/ports/boost-property-map/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-property-map", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-assert", diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index f7788aab3a5850..09a8d59ba862b5 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_tree - REF boost-1.78.0 - SHA512 4020376435cb0f7c3be8cf8e8d1745c91717dbbeb4f0b70b4fd391362bd41b167c9feda719283d451b0001f2fb24a06da0bfd08c55d9e188d6614408b7d5dc59 + REF boost-1.79.0 + SHA512 d0c7fbd9c12cc07d55aafd0a629df668681fe170a2e231d3de166caecc86e1a8751416a366ae247327dd8a24dc2aa945ce125e3747af361325d7f76187a687d9 HEAD_REF master ) diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json index 833c4fef389749..ccbb057d6dc2dc 100644 --- a/ports/boost-property-tree/vcpkg.json +++ b/ports/boost-property-tree/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-property-tree", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-assert", diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index 8c8b38b4e8ad44..e4de4a00fdf8d5 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/proto - REF boost-1.78.0 - SHA512 ff1ef7077f27f9527bbe03106ec2c2717b321702823078f49f3988e065294feb80b3f998d32a090c8920a082f3c937e7c6b83b79485ca8ffac4c4a5fb5954148 + REF boost-1.79.0 + SHA512 9237f04f926a53acdf186611487bfd3b33647f7f3e90b4ca09159fd7c230dfd7ffcb5dd7c56766391815a4bb2f77d98182e5eff39a4e1207d32d75f294f8f97a HEAD_REF master ) diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json index e50f5eebe1719a..21fc85e34d9c10 100644 --- a/ports/boost-proto/vcpkg.json +++ b/ports/boost-proto/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-proto", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index e523d8a3dbad4a..3163ce1d4b1365 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ptr_container - REF boost-1.78.0 - SHA512 fa22af9abf596cac89216a67deaf56927cff50c79383fc8ba327ddfc8d00093d05f736ed270dc5f458c0c4c6d94590276f823f5b61d6ec7f6671f930e862d5c4 + REF boost-1.79.0 + SHA512 65e90c815331ff3ccb1fbec2745e03beb5f97431c54a9eb2b2d4813a2709e655313ff3d30e06e4fa5f84aa4488cf1c17cfd7e0913498dcbd11a706d8ba2f71d0 HEAD_REF master ) diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json index 8abc4b4f0e1e0b..0e4da19c8dc590 100644 --- a/ports/boost-ptr-container/vcpkg.json +++ b/ports/boost-ptr-container/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-ptr-container", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 417dd5f71109b6..4aef0e8c372fcd 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.78.0 - SHA512 781dedc6d5d2026232aa85a0083552b44b579b04d305e0e76ccda22fee1a336f862e49a544cddc1d394bcaeac67cf82472ae4ca5d3746cb53adc77aed1782e31 + REF boost-1.79.0 + SHA512 de41d0eb76709c7aaeb2bf7a459c0c3a3372e0747e2261773569c27e8bf78baad158cfb3bc4316c3073b000665f6faf664bcd34a2f68c40382b9d3c935ce2c42 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-python requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index f6079ffb22827b..168ead86175e1e 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-python", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost python module", "homepage": "https://github.com/boostorg/python", + "license": "BSL-1.0", "supports": "!uwp & !emscripten & !ios & !android", "dependencies": [ "boost-align", diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index ab2f253ea6e9fa..e3ca1e4e4d755d 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/qvm - REF boost-1.78.0 - SHA512 904a640ca479b94ae5da1d57bd40f6845e281f5a47b26a884c51b9fa3fff7d385fe89104a53cf2e4a59b0190fea83d89a895293609b41481dc38df26d8bee9c4 + REF boost-1.79.0 + SHA512 0c9887826884b8b75acfd4cb89c0817ff8b7000ac326586e5efa6950f0812822024eb5d6fa290408b2babcbc2ec5e7e135483f793ae0b5786a8cac28598cd748 HEAD_REF master ) diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json index 720a36f9c2e0dc..7aa7413a03b31c 100644 --- a/ports/boost-qvm/vcpkg.json +++ b/ports/boost-qvm/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-qvm", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index 60b92053e11221..bd7524d77d52b0 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/random - REF boost-1.78.0 - SHA512 64657eaf3c7d91730bc9f4fdac16095709a3b9425661bbb6501efe97f1e39e4f4586b81693b12ceda3cccb704969b468c8b1f27bbfbe668709252e172d554e5f + REF boost-1.79.0 + SHA512 3a4d20ea69c4565357bc4098a3acc1281903a6118280cde056755ef2fc184cccfcc7b6f5c29b938b4d0f0d41072fc9d174e524e8c48fed6bcb0cdd1692afa01a HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-random requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json index 2167dcc10832b1..7e8eb77ceb1cfd 100644 --- a/ports/boost-random/vcpkg.json +++ b/ports/boost-random/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-random", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost random module", "homepage": "https://github.com/boostorg/random", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index 5161fc148fb8af..a85f4477453a5e 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/range - REF boost-1.78.0 - SHA512 d4614a4a6900cbda998574a43d48a8a0604b4fb2e4eb31a2a0ea33cafa9d018c6901af204b665f66abf3fbc0adb1bdab1ffb7d4ee8a125551ea5f66f6fb6bb24 + REF boost-1.79.0 + SHA512 d612c58f0a75fb63f23a4e89d5eed3feda78617a3cdad0c0ee0c44184fbd36cf1cb99c59b94f737dee2588ef8dbf6ead05b94c584dbdd4acd9fdc1fd59c8cac1 HEAD_REF master ) diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json index 6258f6a860b5d8..2c147e12f97deb 100644 --- a/ports/boost-range/vcpkg.json +++ b/ports/boost-range/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-range", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost range module", "homepage": "https://github.com/boostorg/range", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 4c46d6cb7c540e..90df48714d2880 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ratio - REF boost-1.78.0 - SHA512 2a17342379066361ef0187fc0e69734231afdc14463a26d20ed851e679989e9ee55619f1cd3694791d00dbe1c55da69d220db18c69df7493bcf7b47de563afc6 + REF boost-1.79.0 + SHA512 d3053b442cf2a00f0644d1f0ef438c6d2745edab3a6b0efe885e656c2072acbb09b69155bf7bf62a239820eddcecbb93be63c66864915a76bd169ec5916cdf7c HEAD_REF master ) diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json index afa3e8b7fa49c0..a31509b11b4905 100644 --- a/ports/boost-ratio/vcpkg.json +++ b/ports/boost-ratio/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-ratio", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index 944497a9804cb9..bdc00bcd7b25b5 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/rational - REF boost-1.78.0 - SHA512 faf1ced934d98a7acbb78fe66d4b10f57f6f225a00f4b71eed7d46fa8f4b7995a37855a68390001a8374d4cbbe1ead4c2d64318a749b1c3392701c31aafb1f89 + REF boost-1.79.0 + SHA512 9192f72442d5b7037a0386cce26d412e6f576eb6352f259bd626ebeace472037a2363be235e1f1675f4fa5ab41212eca58045a584e81c36782b77d6965032106 HEAD_REF master ) diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json index 3472141fbbb324..d6742887fa305b 100644 --- a/ports/boost-rational/vcpkg.json +++ b/ports/boost-rational/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-rational", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index 6a7c56faf58b48..aee64fd7ca02d9 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/regex - REF boost-1.78.0 - SHA512 2ffb36c9652fd497c22852e332397c5fff7752c2919d1566833da9d2a64462292c03aceb2601515d590a939ffa4967e590bc5fa8cbaccd6d73555b47e703a74c + REF boost-1.79.0 + SHA512 69cb333d35c81e24ec98e0d0498313bfb25429dadc8ded693b9fe8cf1fcfec489e3c3ccbc0b68971d5d7c1f50c29167fd85ca464ddadb64a7798b914f51d35c3 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-regex requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index c0d9678ab2e224..22e24b79401dc1 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-regex", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index d582dfe6f9908f..14b6290f56c75b 100644 --- a/ports/boost-safe-numerics/portfile.cmake +++ b/ports/boost-safe-numerics/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/safe_numerics - REF boost-1.78.0 - SHA512 750b3e6abbc13b23d08bc2ce3397809ca7fd769aad7e366b50df6d9a4f40e78d7f852f7a79cec8d31872b83d6f3d9c0c30196b8b426f116714e178f3b8f76aeb + REF boost-1.79.0 + SHA512 54b9c3e3b1e7f58bf76fc332a6090dde800cfa3367a7a3848716815fba07ac7c03694e804af1665d0eeb0b096613bc40a937f81076eac73305f3c58ace9df3dc HEAD_REF master ) diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json index 41759e88a76b77..f51473f657877b 100644 --- a/ports/boost-safe-numerics/vcpkg.json +++ b/ports/boost-safe-numerics/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-safe-numerics", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", + "license": "BSL-1.0", "dependencies": [ "boost-concept-check", "boost-config", diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index 87f9cbd7b46679..67856a860849a9 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/scope_exit - REF boost-1.78.0 - SHA512 53e3f418727d80895e35cb483bcf2358e82c2ff221a0138e292dcd0648cf1b7065cd3dcbbb69d33b04ae0671b0d23038bedf6ad20e81bf4a8af4ab8b2e28e918 + REF boost-1.79.0 + SHA512 92b4fac0a73455baede0625f5b56c8015e86ec61f90722b5ddb6c94a52f8a329ffd979d51e287b5a916f0e003cecd2bf6d6f246306499b423d98d4f652acc7f6 HEAD_REF master ) diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json index e79b470aa818ff..f4e7b14c3efcd6 100644 --- a/ports/boost-scope-exit/vcpkg.json +++ b/ports/boost-scope-exit/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-scope-exit", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-function", diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index 5ca1c9995ca148..36d25f30beb048 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/serialization - REF boost-1.78.0 - SHA512 12ae48c01fea6102267cc642727fc091ddb30224ecfb302911089dd2904fb7e52a03d5154059bb15d903753fd3863de8185612b1848418775f23e2a50378ed82 + REF boost-1.79.0 + SHA512 d2b7039a25898d08ff586b1ce25183412defbfe6e6a7b6427ac54553de88ca079c1c15b92d34c9e76390692a22bc8b7821a53efc6eeb01a6520d4ce1d2fd675a HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-serialization requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json index 099c8937d2e638..c48ad725b9a1ae 100644 --- a/ports/boost-serialization/vcpkg.json +++ b/ports/boost-serialization/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-serialization", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index db0feaadb90e2b..94ed6db0fdf06c 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/signals2 - REF boost-1.78.0 - SHA512 0aa8bcdb9e0c948ab4c372919388110da33f225c8437eb0d25066efe2f60f6c9dca27110bfa5c768738499c78482cf88264e7744e6acec339252df20908ba399 + REF boost-1.79.0 + SHA512 95739f7eb98c5e9fa5c7fb02d076239dc2f2fb3849b01a22298c06ae4454775f6b78b5c9739a5065d4a1e2ee30e771e5b3c1f3e567c4d76969281c5702ab2a50 HEAD_REF master ) diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json index 7e150d68496d7a..c5262128b3474e 100644 --- a/ports/boost-signals2/vcpkg.json +++ b/ports/boost-signals2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-signals2", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index d0a827ce08ef97..a44474b4e7ff4f 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/smart_ptr - REF boost-1.78.0 - SHA512 96f5d910dae54441d8d85ffab6a3dc3711ebb69325152a16185822e95be683548575f8074b13b64123da5ec6ca666ca33f26984c931fd642b8c9373ed682181e + REF boost-1.79.0 + SHA512 fe39bf66b08e19fee5210969c5d71e9195b30003a48941c1002d718a2ab8972ff811302163d924efae54304f044e74aebd6a69894796dcfc03b09b10347e6fd2 HEAD_REF master ) diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json index 675d97b362aa2e..9faa1eef0faeb7 100644 --- a/ports/boost-smart-ptr/vcpkg.json +++ b/ports/boost-smart-ptr/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-smart-ptr", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 5f985ba61073cd..3aa47ece14b374 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/sort - REF boost-1.78.0 - SHA512 4bb1626f58bfbd69bb0ae9d7844b5d1e3d5c55cc62e1ba0398d00775151704a3c2a83916ac166f3821ed96f7565f3bfd546af28157ab6a1b8ea64820550cad26 + REF boost-1.79.0 + SHA512 779f1e7d78baa1147af8cdbcd5aa38576c8977ce5e17ea69b38028c6ed3366812875bcea7702e3efa3c6b55c941a4993ae68ec576a0775a61da0a101356632ef HEAD_REF master ) diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json index 93dc9d71444104..dfcc21c6c6db35 100644 --- a/ports/boost-sort/vcpkg.json +++ b/ports/boost-sort/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-sort", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index 145e8d66903f7e..3a5f1e373d3469 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/spirit - REF boost-1.78.0 - SHA512 ae813e9abba8aa80b93ee5b089dcb4165be3970355d15f2ecdf4d7a552903b5f42081667a4b03d59018baca39b0f0e090daac1be5b3cc001b65cf800ebe69a24 + REF boost-1.79.0 + SHA512 6b1c5c0995493039d6c1c0de175300813cbf67f8e347e886c0ded7432fdbdd90faa59d429c313bdcdd2afdbebbdc18d9f3302090e9915db949624f83fa8ce1a2 HEAD_REF master ) diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json index eae68de944c761..b5ccd4fa7a8b47 100644 --- a/ports/boost-spirit/vcpkg.json +++ b/ports/boost-spirit/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-spirit", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index ad4b4ca7becb7d..da5901baeb0a81 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stacktrace - REF boost-1.78.0 - SHA512 edf10d4050e168b5eac7d19ff6afe3c54a3f237c65a6de974235446514ea1fae683ad01435649bd41120a51f05ae59644793c317066f5e946c02c471097e05ac + REF boost-1.79.0 + SHA512 d4816c160c0daf50ce1d864aba8be6e5216b356d76d2b2b5a4952e37aad557f1b4e59c1e7198c4616f3a5d3e92fc59b2405097b9ab4b6ff769dac0ba30cc3621 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-stacktrace requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index ee33444a92d153..28cfb42adeaafc 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-stacktrace", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-array", diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index c4855d2738e1bb..54ec5240626ef7 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/statechart - REF boost-1.78.0 - SHA512 81f9148126b2dc09f2e51cc2607247a1bf3f099d87f4c402ca47543a6339c0da0139040e28c4465030e0056aeb7e3e160926b3a7e49b4f91faf8275e63715e27 + REF boost-1.79.0 + SHA512 db28105e06764987a3adcd2e5a30ef8803b862a4d1176da58f4950c10f4c06c174de9d8157c3bcaaa1cad81fbbed03f85309f2bb733ca177e12dd9cf59dc6eb5 HEAD_REF master ) diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json index a6abf8df4d7d46..38657695482c68 100644 --- a/ports/boost-statechart/vcpkg.json +++ b/ports/boost-statechart/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-statechart", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 5643c92605abc4..6e9b3d0b132ce0 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_assert - REF boost-1.78.0 - SHA512 213098d7fae87af6ee0919de1e3e5110f96eb6238ff200e9080d18e355ea3403b24b8eab318bde1dab8c32d7ee780ded46e39056e625bf5f6bcca9b48fdfee7d + REF boost-1.79.0 + SHA512 3b0a26ec1ac9887610ebe68820c05324e1ac7a8ebff46333577b0d6571a512ffdccffc24124fa90f8cdf322bac8a66d4da523c8a872b0ff6e149fab4e921bdd3 HEAD_REF master ) diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json index cc7392a07722d4..6546cf01c60f34 100644 --- a/ports/boost-static-assert/vcpkg.json +++ b/ports/boost-static-assert/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-static-assert", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_assert", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-vcpkg-helpers" diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index 09fdc066312145..4c9acceea2f4b6 100644 --- a/ports/boost-static-string/portfile.cmake +++ b/ports/boost-static-string/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_string - REF boost-1.78.0 - SHA512 979d079e1b9749701200944f056747253dc0993f217b8dc7e4fb2c94c67d002037c465c0bdd1f939b24be5a51bbd4790f9d0d0e8c8da1d5bfa0349ba402aa953 + REF boost-1.79.0 + SHA512 bd94db596a4a8e4cdd1aca52fe75dbe46cd1242e67edee5f5fe236d39cb3368db7268ce9de6be5686da5fa19105c82616a3569b27c5c2e9974db9d18df73a8a7 HEAD_REF master ) diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json index c7e19e5cca235d..05c1baa5ff4e7f 100644 --- a/ports/boost-static-string/vcpkg.json +++ b/ports/boost-static-string/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-static-string", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-container-hash", diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index 46ab4c42da0b18..c6fc4875dcc2a4 100644 --- a/ports/boost-stl-interfaces/portfile.cmake +++ b/ports/boost-stl-interfaces/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stl_interfaces - REF boost-1.78.0 - SHA512 78b3afa7d9e781734ee4ea82b6e0f55834983899018b76a295d0b8a999a6aa3257ad8da40b730115abd2fa1ea2afa51e2b9e8e7d6c756521a8db863ebb3aaad0 + REF boost-1.79.0 + SHA512 e41e0465144ea65d10524f560a90b3a0ad1c60af8f5b679aba7e1bb12a09fccf9a4e271d6e1f6eff02ce7c444a21a8b9ea38709c5c6836ed4d7a35659756b0b8 HEAD_REF master ) diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json index 1cc10cdcf1fdc7..20b06ad49fe929 100644 --- a/ports/boost-stl-interfaces/vcpkg.json +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-stl-interfaces", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index 222f390ff48e4b..3b3a37f1b2506f 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -5,14 +5,11 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/system - REF boost-1.78.0 - SHA512 104574dd982281b7888a894feac4e76844b69c39cbe502ed62a6c75f1bb7fa6265f5212e152b3e3f1d739d216e3f02abd1077f07ff5681aa4dc9b24e88f08ab0 + REF boost-1.79.0 + SHA512 785aa2efff0c1e507ceb32a0d7f0c1034960ab5a87ebe45cf4acb5020d8cfcaa810ab3218d06e783ff7cafe661630fc67373d649865c6c0603b2be0c05b09b04 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-system requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json index 41f935ca950f93..df081b0f2bac44 100644 --- a/ports/boost-system/vcpkg.json +++ b/ports/boost-system/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-system", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost system module", "homepage": "https://github.com/boostorg/system", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index d48046ce02ae54..80ef29269d2f93 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -3,18 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.78.0 - SHA512 0a2611fee4d8f361f172375b21c9bc3825c105fdbd8a1b17364bb92654c631df508fb6a5d086c0aa3f8d5004b672ecf496f846b79eecba8e007dd581ebd47956 + REF boost-1.79.0 + SHA512 040eb3137f5842e65a4a607417410d09a118baf1f92645974ba65e9dae4d6b6e727f28954d1733a96a83978da8d742d050c7ffc3013afa5d936efc47841547b9 HEAD_REF master ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../predef/check/predef" "import ../predef/check/predef" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../predef/check/predef" + "import ../predef/check/predef" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/predef") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-test requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json index 9506fb481b79f4..323c0c08e74036 100644 --- a/ports/boost-test/vcpkg.json +++ b/ports/boost-test/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-test", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost test module", "homepage": "https://github.com/boostorg/test", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-algorithm", diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index 39db33463676fd..51a707590df990 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/thread - REF boost-1.78.0 - SHA512 567951a14780358d32ee2b9397df8261fc20bf2dfa55473dd163aa79c448c3ecff2a3799473e88742831f929d61813809efa6211c2dc43e808c94789bae6f443 + REF boost-1.79.0 + SHA512 96003963e8d24d5436cf093b89367a0ae979fc0f2860af0cd7819976261987559002b68b7fb17030eb635622609324148a127beb2e462079fe17b5a983550111 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-thread requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index e710c4430b67d4..7b0317dc3ca6da 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-thread", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", + "license": "BSL-1.0", "dependencies": [ "boost-algorithm", "boost-assert", diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index bf6b0bc81e8fc9..ad9650a61b3600 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/throw_exception - REF boost-1.78.0 - SHA512 055170a0434cd4b0059e052c6904030ef1e298a619fab65709f88c258df00d93af406f9f27923be8a73356d91f3f91331c08d77a48ea0f368e1ea26d23c5a1ca + REF boost-1.79.0 + SHA512 b8c278d9a77ac3ac86d810dbd242a7abeeba66283bfebb66e191aa24ba94672344cf1473fddb9d143fcda8a95cac3020693ba6c7e798cf27593bcbd179ddb50f HEAD_REF master ) diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json index 8b66324f499878..9a7979d881eff5 100644 --- a/ports/boost-throw-exception/vcpkg.json +++ b/ports/boost-throw-exception/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-throw-exception", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index 762dd996c6a325..a0d42b3ad66370 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/timer - REF boost-1.78.0 - SHA512 92feda5587a5a28f3ebb2902ac442e253d9497c80bef9310ddc452265eefedb03737504e06d7d60b7e5798509af092a15a37d435e357dd06b9d53e5c258c3e62 + REF boost-1.79.0 + SHA512 525f69db7b710a5d3f39b7c161e8ca60a72e48a17ccf0e31522cb5a0ddeac8ea03d9a41122b6ac25e8fbe11e28f563d8b52b7cd10817ff80bef597fe91860fe5 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-timer requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json index b29d8c9cf1b081..1155fb2c8abfed 100644 --- a/ports/boost-timer/vcpkg.json +++ b/ports/boost-timer/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-timer", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", + "license": "BSL-1.0", "dependencies": [ { "name": "boost-build", diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index 5ef5083c787a60..157c44291a2010 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tokenizer - REF boost-1.78.0 - SHA512 e29fb1eedd967c3a1450fad55054a9b07f866f5202058c900b31923127b78eb7a4b7f433a14b9eb6dc5e9bbde8f4be17e940f08f5df200a2df73e0c2132325d5 + REF boost-1.79.0 + SHA512 001c9dbfc415aad9156b6d7aa9450d31cc7b02746eba5d089c9932bc99996473793996045c30f5e17c1e2ea6698ad56c0093ba420e3d7861387dacf69974a8b8 HEAD_REF master ) diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json index 558c4712e05fa5..ff833e5c6c147d 100644 --- a/ports/boost-tokenizer/vcpkg.json +++ b/ports/boost-tokenizer/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-tokenizer", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index a9a785037a5cec..f1246ce5cc4d64 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tti - REF boost-1.78.0 - SHA512 6b2a3c02c7b8d0bb498a72784ef185a344536c8818a012c4fedeba65a8863fcb6559730ab5b398acba4801a6fb5f8c16c10b8e01bd89f814d0748e70fb91dd10 + REF boost-1.79.0 + SHA512 35c0be969efa9c3144efe4a9e903aacaa7469ec1f7319fd9ef8077e00e3b96557fa9a8aea5d77275cd59f7de434ccaaddbbf72c9f1c5634c98fe996144a24ec0 HEAD_REF master ) diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json index a3681e5b0d3a71..aaf16ee59e3b07 100644 --- a/ports/boost-tti/vcpkg.json +++ b/ports/boost-tti/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-tti", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-function-types", diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index ae3b005a46f931..1e3c1b8faccde6 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tuple - REF boost-1.78.0 - SHA512 354c9406001251793004fb07ae4f57ca61329eb90ec48f5446134425413fd755730981110d09c042cb85666ea629bad319088d6d6a2861e9153fb38a5c0998f9 + REF boost-1.79.0 + SHA512 ef121e99ca697dc9237e824871401d88cf3edbbc394897b58157b66de77feeea85f664e285d4c10c8a24ebbf8b4e1b361b1ff18cc9d764dc4a1b2eb06f17e3c9 HEAD_REF master ) diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json index b4d57cfa61d86e..369df13529b6bb 100644 --- a/ports/boost-tuple/vcpkg.json +++ b/ports/boost-tuple/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-tuple", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 33cbef353b8865..370219be6ca2cc 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_erasure - REF boost-1.78.0 - SHA512 6ef919c93f1bc1c3ff12feeb22371288dd3999b7b31aa4537fda86373bf1ab0e5f2cf5de888fedcbd462483ecb9020053a120040243acb1d71c42c4fdd8af619 + REF boost-1.79.0 + SHA512 6da75295b96a61064038c93cf30ac06670f1856e4c7ef0489a656dbcc8547e1ecf42b4e52dbd28f63e1547761af89a21fe953d7fdaf664d759d2b50aed7be7a5 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-type-erasure requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json index 8c04fc77341cc6..af4fc252cf88a5 100644 --- a/ports/boost-type-erasure/vcpkg.json +++ b/ports/boost-type-erasure/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-type-erasure", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index 92bc4df152a21a..e526b0ef9321a3 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_index - REF boost-1.78.0 - SHA512 d57bc583f6d601835c5887e99e46a388144d3a8074fa7bb01cee11bad4c5ec82f88722867448d01c4c6b899601b9675e6d45ab93f7c5c6416d3894e2fa3c2ebc + REF boost-1.79.0 + SHA512 47c5375c0a719f8d60be8d4550b35050e925eb1cb3b6e7825f6a9b1e8269d9983cf879882e03e1b25142871609e2b213e0a6a1dbafd7e5c27c6f0bee8c6d1588 HEAD_REF master ) diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json index 2589f3de3d2b20..6833f900c916e3 100644 --- a/ports/boost-type-index/vcpkg.json +++ b/ports/boost-type-index/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-type-index", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-container-hash", diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index b19ed2bbc43639..66749bd77862ad 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_traits - REF boost-1.78.0 - SHA512 27c10bec741e0ba9fcec3b49b4f62eeee798e41ca67b51aedf37ce8b360520a7640f7f7cf56def61d709dd7c5dbd32bdc2680b8fac5c52522b93f30e319991f4 + REF boost-1.79.0 + SHA512 ab325e4db39849667d2ce4dd3d7e77175e51909be9825d0edc102ef1edf75298744e5351c8891851e1cbc939064d352808a21753a7db429585ec34587be7374f HEAD_REF master ) diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json index 42f3e6980a17d7..0d269a244d57b2 100644 --- a/ports/boost-type-traits/vcpkg.json +++ b/ports/boost-type-traits/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-type-traits", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-static-assert", diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index 761cdb6cfdcb63..333a08f2e8e4ab 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/typeof - REF boost-1.78.0 - SHA512 cf0070cf2ed522138bc44136eee5bf08f0d1b9d1363442d7cae6f38978d536d099dc674708d7307ee4b9d9b934694aa40a11d9d57c1afe8b55f180302ad3cc7c + REF boost-1.79.0 + SHA512 ba0cfecb8c4ed750c46a9803350cc9e3e5a9493ef8b5f528003128039d57b13c10ec24ec31fa3e8d3d97a39a1d2381515ff340a471354a9fc8551268ca34aec5 HEAD_REF master ) diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json index 058de2f0ca114a..cacb60dc800069 100644 --- a/ports/boost-typeof/vcpkg.json +++ b/ports/boost-typeof/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-typeof", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-preprocessor", diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 3086b5abc70c4f..5cad78ae1c6def 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ublas - REF boost-1.78.0 - SHA512 1c4d94b31ce54a0a215c878654cf3a436f857913ec138a6801589b26527d97dc83dbd1908501328b3522d0d4ee18eaddace12187cb8a4146c6acb12dda1e2204 + REF boost-1.79.0 + SHA512 080ccf36bef22c72620f595b41e7bcaf9e900335ba662d5c605b03b710ce2ca0b64c9666b970331a2ecab870c3f8f14705defe7d7de57821b0f070a74ee89606 HEAD_REF master ) diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json index 866c06f5dcb760..2cb2c3fb2d8ced 100644 --- a/ports/boost-ublas/vcpkg.json +++ b/ports/boost-ublas/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-ublas", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", + "license": "BSL-1.0", "dependencies": [ "boost-compute", "boost-concept-check", diff --git a/ports/boost-uninstall/vcpkg.json b/ports/boost-uninstall/vcpkg.json index ceb10a10b9c2dc..95ebab60f997cf 100644 --- a/ports/boost-uninstall/vcpkg.json +++ b/ports/boost-uninstall/vcpkg.json @@ -1,5 +1,6 @@ { "name": "boost-uninstall", - "version": "1.78.0", - "description": "Internal vcpkg port used to uninstall Boost" + "version": "1.79.0", + "description": "Internal vcpkg port used to uninstall Boost", + "license": "MIT" } diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index 619ee451f9fea4..83cc9a0b270ebe 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/units - REF boost-1.78.0 - SHA512 192142782fbb800d6ae475acc3c639d18090e668efce8fd3c17353f8b6db5fa7da3814e5bb76b65c500963c4cc89d9d79bfed750efeb3a952d3510a601442d07 + REF boost-1.79.0 + SHA512 babab18e42d3279f0a8705bb081e45c23d5bedff478145df453040f9b14b4619bd03702c2d6513a244846dcc8c4ebc401b014cbfef7d7c7a2208c9b184cf734f HEAD_REF master ) diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json index a7e093ceb5d064..2b84fb167f25e2 100644 --- a/ports/boost-units/vcpkg.json +++ b/ports/boost-units/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-units", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost units module", "homepage": "https://github.com/boostorg/units", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index 4b51de2b20ebfd..b0e57b01fa2703 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/unordered - REF boost-1.78.0 - SHA512 49aa2d33e709919da03d2038eddaedaf6c91e18039e398bbc319ef6a798f425065b4e8e218b7d84c20c5409fd3968c43f6ea116e5bf77878880498f1a96548e6 + REF boost-1.79.0 + SHA512 2a4d3a0861c265cbd0fd9c366776d85a6204ab25383b924e4a596477f8d338aadcc5fd29c3dc4efc6b07ba3cd5c68deb3debc2a1ba6852d04fbf7e4910ac4ad6 HEAD_REF master ) diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json index 3c89abc0fa033c..6b56be8529969a 100644 --- a/ports/boost-unordered/vcpkg.json +++ b/ports/boost-unordered/vcpkg.json @@ -1,19 +1,18 @@ { "name": "boost-unordered", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", - "boost-container", "boost-container-hash", "boost-core", "boost-detail", "boost-move", "boost-predef", "boost-preprocessor", - "boost-smart-ptr", "boost-throw-exception", "boost-tuple", "boost-type-traits", diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index fb069dccbff152..116c900a8839b9 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/utility - REF boost-1.78.0 - SHA512 6c7a3bc70b3e11a2d5911eaf810e90a694ea87d8338b60218c8cdb8f732e7ee402abb41bd292e252b2c824428dad11cd0e8bfe5791843e172032e945b2a5ad44 + REF boost-1.79.0 + SHA512 f26aa277728231958a14b1d7522d72b7d511c419d72d08bd4df4fcd80d364f5abde98ad2f19e0fe2959524e0406e32c64bf6519d3f0a9d56ccab221b910a072e HEAD_REF master ) diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json index d7e947a1915717..767088c9794712 100644 --- a/ports/boost-utility/vcpkg.json +++ b/ports/boost-utility/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-utility", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index 9e723bd2573239..0ca1a9eb0edc35 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/uuid - REF boost-1.78.0 - SHA512 8f2dd8057d6e54d9540ed905018b167c5211380f3cc0b0a0fb4753ec74007f1ae6cfeea080e4cb7a073aaa0182a088ce7658cd4bcaf3ca8ae64bf711aa1a0a7b + REF boost-1.79.0 + SHA512 52a78598f7120906b03a6ecacf9997926c4e7f0f9696138f25ff75956b012010be5c1f212fb498b064cd94b420182857a17a750558758d82dad4b44d1bbeba47 HEAD_REF master ) diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json index dd62596341977e..22b368a897b5b3 100644 --- a/ports/boost-uuid/vcpkg.json +++ b/ports/boost-uuid/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-uuid", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index b57faca796e20d..e4362294e3f1c7 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant - REF boost-1.78.0 - SHA512 456ad20b949a49622cd6ccaf2be896b2ca976b90535f95e1c59efc27e7a02b9c56b6843464586f065c889be149d2afae80368e810a36aa5cd2314e2e64ca1842 + REF boost-1.79.0 + SHA512 e63699023a8d367fafd8197887bb12c998e25685db63c61ba06c32b628e55c7eca37692d95995875adfe47586bd79598e641ae284c585af10f050809f6118a38 HEAD_REF master ) diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json index dc704f13ceb4aa..99b25d5bd1e665 100644 --- a/ports/boost-variant/vcpkg.json +++ b/ports/boost-variant/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-variant", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index 31cb580cd6afa6..bfd98dfd8dfecb 100644 --- a/ports/boost-variant2/portfile.cmake +++ b/ports/boost-variant2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant2 - REF boost-1.78.0 - SHA512 bcfd19db60eab579a80b5cfd49bfc70ac325dfcf45b0c4a759abd943b6bed22351cfd1eea5e828dc32d516ca2af2ade5ac2621f01b22596e5c072eade778119a + REF boost-1.79.0 + SHA512 f4c2f2eaf9c285b747067aaa23ba9937d9bcaff1e1b9aaecdf347d0466775ebfe23aa36b16d1d70969604f81ba9762224cb59fe68c9e35d5a34f6184c7b92948 HEAD_REF master ) diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json index 5493d71c73de00..fc6b8f5c02ee54 100644 --- a/ports/boost-variant2/vcpkg.json +++ b/ports/boost-variant2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-variant2", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-vcpkg-helpers/portfile.cmake b/ports/boost-vcpkg-helpers/portfile.cmake index 3737f927382f0a..922531d1249a19 100644 --- a/ports/boost-vcpkg-helpers/portfile.cmake +++ b/ports/boost-vcpkg-helpers/portfile.cmake @@ -1,6 +1,6 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -set(BOOST_VERSION 1.78.0) +set(BOOST_VERSION 1.79.0) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake diff --git a/ports/boost-vcpkg-helpers/vcpkg.json b/ports/boost-vcpkg-helpers/vcpkg.json index 8987cc0bad5b6e..121a55a4e95609 100644 --- a/ports/boost-vcpkg-helpers/vcpkg.json +++ b/ports/boost-vcpkg-helpers/vcpkg.json @@ -1,8 +1,8 @@ { "name": "boost-vcpkg-helpers", - "version": "1.78.0", - "port-version": 1, + "version": "1.79.0", "description": "Internal vcpkg port used to modularize Boost", + "license": "MIT", "dependencies": [ "boost-uninstall" ] diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index 259a0fc2928207..f36444d8ef9b4f 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/vmd - REF boost-1.78.0 - SHA512 344353e4a43957df0b1be78e5de8dc51928d98c1ed940e24efd506ef5574895b63b67149f335657dae781e4ea7ee35ae53b4d41aaee89418ce93b4d755e55c3d + REF boost-1.79.0 + SHA512 a224420e17b5dfc39d5928e35628b57aabba00619dfd17988345aae6595610253b518e35bdd04fcb286a2aa0627ca3c4bb8c2fb2260351865f81d7493ff19358 HEAD_REF master ) diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json index 815a1870fb83b2..fddb03b94f8a0f 100644 --- a/ports/boost-vmd/vcpkg.json +++ b/ports/boost-vmd/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-vmd", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", + "license": "BSL-1.0", "dependencies": [ "boost-preprocessor", "boost-vcpkg-helpers" diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index afd8329f13f563..b9467a31d2c13f 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -3,14 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/wave - REF boost-1.78.0 - SHA512 4de422e47415d4abff3ef8002a9489ddf10578fa51bb681e273b585acea5e3d055a12a084813f37103765d9372d1a0cf9a43fb224fb54cc76116f17d28193719 + REF boost-1.79.0 + SHA512 d573202b2eee3d2810c0cbbbffdb61dea957f8a4be33755a2e797fd23ae531a61a66a3b2cf1fa1d114781b72d280db8a45e350c437dc57d9bed1954c596a83c2 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-wave requires a newer version of vcpkg in order to build.") -endif() +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json index ae2613755ece1b..cff18d82dca792 100644 --- a/ports/boost-wave/vcpkg.json +++ b/ports/boost-wave/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-wave", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-assert", @@ -17,6 +18,7 @@ "name": "boost-filesystem", "platform": "!uwp" }, + "boost-format", "boost-iterator", "boost-lexical-cast", { diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index 8c75df590be10c..23948e33be69c6 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/winapi - REF boost-1.78.0 - SHA512 431d0091574e857f895a9b8659a474e5aaf7ba0e80f0a15da445f2ed3612e192bdd0763e024a62ad94f8a0efbfadbd00c7caf20836409fb46fb0dc1520236dd6 + REF boost-1.79.0 + SHA512 c226df34607ee351715e66c28b2370aec12fa0df4505cd0e8ca3de96a61677ba86a662b292c4090b50fc28bb4629a64208155923393bb6b557dfef267e80db78 HEAD_REF master ) diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json index 9af116ed27d942..96fc3a87756024 100644 --- a/ports/boost-winapi/vcpkg.json +++ b/ports/boost-winapi/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-winapi", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-predef", diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 776242d1a079d6..082e26372a46de 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/xpressive - REF boost-1.78.0 - SHA512 9d9235e29d6ed07ab3ed88aedc8736093c93fad3507360fb506c7ed6cb5e9cdf115d6a2ebf5a1c5022189329b172b79e5dc64d63b6a0edea94c25820d3c138d9 + REF boost-1.79.0 + SHA512 b7d5504b99b9c3007a34a82cf4d8f061955b1c197a1eb7c9245166ece395c4620889e6e9b509fd0b7caff6d5d30bd36ee8eb928f6a069399845200785dd51b23 HEAD_REF master ) diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json index 11f75889f6cab1..de6691c040a6bb 100644 --- a/ports/boost-xpressive/vcpkg.json +++ b/ports/boost-xpressive/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-xpressive", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index c8bf4bd74f3e3c..fe5d338f6280df 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/yap - REF boost-1.78.0 - SHA512 7cb6c90ad0d7c1303dfaea14ddc6cafd3343b93d00f41ece57fbc38ae5ee923fc5f0abe51eb28d1b336b6f66a5b7778b063e5583738ef409acffb4253e831a8d + REF boost-1.79.0 + SHA512 df10ca51af90cac70952f94265d09e14b499aa6d2c89977d93d202347bf497758229b98bad51e43b043957d7ae11801a2843aeb6f740f526adddda0a63404d1b HEAD_REF master ) diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json index 734cec34a858cf..ad460bb2a843bf 100644 --- a/ports/boost-yap/vcpkg.json +++ b/ports/boost-yap/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-yap", - "version": "1.78.0", + "version": "1.79.0", "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", + "license": "BSL-1.0", "dependencies": [ "boost-hana", "boost-preprocessor", diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index d97ca5c2a8c61e..dd3c22765ff80d 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost", - "version": "1.78.0", + "version": "1.79.0", "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", + "license": "BSL-1.0", "dependencies": [ "boost-accumulators", "boost-algorithm", diff --git a/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch b/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch new file mode 100644 index 00000000000000..f189e8777fe8bd --- /dev/null +++ b/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch @@ -0,0 +1,60 @@ +From 5bd55f11e1b6cc2cb08a0001f9c77f56fb8ac649 Mon Sep 17 00:00:00 2001 +From: Kevin Lin +Date: Mon, 18 Apr 2022 12:17:40 -0700 +Subject: [PATCH] thrift/compiler/compiler.cc: Include fstream to fix + compatibility with Boost 1.79.0 (#494) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Summary: +This patch fixes fbthrift build compatibility with Boost 1.79.0. The symptom is the following compiler error: + +``` +/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc: In function ā€˜bool apache::thrift::compiler::{anonymous}::generate(const apache::thrift::compiler::{anonymous}::gen_params&, apache::thrift::compiler::t_program*, std::set >&)ā€™: +/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc:331:19: error: aggregate ā€˜std::ofstream genfileā€™ has incomplete type and cannot be defined + 331 | std::ofstream genfile; + | ^~~~~~~ +make[2]: *** [thrift/compiler/CMakeFiles/thrift1.dir/build.make:76: thrift/compiler/CMakeFiles/thrift1.dir/compiler.cc.o] Error 1 +make[1]: *** [CMakeFiles/Makefile2:253: thrift/compiler/CMakeFiles/thrift1.dir/all] Error 2 +make: *** [Makefile:152: all] Error 2 +``` + +To reproduce, install the standard fbthrift dependencies, but with Boost 1.79.0 compiled from source, followed by: + +``` +$ mkdir build && cd build +$ cmake -DCMAKE_BUILD_TYPE=RELEASE CXXFLAGS="-fPIC" .. +$ make -j +``` + +Adding an include on `fstream` allows for the build to complete successfully. + +Pull Request resolved: https://github.com/facebook/fbthrift/pull/494 + +Reviewed By: iahs + +Differential Revision: D35709922 + +Pulled By: vitaut + +fbshipit-source-id: 96f0764c7b33047acb7b5ad26b21076757aaa5e7 +--- + thrift/compiler/compiler.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/thrift/compiler/compiler.cc b/thrift/compiler/compiler.cc +index 721ff7dbf3..da944c2950 100644 +--- a/thrift/compiler/compiler.cc ++++ b/thrift/compiler/compiler.cc +@@ -32,6 +32,7 @@ + #include + #endif + #include ++#include + + #include + #include +-- +2.34.1.windows.1 + diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 3cafd5feb91862..cd9252c65b06f5 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( REF v2022.03.21.00 SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab HEAD_REF master + PATCHES 0001-fix-compatibility-with-boost-1.79.0.patch ) vcpkg_cmake_configure( diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 8e95527876dc25..76699b09f81fb8 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fbthrift", "version-string": "2022.03.21.00", + "port-version": 1, "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 7c71e7ba27a635..41ab9ab78ebdf9 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.78.0", + $version = "1.79.0", $portsDir = $null ) @@ -24,7 +24,6 @@ else { # Clear this array when moving to a new boost version $portVersions = @{ #e.g. "boost-asio" = 1; - "boost-vcpkg-helpers" = 1; } $portData = @{ @@ -168,6 +167,7 @@ function GeneratePortManifest() { [string]$PortName, [string]$Homepage, [string]$Description, + [string]$License, $Dependencies = @() ) $manifest = @{ @@ -176,6 +176,9 @@ function GeneratePortManifest() { "homepage" = $Homepage "description" = $Description } + if ($License) { + $manifest["license"] += $License + } if ($portData.Contains($PortName)) { $manifest += $portData[$PortName] } @@ -230,6 +233,7 @@ function GeneratePort() { -PortName $portName ` -Homepage "https://github.com/boostorg/$Library" ` -Description "Boost $Library module" ` + -License "BSL-1.0" ` -Dependencies $Dependencies $portfileLines = @( @@ -275,9 +279,6 @@ function GeneratePort() { if ($NeedsBuild) { $portfileLines += @( - "if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)" - " message(FATAL_ERROR `"$portName requires a newer version of vcpkg in order to build.`")" - "endif()" "include(`${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" ) # b2-options.cmake contains port-specific build options @@ -564,6 +565,7 @@ if ($updateServicePorts) { -PortName "boost" ` -Homepage "https://boost.org" ` -Description "Peer-reviewed portable C++ source libraries" ` + -License "BSL-1.0" ` -Dependencies $boostPortDependencies Set-Content -LiteralPath "$portsDir/boost/portfile.cmake" ` @@ -574,18 +576,21 @@ if ($updateServicePorts) { # Generate manifest files for boost-uninstall GeneratePortManifest ` -PortName "boost-uninstall" ` - -Description "Internal vcpkg port used to uninstall Boost" + -Description "Internal vcpkg port used to uninstall Boost" ` + -License "MIT" # Generate manifest files for boost-vcpkg-helpers GeneratePortManifest ` -PortName "boost-vcpkg-helpers" ` -Description "Internal vcpkg port used to modularize Boost" ` + -License "MIT" ` -Dependencies @("boost-uninstall") # Generate manifest files for boost-modular-build-helper GeneratePortManifest ` -PortName "boost-modular-build-helper" ` -Description "Internal vcpkg port used to build Boost libraries" ` + -License "MIT" ` -Dependencies @("boost-uninstall", "vcpkg-cmake") # Generate manifest files for boost-build @@ -593,6 +598,7 @@ if ($updateServicePorts) { -PortName "boost-build" ` -Homepage "https://github.com/boostorg/build" ` -Description "Boost.Build" ` + -License "BSL-1.0" ` -Dependencies @("boost-uninstall") # Update Boost version in CMake files diff --git a/scripts/boost/post-source-stubs/atomic.cmake b/scripts/boost/post-source-stubs/atomic.cmake index 373b2a4eafb3aa..5c524cd7037cc1 100644 --- a/scripts/boost/post-source-stubs/atomic.cmake +++ b/scripts/boost/post-source-stubs/atomic.cmake @@ -1,7 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" - _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/context.cmake b/scripts/boost/post-source-stubs/context.cmake index 48e4e5eecda462..90080695f2389e 100644 --- a/scripts/boost/post-source-stubs/context.cmake +++ b/scripts/boost/post-source-stubs/context.cmake @@ -1,4 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/fiber.cmake b/scripts/boost/post-source-stubs/fiber.cmake index 7a2f4acf51bddd..90080695f2389e 100644 --- a/scripts/boost/post-source-stubs/fiber.cmake +++ b/scripts/boost/post-source-stubs/fiber.cmake @@ -1,4 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/json.cmake b/scripts/boost/post-source-stubs/json.cmake index bea05e660cffc4..fae13263b4ca54 100644 --- a/scripts/boost/post-source-stubs/json.cmake +++ b/scripts/boost/post-source-stubs/json.cmake @@ -1,4 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/log.cmake b/scripts/boost/post-source-stubs/log.cmake index cb3cb67fd63d7a..9f4656d666d9d8 100644 --- a/scripts/boost/post-source-stubs/log.cmake +++ b/scripts/boost/post-source-stubs/log.cmake @@ -2,11 +2,8 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") string(REPLACE " @select-arch-specific-sources" "#@select-arch-specific-sources" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") - -file(READ ${SOURCE_PATH}/build/log-arch-config.jam _contents) -string(REPLACE +vcpkg_replace_string("${SOURCE_PATH}/build/log-arch-config.jam" "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" - _contents "${_contents}") -file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}") +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/nowide.cmake b/scripts/boost/post-source-stubs/nowide.cmake index 7a2f4acf51bddd..90080695f2389e 100644 --- a/scripts/boost/post-source-stubs/nowide.cmake +++ b/scripts/boost/post-source-stubs/nowide.cmake @@ -1,4 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/scripts/boost/post-source-stubs/test.cmake b/scripts/boost/post-source-stubs/test.cmake index 29ff6947ffd4a4..6e8ee9738de06d 100644 --- a/scripts/boost/post-source-stubs/test.cmake +++ b/scripts/boost/post-source-stubs/test.cmake @@ -1,4 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../predef/check/predef" "import ../predef/check/predef" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../predef/check/predef" + "import ../predef/check/predef" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/predef") diff --git a/scripts/boost/post-source-stubs/wave.cmake b/scripts/boost/post-source-stubs/wave.cmake new file mode 100644 index 00000000000000..90080695f2389e --- /dev/null +++ b/scripts/boost/post-source-stubs/wave.cmake @@ -0,0 +1,5 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json index 288b505f6ae67a..99ca3f1b905844 100644 --- a/versions/b-/boost-accumulators.json +++ b/versions/b-/boost-accumulators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80a1e83cff3df70e006907ccc20851f7086f2dab", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "070cbab1861e2a57e6c39ac1a8dcf51ad9edafea", "version": "1.78.0", diff --git a/versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json index 2ad310fa5509bc..6878d725213155 100644 --- a/versions/b-/boost-algorithm.json +++ b/versions/b-/boost-algorithm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20d7a665b493f8b9816d56125e83928e41dcaa98", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "eca5eb57117afd2c43e7f00ed6908dabb254b46e", "version": "1.78.0", diff --git a/versions/b-/boost-align.json b/versions/b-/boost-align.json index a4e6a9979dc678..48a67516a4077b 100644 --- a/versions/b-/boost-align.json +++ b/versions/b-/boost-align.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bc0b7d28ff47bf04454dde5d3ab3eeed5a113b2", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1733cf10f4a598f29af7380a6b8226abdeeb3f75", "version": "1.78.0", diff --git a/versions/b-/boost-any.json b/versions/b-/boost-any.json index 2d0d743e556afc..a8d61d37e18155 100644 --- a/versions/b-/boost-any.json +++ b/versions/b-/boost-any.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6382a90fffe32ec65147d579e28f05604eaeef46", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a28a3fd1ebf198563ae9e200dcf36f1fae3b1482", "version": "1.78.0", diff --git a/versions/b-/boost-array.json b/versions/b-/boost-array.json index 6f804d1f46a998..32a37364a7d653 100644 --- a/versions/b-/boost-array.json +++ b/versions/b-/boost-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11a6869eb0c7b2efa3e92b2c36795ef9873c6537", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8278959d326c44d846d660462556ab48361054f9", "version": "1.78.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index fbc9e39a33ea46..58ec3ba9bd024e 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39b1b86ce2c331ab31d001308b6a71fc6fbebf5c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2fcf35cb168a6a2aa56208a83fb71bfdf88672b6", "version": "1.78.0", diff --git a/versions/b-/boost-assert.json b/versions/b-/boost-assert.json index 1d6e40c26d71c2..9dc4a2e8af4a79 100644 --- a/versions/b-/boost-assert.json +++ b/versions/b-/boost-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e4adae40df44f3927978bba397b60f18ad8e919", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "81b29f057d38140b3d812094999772d2d5263d4e", "version": "1.78.0", diff --git a/versions/b-/boost-assign.json b/versions/b-/boost-assign.json index 0a00d2f35ec1fe..761268229659fb 100644 --- a/versions/b-/boost-assign.json +++ b/versions/b-/boost-assign.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "755ca06375958012e688e91d8ad79c40b20b91df", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "cb2a0606569a77b0de8264bd55d015698f413dd7", "version": "1.78.0", diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index b9d48b3005c8b6..f6fc8a96050d58 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba96ddc357592c3644f666fbc68d052ad3f0f397", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f516c90064f41a11fe7627ab6a8ac281455f55cc", "version": "1.78.0", diff --git a/versions/b-/boost-beast.json b/versions/b-/boost-beast.json index 6c803bf8687048..408148f5ec11c2 100644 --- a/versions/b-/boost-beast.json +++ b/versions/b-/boost-beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb0a62ab1fd80ff0dd756ad89cbc367b2f7c6df0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5cb4b3da49532ceefefdb4465c74c3490f6c40f7", "version": "1.78.0", diff --git a/versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json index b4115b00d0ac91..b58cc633528f50 100644 --- a/versions/b-/boost-bimap.json +++ b/versions/b-/boost-bimap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4bad70254f12ab9642e3ee96980d834a485af5e9", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d376fb04582a3ca0b6d14f991ae05965c7d0961a", "version": "1.78.0", diff --git a/versions/b-/boost-bind.json b/versions/b-/boost-bind.json index a994e35066e7cd..2cfc8ee2585103 100644 --- a/versions/b-/boost-bind.json +++ b/versions/b-/boost-bind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c27b66c8e195ce97685c409c0821f907bae83d80", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "165c77e05b1d413a600f66135276ba7e727ebc35", "version": "1.78.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index 140b50fd32d20b..be9fe150c2111f 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba4fbdacb5988e8f753bf2098ec257453c50a27a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "cf970c17a4bf6d59deff7ce7e7eb98cec74b544a", "version": "1.78.0", diff --git a/versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json index ed346a5b63cf1e..a13fd96481df79 100644 --- a/versions/b-/boost-callable-traits.json +++ b/versions/b-/boost-callable-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3fb5022c86bf300e6a55e8ecef2ba41e9f6a39a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c65c1b67763ed69490e43430bc860493ccc19274", "version": "1.78.0", diff --git a/versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json index 244624ebf699aa..3d99e0947a5628 100644 --- a/versions/b-/boost-chrono.json +++ b/versions/b-/boost-chrono.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd168284e43a057a5775444c07f11f99a96053c0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d08ea7bd6fb471393e10507f0b6d27d045868f3e", "version": "1.78.0", diff --git a/versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json index c05cb13cf5e1c0..d3e0c260f25612 100644 --- a/versions/b-/boost-circular-buffer.json +++ b/versions/b-/boost-circular-buffer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8a97f3e2854ffb2064635bada5cfac2230a7590", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "239a4eff939919bbabf11914dbb656992e4e26ae", "version": "1.78.0", diff --git a/versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json index d3da45592b3ef2..3c8e013836b5df 100644 --- a/versions/b-/boost-compatibility.json +++ b/versions/b-/boost-compatibility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bddfe133f937df01c2a18b9fcbd078538c195715", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ee3bf146536f03c976c00fa704664f0576241f15", "version": "1.78.0", diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json index 85805ba2a5fd8b..7f0f081ea1c140 100644 --- a/versions/b-/boost-compute.json +++ b/versions/b-/boost-compute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4c84dc32e2d683a910deafe8df7631c36ee8195", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "02e813bc50d95bc901ba994faff7658f1ee5664b", "version": "1.78.0", diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index 738dc3b3115c3b..7b5417e83d70fe 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "493a1b5ae991a9c7b2643e649329de16bcd0fa48", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d92ec4f75e3ca2046f7cc6bd42e394aa642dea7b", "version": "1.78.0", diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index 0da4e3e0048ace..ad043d79466eab 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22c6532dcc9c24fd85febb93dc936e68c031043a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "b4958f142255c3aa14f1f39d04edcc12b6262745", "version": "1.78.0", diff --git a/versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json index c194451b1223c3..77aea1a85138c5 100644 --- a/versions/b-/boost-container-hash.json +++ b/versions/b-/boost-container-hash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09168c62619e569c7b6b2799aa39c361a1afff22", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5c9a0efa908886517e39510cffaebe78df8bac17", "version": "1.78.0", diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json index 60a39b3ae937dc..74fd3ce16c5232 100644 --- a/versions/b-/boost-container.json +++ b/versions/b-/boost-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c29fd09bc12ad31bd796ba90682fcbd242090cc0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "cba0ae7cefffcca3cc1a0aec45ec07a66f6cc413", "version": "1.78.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index e09838415f0b35..d809accb8c047a 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7abfa63f40d05e79743c416050ed97f8351d3c37", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c279fc4862dbbc9b4c685d16d1abee7200f9dff4", "version": "1.78.0", diff --git a/versions/b-/boost-contract.json b/versions/b-/boost-contract.json index 435780a5471537..e39983cd76407d 100644 --- a/versions/b-/boost-contract.json +++ b/versions/b-/boost-contract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a07f53ab73b8b844f20b487aa039e4e019538d47", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "9fb4b8408822e7921fe3d07ba66184df6b5f16a6", "version": "1.78.0", diff --git a/versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json index 97703b69a79b1f..0322dfdefd9486 100644 --- a/versions/b-/boost-conversion.json +++ b/versions/b-/boost-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e3552c53e2ef9bcfa7159f2f06079c30dfa53ac", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ed01d578d9964b2be3619cd7e96c6f65dc206275", "version": "1.78.0", diff --git a/versions/b-/boost-convert.json b/versions/b-/boost-convert.json index a85859c5fbd380..d86c9644bce981 100644 --- a/versions/b-/boost-convert.json +++ b/versions/b-/boost-convert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a6958bd02a806df5b7840c7a62908ca3d5316fe", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d1315f49ac5c357e8a427c97dee2faa3655c70f3", "version": "1.78.0", diff --git a/versions/b-/boost-core.json b/versions/b-/boost-core.json index 320246ca1eb9d3..8819732c04169b 100644 --- a/versions/b-/boost-core.json +++ b/versions/b-/boost-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a22eddd8a3121063f8ef94eb4e0ae64021d0369a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "b6d811257b985253c87570f25a75957689b2b895", "version": "1.78.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index c3215b32702b74..69ac9a292ac70d 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b953ff17be4b4da2bb6b898c80b12c4185b3a821", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d462e16750c6769375391d1e1c084999000cb324", "version": "1.78.0", diff --git a/versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json index e5073ccf0692d5..712571fc917610 100644 --- a/versions/b-/boost-coroutine2.json +++ b/versions/b-/boost-coroutine2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f8442e8490a2ad005762566a768ca944e754466", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d035a00380a7bcddb6c22f69c4743af4f2122a38", "version": "1.78.0", diff --git a/versions/b-/boost-crc.json b/versions/b-/boost-crc.json index 2956a402b65979..b7f476b27200bf 100644 --- a/versions/b-/boost-crc.json +++ b/versions/b-/boost-crc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fd0f57c0b02c713c53ca56f341b904557fd257a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c1772d15f5d08e1f5e3a263c30869aef88a76085", "version": "1.78.0", diff --git a/versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json index 1792e3793dd393..96489a2e0f35c7 100644 --- a/versions/b-/boost-date-time.json +++ b/versions/b-/boost-date-time.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc3460f55739fad6ef0e548bc084bade32985683", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "76bf565e940322a7d3110edf1b18fb4bfd8a1ab0", "version": "1.78.0", diff --git a/versions/b-/boost-describe.json b/versions/b-/boost-describe.json index 46de02237184ea..8d694a95c33de7 100644 --- a/versions/b-/boost-describe.json +++ b/versions/b-/boost-describe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f79ac02e597506f15b55a0445e9a36ed6cb22632", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e08134869cca3b2d75247c226637b24438c489c2", "version": "1.78.0", diff --git a/versions/b-/boost-detail.json b/versions/b-/boost-detail.json index 6b3a3e4e24b8ec..e57e4836f866be 100644 --- a/versions/b-/boost-detail.json +++ b/versions/b-/boost-detail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65c1cfff48ea4ead86b7db6d20401fbfef4e1022", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "61c65e46d0bf619e44cf343d734dda6987f53005", "version": "1.78.0", diff --git a/versions/b-/boost-dll.json b/versions/b-/boost-dll.json index 465bbbdc61872b..d626078ac967d3 100644 --- a/versions/b-/boost-dll.json +++ b/versions/b-/boost-dll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0243143e2c2bea8e3579aadfc735b56c40ad5491", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1afc8f9b224cf9a2a1846073dffd93defdb46028", "version": "1.78.0", diff --git a/versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json index 80126c8dd74500..36aaeae20b4725 100644 --- a/versions/b-/boost-dynamic-bitset.json +++ b/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2ea8d91791c627d016c69aa73d36d3622ba0df0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e137dc4091824493eec9e6f9734caa71eb069874", "version": "1.78.0", diff --git a/versions/b-/boost-endian.json b/versions/b-/boost-endian.json index 7d662844753fc8..967e0193cf9df5 100644 --- a/versions/b-/boost-endian.json +++ b/versions/b-/boost-endian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24a5162a544f251df6387a1d5bb70ba53497e4c3", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "87ed62b8b7fba9caadc1ffff99abede02e0598f2", "version": "1.78.0", diff --git a/versions/b-/boost-exception.json b/versions/b-/boost-exception.json index e6dc6d95054715..b7ea3a572caa51 100644 --- a/versions/b-/boost-exception.json +++ b/versions/b-/boost-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d7250e9806392fc38643fb7c069ba18fcec2350", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "02b0e67c7d9b5e26b1bccef1fba3152fe7ead595", "version": "1.78.0", diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index f0c0bea460b1f7..8d4b033424d904 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14418cb69ecedbf80d7fe87779fc7028db31eefc", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "7a37b52940402701703a4b91f1360b414f6afe02", "version": "1.78.0", diff --git a/versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json index 833f3351cf3ec5..740eb6d029e195 100644 --- a/versions/b-/boost-filesystem.json +++ b/versions/b-/boost-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ad60cdb4b5114cda754f4b15d96d72c9615b271", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f7f7b3bf671f25f6234f81de59fb5dc169ea2480", "version": "1.78.0", diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json index 0b7f00a3375500..1779fc7fd13f65 100644 --- a/versions/b-/boost-flyweight.json +++ b/versions/b-/boost-flyweight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6e8af8c3f7450a4e32ca807cabfb4197ac7a0a7", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "899fef7cf017fd090f2e96146a425e7376320a4e", "version": "1.78.0", diff --git a/versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json index 992d111476bcaa..76f32980d20b4b 100644 --- a/versions/b-/boost-foreach.json +++ b/versions/b-/boost-foreach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8948df8fb3d54f6bcca0c5fee45f13406683a3e", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "468a08373a9339026a955a01faf3a4bc6fe0ab11", "version": "1.78.0", diff --git a/versions/b-/boost-format.json b/versions/b-/boost-format.json index 7b6e6ac59241b5..a75b116996fa08 100644 --- a/versions/b-/boost-format.json +++ b/versions/b-/boost-format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "365fbda5a5fe624367c049e4c118945c0142d0eb", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "691157617974f33e41ef5ea7954d590a8f12be5a", "version": "1.78.0", diff --git a/versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json index 5a33d677fb7b98..0723ae037aa25e 100644 --- a/versions/b-/boost-function-types.json +++ b/versions/b-/boost-function-types.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53ad331d5cdedab7b40eebaf15d9f8081a5d9eed", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "94d4dd365c29ad1be2d148f3c4cf7857e3ac1edd", "version": "1.78.0", diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index 6f7c0e4f5505fd..6dc73d2957ff08 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7057b960d6b790eb30f51ef17d67aa958230e100", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "74d9b1e1e9951fe6f6f4eeccddf8c83ff1280462", "version": "1.78.0", diff --git a/versions/b-/boost-functional.json b/versions/b-/boost-functional.json index 5add7a0fda5ea5..8b38d5686aafc7 100644 --- a/versions/b-/boost-functional.json +++ b/versions/b-/boost-functional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8fd2c72eb4f3c8d501a44f7a5f8ecfe608cc3b4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5c46623f2b1557b35079a69ea27aa495f8765f26", "version": "1.78.0", diff --git a/versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json index 86e7f184275148..1b80aa7806c804 100644 --- a/versions/b-/boost-fusion.json +++ b/versions/b-/boost-fusion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10c27fdbefb33b57367582e1a8f262db9d94d807", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a7c7b4de2e38c3436c0781ccf4b56567b8c2ae61", "version": "1.78.0", diff --git a/versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json index 9fb480e11bb0af..3128d3790b9879 100644 --- a/versions/b-/boost-geometry.json +++ b/versions/b-/boost-geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f05a5d0f5a5889edecadab0ee49a1c13dfde0898", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a4c2fd98bc285d97c11c99f5f631481fb534efc4", "version": "1.78.0", diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index 49e0d509d9ae6f..14d903f5b78772 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe36550466af98298217643a09ab451aa6a0b4c7", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "670859cf36c60562fb5036af7d087df936234c27", "version": "1.78.0", diff --git a/versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json index c13bca55ec42ea..44af13bcade298 100644 --- a/versions/b-/boost-graph-parallel.json +++ b/versions/b-/boost-graph-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a95f6dea34a2262e22d4b94404afad68c603a8b", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "199f9b8209f287e7e9865e07b074d618c28db410", "version": "1.78.0", diff --git a/versions/b-/boost-graph.json b/versions/b-/boost-graph.json index d529ceb120f21b..5716ded7bafdfb 100644 --- a/versions/b-/boost-graph.json +++ b/versions/b-/boost-graph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0281e8f5b61dbeb2daf3b3634744daf9c58cdd2", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f7b342391819ed511280f8ef46b7d52a399f2648", "version": "1.78.0", diff --git a/versions/b-/boost-hana.json b/versions/b-/boost-hana.json index 4f74efb60fb434..1474f0c2ec093a 100644 --- a/versions/b-/boost-hana.json +++ b/versions/b-/boost-hana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2dda9ed4c338faef5a98ec4f713b71976c4de9aa", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "3ff9854bbad812cd23a4c79b500aa8349fbed192", "version": "1.78.0", diff --git a/versions/b-/boost-heap.json b/versions/b-/boost-heap.json index df68d02dfeb5d7..4e3f1cd8119a76 100644 --- a/versions/b-/boost-heap.json +++ b/versions/b-/boost-heap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3be349686d19ee7b297058dfa2d8177bf22cbe9b", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "76c4ec7815b1660fca1c1efd9b9c0c2f034ba4bb", "version": "1.78.0", diff --git a/versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json index 1bd8b80354d8ca..7c7683eb23fc7a 100644 --- a/versions/b-/boost-histogram.json +++ b/versions/b-/boost-histogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba0d99a55988d554d24baf0ae9b8dbd39950be11", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "223b95e57f20afec67e891aa7fc884e6ac492f6f", "version": "1.78.0", diff --git a/versions/b-/boost-hof.json b/versions/b-/boost-hof.json index 48edaf0520846c..7e4a09d8aba712 100644 --- a/versions/b-/boost-hof.json +++ b/versions/b-/boost-hof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4c1a946a0dc6f554cc76efa7ff4636ff4aabb08", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "899745af9cdd07134ebe4b4223eb749b7efa5be4", "version": "1.78.0", diff --git a/versions/b-/boost-icl.json b/versions/b-/boost-icl.json index 1e6a03f0d9398d..5ad8440d844ef9 100644 --- a/versions/b-/boost-icl.json +++ b/versions/b-/boost-icl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ce9f45501ca2ac3a6ff4f2c42c69f1b104df70c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "074322ef21b89c54d87c0446716221c3c20544a8", "version": "1.78.0", diff --git a/versions/b-/boost-integer.json b/versions/b-/boost-integer.json index 289dd19348dfce..cd0ee4811667db 100644 --- a/versions/b-/boost-integer.json +++ b/versions/b-/boost-integer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7970a7ba822ac5e6a8a9f98ba5ee3631b3ccff3c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "18f2f923e2a8d4f026787eb8626def460dd2ab6a", "version": "1.78.0", diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json index ce9f23914b2296..8f15d55a10325a 100644 --- a/versions/b-/boost-interprocess.json +++ b/versions/b-/boost-interprocess.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "274a988e2a03f43beba2efb240692e0af456e8ee", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "220049a8136b65045c04fc13aea3a259e8f4f2b0", "version": "1.78.0", diff --git a/versions/b-/boost-interval.json b/versions/b-/boost-interval.json index 1e3b05ce246463..3ab3b2a5bb2e46 100644 --- a/versions/b-/boost-interval.json +++ b/versions/b-/boost-interval.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f196074b225959b27fb96794ffc54db0293efa24", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5786ba8a3bb499958bbe8ebbc58c6bb4e4c3eb91", "version": "1.78.0", diff --git a/versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json index 4849a39d53ef04..d6038d4055f083 100644 --- a/versions/b-/boost-intrusive.json +++ b/versions/b-/boost-intrusive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5162285659ad371e022c242481e20414c8b23e2b", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "351ad9aa5db5bf50ab87a390a69d5df1d2b41ab7", "version": "1.78.0", diff --git a/versions/b-/boost-io.json b/versions/b-/boost-io.json index 9c85f7cd6330da..71654790a2bcec 100644 --- a/versions/b-/boost-io.json +++ b/versions/b-/boost-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a248d3f95d95973f63b5be92c81747165ca0319c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "33cc953c79a65bcdfdd7b55a757bf3f4ac4be4bf", "version": "1.78.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index 526884993209e4..cf565007faa34b 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75821705e2df069874466bb55c4b0c4561950831", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "73e04423bfb004c75708458688afeeb8a1806ba5", "version": "1.78.0", diff --git a/versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json index d622cc5d117c75..5c1581846b31b8 100644 --- a/versions/b-/boost-iterator.json +++ b/versions/b-/boost-iterator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9b329add024642bef5338c963bdfeee41bb60df", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "474aefb2b63e5ea3e6794631eab47aa3d6921573", "version": "1.78.0", diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json index 1fc302c0c81682..c4130a2f5f1390 100644 --- a/versions/b-/boost-json.json +++ b/versions/b-/boost-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b19f47c6cbcc65ddb2a96bf60df6b358a6e64ad1", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e8cdadcefe4c56aadc0120b9c1a86ea6504f3cea", "version": "1.78.0", diff --git a/versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json index 9fa2796c616f33..d94013b9b7148b 100644 --- a/versions/b-/boost-lambda.json +++ b/versions/b-/boost-lambda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2eedc92baf94690429ab150e062fe42296099d5", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ad7994962fa2139e8b2e67adbf505c555a57f3c6", "version": "1.78.0", diff --git a/versions/b-/boost-lambda2.json b/versions/b-/boost-lambda2.json index 48656d120c0e84..d2e9eb45e42d99 100644 --- a/versions/b-/boost-lambda2.json +++ b/versions/b-/boost-lambda2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ef167f48c1b762124536fd34843f247e9af8b89", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "fe85b4be83b3a88ec04a16d0704acc722502a128", "version": "1.78.0", diff --git a/versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json index f6129e5e5c92f4..6563855c37eb10 100644 --- a/versions/b-/boost-leaf.json +++ b/versions/b-/boost-leaf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "87a96bf13e0afb5212772d1240dfc6accaf71b84", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c000f663b00cfc9a2566b67ea68d6fe5050a016a", "version": "1.78.0", diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json index 4d7eadfc03295e..553be4ad33a56c 100644 --- a/versions/b-/boost-lexical-cast.json +++ b/versions/b-/boost-lexical-cast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78f269516df3662fbb3417faba5a8983936de604", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "984ca6d42fd857c08fa915edc02bfcecb02cc343", "version": "1.78.0", diff --git a/versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json index 7a3d94c51b6dab..d06734bab0582b 100644 --- a/versions/b-/boost-local-function.json +++ b/versions/b-/boost-local-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3de1ee1d8f4c2def524ee00056e545765dada7a7", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f0eb3b232475da3263d0c5a9b65a6cca3d63af1f", "version": "1.78.0", diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index d8a8d53d670aaf..d3fc69fc58d1e1 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1868faea7b5a4b74f6cb0dca84ef24a7f8d708d0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "66e57914d683e3e7c9945eeefd2010b5a08b4972", "version": "1.78.0", diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json index fafb9f8fa21887..b2b23d10a01b83 100644 --- a/versions/b-/boost-lockfree.json +++ b/versions/b-/boost-lockfree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb27f3391311f8d7078563e4ce98f7706500f33e", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8a98fed342e79efc6194594c5bdd0a6398a7bf9c", "version": "1.78.0", diff --git a/versions/b-/boost-log.json b/versions/b-/boost-log.json index a967ce40d39db3..495699d8342f23 100644 --- a/versions/b-/boost-log.json +++ b/versions/b-/boost-log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "311052ccd7332a0eb6d4a80af653a65fe390f7f4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "66bcef44cd4e7f68677db041e84df77e350624be", "version": "1.78.0", diff --git a/versions/b-/boost-logic.json b/versions/b-/boost-logic.json index 4bade7c65523e5..bbd4f9a58cae32 100644 --- a/versions/b-/boost-logic.json +++ b/versions/b-/boost-logic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "438d9d7c26d42ec2a76f0f60954b7cbcb950a79c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f5acfea5d30532cc6dccce78e0fd159a023ccb4a", "version": "1.78.0", diff --git a/versions/b-/boost-math.json b/versions/b-/boost-math.json index e9a8cde6e6398f..ca06fe121ab399 100644 --- a/versions/b-/boost-math.json +++ b/versions/b-/boost-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb4ff8e95c283f70577c94f6d552bbd2fa469b3c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e2fcdb4cd154efd942606b09085ec0cb7747a764", "version": "1.78.0", diff --git a/versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json index 9572ffea06351e..28bcfcad60f05e 100644 --- a/versions/b-/boost-metaparse.json +++ b/versions/b-/boost-metaparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad7ebac0f5d44f811d7d8462959b080c0f298eaa", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "3b3d7330ddf3fd7d1f38256098f645cafd96d08a", "version": "1.78.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 7abc1eca933f86..572f4a66c6024b 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03b0eb80e437663830851f7891d02125694b4ee0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ee3c3c2a3ecfb2bcff50d0758da7d6c36479a3c4", "version": "1.78.0", diff --git a/versions/b-/boost-move.json b/versions/b-/boost-move.json index 27252e03f73620..c6e246b56af1ae 100644 --- a/versions/b-/boost-move.json +++ b/versions/b-/boost-move.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "957381b3c5ac7d2b563b2563ca8a78d49f034e68", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a2b516a6391277e0c72147caf8c6677c92bff2a8", "version": "1.78.0", diff --git a/versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json index d0f8ddd0e056d4..badb1c8ed5f065 100644 --- a/versions/b-/boost-mp11.json +++ b/versions/b-/boost-mp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b741f7087023927b8345779b9a30575e1dee383f", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "06e8d1438943e47b1b4282964a0d290461ba3387", "version": "1.78.0", diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json index 83b6cdc5da8df1..9c2567504ea2f0 100644 --- a/versions/b-/boost-mpi.json +++ b/versions/b-/boost-mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17190e3d8acbcc5d48001bcf01250f91ff68dbc1", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "752ad29481d8c40a2a16cf1d18669a410e78d150", "version": "1.78.0", diff --git a/versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json index d9d464cacad9ff..28783c9fd8af05 100644 --- a/versions/b-/boost-mpl.json +++ b/versions/b-/boost-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fa673fcec0135c3a144d90528f719b281d29043", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a8b09063ef7fce74a9bfc52625ea7bf285cf4a82", "version": "1.78.0", diff --git a/versions/b-/boost-msm.json b/versions/b-/boost-msm.json index f7bc813770a16b..8ff696e7149a7a 100644 --- a/versions/b-/boost-msm.json +++ b/versions/b-/boost-msm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb6831b52a7befc70effc89fbb0313b371f28563", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ce4a5ac8b3d7cabf044883d6ab34c4360b75792e", "version": "1.78.0", diff --git a/versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json index bb280f54887cd1..c2184f6b1c31aa 100644 --- a/versions/b-/boost-multi-array.json +++ b/versions/b-/boost-multi-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a9a9941b94769dd48089ce42e4bc3eeadd5421b", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "b83337494c61a0f45310b4c298399841ac301aed", "version": "1.78.0", diff --git a/versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json index 280c9655c8ece0..a9d511ae0caa39 100644 --- a/versions/b-/boost-multi-index.json +++ b/versions/b-/boost-multi-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bccc5117c54e12afbd300458b25ec698ae860db4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "7a7e300ddb860a345ca0b9889cbe5d5d11934090", "version": "1.78.0", diff --git a/versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json index d69170a7cd790a..3c650b96977ac5 100644 --- a/versions/b-/boost-multiprecision.json +++ b/versions/b-/boost-multiprecision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "636ec387aa16d01e5eb3604bf4c70e90ef520cd5", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2914c2dcd5cb9a604c14ca9a5e9600ac7c0ecfd9", "version": "1.78.0", diff --git a/versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json index 8facc05ae26348..10223a4fedf0c9 100644 --- a/versions/b-/boost-nowide.json +++ b/versions/b-/boost-nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8013e5dd702b7f4c9973872435060812981af2f8", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c38c862892bc328c743481ee48b3abf50e66a51f", "version": "1.78.0", diff --git a/versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json index 627d7d95c9f205..9f0af73077978b 100644 --- a/versions/b-/boost-numeric-conversion.json +++ b/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33a349e75f738b735e678de319469c0f9009a413", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "11dcb5d23dd6b1db7138ffe608d76134ce1e4ec5", "version": "1.78.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index 7ae02c2e9b10ab..18cc1d5981fe8f 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "893dab725dc2e30afa421db9d4ad5f153da10ab3", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "069823a27c74a3a7872a0faed570b16130b4698d", "version": "1.78.0", diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json index df05ebfd2886ba..21e51125ea28d7 100644 --- a/versions/b-/boost-optional.json +++ b/versions/b-/boost-optional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9480f61fee5df6864a425964bd13ee783a7572a9", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "4171d6f66bb828d51bee3de777da9384232b6068", "version": "1.78.0", diff --git a/versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json index dd7a8d16b0e6bd..53161dad95138c 100644 --- a/versions/b-/boost-outcome.json +++ b/versions/b-/boost-outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab5e09720b095a4dedf3a6c9c01b5512c67917a2", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ea24820de39876b61aa98e1d54ac9663c0355f93", "version": "1.78.0", diff --git a/versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json index fd8335ec47535f..6808d2a7be2d9d 100644 --- a/versions/b-/boost-parameter-python.json +++ b/versions/b-/boost-parameter-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5d0f28a377b7508134bef9f354168e9aa49f1bb", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5a1cbdfec8ad70998ccfb368a3e77d8658023fed", "version": "1.78.0", diff --git a/versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json index cfb5561a3209bf..641695b8f4dcea 100644 --- a/versions/b-/boost-parameter.json +++ b/versions/b-/boost-parameter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94340499eaf0d204a8000b09a4b7f58eeb12c84d", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e11ea75fd7178b78b5a3751aa7db269c8ef222cb", "version": "1.78.0", diff --git a/versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json index 1adbe9da15f1c1..a5a1775bbd294b 100644 --- a/versions/b-/boost-pfr.json +++ b/versions/b-/boost-pfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48758ff038842f02fbf6f47c5f90afe1ae682a51", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1ca2c9de4c7a8553f401a9f7b9e954eb6305bc47", "version": "1.78.0", diff --git a/versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json index e7bb37ca7c2762..2a04d8dc65a75b 100644 --- a/versions/b-/boost-phoenix.json +++ b/versions/b-/boost-phoenix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "571d5f1a068664b1f31dddd3541b6a19bfdbec2d", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1812de4001c736517ca9bd780fa4b5258dfb134c", "version": "1.78.0", diff --git a/versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json index 87bbb42eb2287d..0c6eda2662f112 100644 --- a/versions/b-/boost-poly-collection.json +++ b/versions/b-/boost-poly-collection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "866f9a4fce24354f73363d787352bcc2ff22d917", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "3a128149f5edfbf7e5c4fcbf497b29ce587a35ad", "version": "1.78.0", diff --git a/versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json index ef14dc9bfb3640..9e2cc1176de70d 100644 --- a/versions/b-/boost-polygon.json +++ b/versions/b-/boost-polygon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbb7a4fbca9a45b0166893128f343ed3f9bc099a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "67a7f31ef72a1ceff351456cc7282b6f261db187", "version": "1.78.0", diff --git a/versions/b-/boost-pool.json b/versions/b-/boost-pool.json index 0eeab3a57d7d5e..c3b4d1a886a9cb 100644 --- a/versions/b-/boost-pool.json +++ b/versions/b-/boost-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a75a80498bfc1134bb8d5808b5f8b457e4032908", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8c0061ca841cab5b588ebae9bd1387882eec3435", "version": "1.78.0", diff --git a/versions/b-/boost-predef.json b/versions/b-/boost-predef.json index 7e40a366a6a513..fccdf477939e22 100644 --- a/versions/b-/boost-predef.json +++ b/versions/b-/boost-predef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c17a7256c1f86eab749e10b451dbf53d317afaf9", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1865984507efa465dea0f7d597528cfedcef0b7e", "version": "1.78.0", diff --git a/versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json index 5ce1911e60c8f3..9b60a984881e8e 100644 --- a/versions/b-/boost-preprocessor.json +++ b/versions/b-/boost-preprocessor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1790581b89b5cf96bd870854b2bc4b256032a9c9", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e69da51c3ec0a8086ab18dbf75da11649aed5157", "version": "1.78.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index ea3ab61e8d8ad5..be04912bbf0314 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a6c17a26c19ac770d39c549749a86f62b93ca36", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "669ff76873e507b50238609e17bb0208559cd224", "version": "1.78.0", diff --git a/versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json index b9f291ecdbb9d0..d131db39e48c1b 100644 --- a/versions/b-/boost-program-options.json +++ b/versions/b-/boost-program-options.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad5cb3defd7e6f0f2be69f7090d2f996e4d4d885", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8a0432f928213aacc0f1a51eef24201e1f120690", "version": "1.78.0", diff --git a/versions/b-/boost-property-map-parallel.json b/versions/b-/boost-property-map-parallel.json index af221a68cfa7af..0048d1ddeb5b6b 100644 --- a/versions/b-/boost-property-map-parallel.json +++ b/versions/b-/boost-property-map-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f8124a589753446efa038489607ddd868c7e2c4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2d9edadb62d7a55975cf22e01b7ee0ce74b4301a", "version": "1.78.0", diff --git a/versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json index fc1ff00c0d221f..db50c679f7826c 100644 --- a/versions/b-/boost-property-map.json +++ b/versions/b-/boost-property-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80eb3c867ca2f805d2379963d69c12f7f877bad0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "4c37ef13cdc33278fba6fa5c5bab30de91ce90e2", "version": "1.78.0", diff --git a/versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json index b2ace9a66e818e..2ec9d39fd4ead2 100644 --- a/versions/b-/boost-property-tree.json +++ b/versions/b-/boost-property-tree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f05a46d069778748274ff28002994e04d3654286", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "281dadcd5a8a6843ae829c4b653f33e7d1dbe2dd", "version": "1.78.0", diff --git a/versions/b-/boost-proto.json b/versions/b-/boost-proto.json index ca8228970541fe..9da129739e4bf5 100644 --- a/versions/b-/boost-proto.json +++ b/versions/b-/boost-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26184f2fdf2a6c15a79964befeba82802d7d6afd", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "46fcd6f1550adf925df0d985dd5463991150a13f", "version": "1.78.0", diff --git a/versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json index 73a43765937e76..c19090704e2a9f 100644 --- a/versions/b-/boost-ptr-container.json +++ b/versions/b-/boost-ptr-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "879641e4ff9cfca37db16a03f72b04afeed909c6", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "81591a280761661476868c5f064461475bd10ba2", "version": "1.78.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index 308d3c3d34fa10..2bea402d093808 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d5885833470840d6af709f368a42df4c3b09df4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a4cbab3ca82048134b757a0689d4ab3a83a7b695", "version": "1.78.0", diff --git a/versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json index 8596f6f2ec06f5..322c4d5362c5b4 100644 --- a/versions/b-/boost-qvm.json +++ b/versions/b-/boost-qvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f8a09f7b75cca0fe3cd7995f234ee35f985c3cf", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e2c998753d319d94c00d3b3b3365e2a116bad23f", "version": "1.78.0", diff --git a/versions/b-/boost-random.json b/versions/b-/boost-random.json index 3b9f756a012a91..398ef4c9888abc 100644 --- a/versions/b-/boost-random.json +++ b/versions/b-/boost-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c02cc8343df9ea692504b16db286eba1fc320a6", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ca9654479a3b0b92cba2e2c05fb927715b87a10c", "version": "1.78.0", diff --git a/versions/b-/boost-range.json b/versions/b-/boost-range.json index ceff56a9a60417..09d2ac165e1087 100644 --- a/versions/b-/boost-range.json +++ b/versions/b-/boost-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fff762e26af0f46863606c7fd088491dfcc84599", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1ec82281ed52b6d4ae225abe93a18392c846cbc9", "version": "1.78.0", diff --git a/versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json index f5678705e726a0..54616732940cc6 100644 --- a/versions/b-/boost-ratio.json +++ b/versions/b-/boost-ratio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c85cac76a643d538a52553a54353fbb818b3169", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a5e0af272c7df2d7994c6d98ad1d76df6b5330f7", "version": "1.78.0", diff --git a/versions/b-/boost-rational.json b/versions/b-/boost-rational.json index b84c1db30a0470..dad8cbb9bbd49f 100644 --- a/versions/b-/boost-rational.json +++ b/versions/b-/boost-rational.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd0b9e457fc969fdac6b9ee36b77a26b3c680ad5", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2a2877b20057e313af02d1307832d90f764b2dc1", "version": "1.78.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index 4071d58156c8f9..22ea1104eb2753 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a10bdc49cf30856030ed08921a5a30f3c3f3bdb1", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f04cda8dcb436a4cfaa008331d05ef2d0974b698", "version": "1.78.0", diff --git a/versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json index d09bdb78b020f6..9899a345939111 100644 --- a/versions/b-/boost-safe-numerics.json +++ b/versions/b-/boost-safe-numerics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac39614e028fa51d8de1210c0a003ecde411e156", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d425b6103c0c8a5824e74768d16fee276a33e99c", "version": "1.78.0", diff --git a/versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json index 465a08b630ff36..3ef5b8434ecfbe 100644 --- a/versions/b-/boost-scope-exit.json +++ b/versions/b-/boost-scope-exit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a27fe8833a067b072476368cdcbc1ae686236578", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e3d93cccff577045dce502c87ffcb02efb259ae8", "version": "1.78.0", diff --git a/versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json index 9305f3e62364ad..11b12507ccf697 100644 --- a/versions/b-/boost-serialization.json +++ b/versions/b-/boost-serialization.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aef44ba080120ebe8f5af25a6d019781323a5206", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c51578433055196c6e74bcdf792f4092479336de", "version": "1.78.0", diff --git a/versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json index bbfab113a7c629..a17975d3e71945 100644 --- a/versions/b-/boost-signals2.json +++ b/versions/b-/boost-signals2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6ab0c163ef679f14f84b6510c8508a90facf986", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "b3a1129bee4ba8d867758248e1b66add1a2bedb8", "version": "1.78.0", diff --git a/versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json index 1fccd55269788b..ecf115a8c0414b 100644 --- a/versions/b-/boost-smart-ptr.json +++ b/versions/b-/boost-smart-ptr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b94b3b41ab4bb281041f40d876baf221c05818ce", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "18806e0372da7b7f8b2d6a8ff4bd7bf074a690cd", "version": "1.78.0", diff --git a/versions/b-/boost-sort.json b/versions/b-/boost-sort.json index 37023d6b8261ef..6a72e1ffad4646 100644 --- a/versions/b-/boost-sort.json +++ b/versions/b-/boost-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74c73a3ccafccfc9e85fe3879ea90ff7a13ebcfd", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "fc0176556b8aaecb87376a59e2f711a9068dab3a", "version": "1.78.0", diff --git a/versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json index 9debd000305722..fe5dc463929038 100644 --- a/versions/b-/boost-spirit.json +++ b/versions/b-/boost-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a4bdffc6ef22bfee8942319cb5a69b2e85fe231", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "05502d056fb4e5569f87cd2a591ce5802f4020eb", "version": "1.78.0", diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index 1df417364f6066..4f112333198c35 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ddf64c066bcc3189d13bd7eedbaa646cdb073ff", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e00114d87145dd426e0816ce0e5fd0ab4a587ad9", "version": "1.78.0", diff --git a/versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json index 42cb3b6dc759a1..5f9279d71cf78d 100644 --- a/versions/b-/boost-statechart.json +++ b/versions/b-/boost-statechart.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6d892f7ec7ba87a98fd9bd2fced0c0ca6161fcd", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ef8ccac6b5ef76c3b862e46b9f6cb37169e8b20a", "version": "1.78.0", diff --git a/versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json index 32ca4d27bb0019..2d44c3b144af28 100644 --- a/versions/b-/boost-static-assert.json +++ b/versions/b-/boost-static-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "673cf82169b2b1696d993477d47b2f94d4350a7f", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "0d1e3a21f0be997c400b7c60dc2ec1b1beccbe3c", "version": "1.78.0", diff --git a/versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json index bd08640c6d4353..eb573643336e05 100644 --- a/versions/b-/boost-static-string.json +++ b/versions/b-/boost-static-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "575a5fac2b96da2ff39038a733fea5455f91caf4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "fe40bbd1d9be4c65daee4bf8f58a6b08baea4bdb", "version": "1.78.0", diff --git a/versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json index c0c2407c462eab..2afb9cbcf5dbf0 100644 --- a/versions/b-/boost-stl-interfaces.json +++ b/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f59d2ba966f1e2c2ef5f23150c5a8dd348d98fa", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "536059a4a77be87c1825fd1523cc29e47c86541d", "version": "1.78.0", diff --git a/versions/b-/boost-system.json b/versions/b-/boost-system.json index a6aba1c1d0834f..4191ae07410eed 100644 --- a/versions/b-/boost-system.json +++ b/versions/b-/boost-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5bca2d39362ef3978473a1d184f017ed277d1e5", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "eaab2373181b829bf4cb4ee298dfc9c80e98f01f", "version": "1.78.0", diff --git a/versions/b-/boost-test.json b/versions/b-/boost-test.json index e1edf4f035750b..4ab31b8deca43d 100644 --- a/versions/b-/boost-test.json +++ b/versions/b-/boost-test.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "127affd76f8dea78857d11e147a2cd03d8e827e3", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5015382ed40be617a3ec97adb17c0c1ecf3ab2d9", "version": "1.78.0", diff --git a/versions/b-/boost-thread.json b/versions/b-/boost-thread.json index 1f4e22e272ccd2..d08ee1097dc3f6 100644 --- a/versions/b-/boost-thread.json +++ b/versions/b-/boost-thread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d40c962d08c08d397520ace757ef7aab055a59be", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ef371df76c2b790aae7209d2866c467bd6d339be", "version": "1.78.0", diff --git a/versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json index 7889d4fe082650..99e1b93545b5fc 100644 --- a/versions/b-/boost-throw-exception.json +++ b/versions/b-/boost-throw-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1607edf60f1243503820e06b4d3e16c385aa691d", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2ab1c68ab2a41696a5f36841a66178256b8d229e", "version": "1.78.0", diff --git a/versions/b-/boost-timer.json b/versions/b-/boost-timer.json index 10b443bb4429f6..16c4d848e42d51 100644 --- a/versions/b-/boost-timer.json +++ b/versions/b-/boost-timer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebd77c0ba62a3665404c4143e4208b387b57a5ca", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "bf38eaeaceb0c989b414c6570b560e28822034fb", "version": "1.78.0", diff --git a/versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json index ea1e28890847e4..c9e2bd3d255702 100644 --- a/versions/b-/boost-tokenizer.json +++ b/versions/b-/boost-tokenizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e5682fee6727bada3b88221bd416edaa80f6a34", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "24c6aef67afefb01d20749d7b43790efcb1dfc66", "version": "1.78.0", diff --git a/versions/b-/boost-tti.json b/versions/b-/boost-tti.json index 3e1cc883f91ee4..32275c106a0eb1 100644 --- a/versions/b-/boost-tti.json +++ b/versions/b-/boost-tti.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "027de695e13801dcc7a947fea766bd29b687e7ce", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c47f152005c71db858b015f18edf72b02f7ebf27", "version": "1.78.0", diff --git a/versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json index 0593f929d01ae5..12c56edea4dbc8 100644 --- a/versions/b-/boost-tuple.json +++ b/versions/b-/boost-tuple.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3b718eea1f62e7b4918b3c4f6a4be731d4085ce", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "da0a88c5630fa116b473e02aae6651199529649e", "version": "1.78.0", diff --git a/versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json index 2d619ab0f97251..e08969c220fd6e 100644 --- a/versions/b-/boost-type-erasure.json +++ b/versions/b-/boost-type-erasure.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5797832d5179682e09ba62f0f7cf25a58cbfe61", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "787c75c5f25da496fb26723589ed3ea5c2c73a49", "version": "1.78.0", diff --git a/versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json index 7dc17e63767132..0fb9eb020d212b 100644 --- a/versions/b-/boost-type-index.json +++ b/versions/b-/boost-type-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4e2eff6204ba68938a99059b23d3abbd2e1dc55", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "fac6a10bb329da6cd19cfde9534ef11b3edb8623", "version": "1.78.0", diff --git a/versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json index 2e1aff84a0339c..e3a6b2583dc5a8 100644 --- a/versions/b-/boost-type-traits.json +++ b/versions/b-/boost-type-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7969a397a6c03205ec1c118834272183ff4201c7", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8ce0cad0c57f4acd5da2369894a0db64b918ac41", "version": "1.78.0", diff --git a/versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json index 3d5361e90515ef..28458188160293 100644 --- a/versions/b-/boost-typeof.json +++ b/versions/b-/boost-typeof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81216888498f3c8f6563b991a1d601af139da128", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "478fadf37863e72ec547e1a7620da6a28cc85c7d", "version": "1.78.0", diff --git a/versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json index 6833fb11bcf874..aa3b3f22a39f0d 100644 --- a/versions/b-/boost-ublas.json +++ b/versions/b-/boost-ublas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7657da84dd6a03bc4130b2c3ff215f45a5ddd8c0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "4c6ffcc2498c1521634d070a99e02c695f069c2e", "version": "1.78.0", diff --git a/versions/b-/boost-uninstall.json b/versions/b-/boost-uninstall.json index 4beb41f50175b7..91a61ecaa333fe 100644 --- a/versions/b-/boost-uninstall.json +++ b/versions/b-/boost-uninstall.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2d05f10364104d9b7de2383bcb105a1fd3fe975", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "996078abceb6009fb2841dd97edc5246e8bd38aa", "version": "1.78.0", diff --git a/versions/b-/boost-units.json b/versions/b-/boost-units.json index c0e3151fdde40d..e3f1bc493edeee 100644 --- a/versions/b-/boost-units.json +++ b/versions/b-/boost-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33f1a2b53e7c36f387866d1e84e0dd2aa1b21c4d", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "30bc337bdcbfbfb7339e8a4dd2169df60fbae249", "version": "1.78.0", diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json index b6148e358880bb..55f0df6c30a56f 100644 --- a/versions/b-/boost-unordered.json +++ b/versions/b-/boost-unordered.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b73d98ab77d4de1a3e4f12bdd84869dfc3adedc0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c55ee280fedefd69dba819a4d768d5a5e132f9b9", "version": "1.78.0", diff --git a/versions/b-/boost-utility.json b/versions/b-/boost-utility.json index efa7b88b578b11..c70a51a9fb6e5e 100644 --- a/versions/b-/boost-utility.json +++ b/versions/b-/boost-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8eb91c7a3ad14393219ba020d3d26c39a325c626", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "4e39c1737260328064c10b743aba90788efc467a", "version": "1.78.0", diff --git a/versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json index 6775ec029fc94a..1d0deec2649ad9 100644 --- a/versions/b-/boost-uuid.json +++ b/versions/b-/boost-uuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dbf4e64381a3c6279ad5f91a7c64c8f5ca9ef145", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "19c834dc170873080e1c6308233fd9041ae42cce", "version": "1.78.0", diff --git a/versions/b-/boost-variant.json b/versions/b-/boost-variant.json index cddad5a84894c8..2ab0af97718bd4 100644 --- a/versions/b-/boost-variant.json +++ b/versions/b-/boost-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33b3da200705df22017f639acdc1e2eade79606e", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a2196d2cb8c61db4cdd6285170589e079c1ff3bb", "version": "1.78.0", diff --git a/versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json index dd69437d4d3e0c..45816131a22afc 100644 --- a/versions/b-/boost-variant2.json +++ b/versions/b-/boost-variant2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9af9e4791e65b001bbfb107eeecf819369a06b3", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "30915b5f5005d9b166f4349f493b4f7314d84c17", "version": "1.78.0", diff --git a/versions/b-/boost-vcpkg-helpers.json b/versions/b-/boost-vcpkg-helpers.json index 652b90ee89acfd..410926a281bf30 100644 --- a/versions/b-/boost-vcpkg-helpers.json +++ b/versions/b-/boost-vcpkg-helpers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e96a2cb3400bcafd55070d18bdcab64808ada01", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2b601d13ad505473bac3d555d9e543d981c46565", "version": "1.78.0", diff --git a/versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json index dc92ffb0e61811..4e8f9bfa16b4e8 100644 --- a/versions/b-/boost-vmd.json +++ b/versions/b-/boost-vmd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d88c4a6cefe62b5d05e9fed932188a7049fe991", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d89558e11194fd019488c8e4550bc8b7debb38d4", "version": "1.78.0", diff --git a/versions/b-/boost-wave.json b/versions/b-/boost-wave.json index aaf5de7f45ea29..f7d56a49fac5ef 100644 --- a/versions/b-/boost-wave.json +++ b/versions/b-/boost-wave.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8db04f2186df7eacfe00e02666510ba3f750753", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "fbf126b4e9405233ffd54018c18cf84895f59f29", "version": "1.78.0", diff --git a/versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json index 154870d8b6cd5d..0e34ff2c2a9428 100644 --- a/versions/b-/boost-winapi.json +++ b/versions/b-/boost-winapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f82a0041bb3b4ac1f3721afe5ba4e24e27c3a3c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8492201c09a250964609eea910b3d37c9895d411", "version": "1.78.0", diff --git a/versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json index 08d44ea45a0818..5821ac6cb15ce7 100644 --- a/versions/b-/boost-xpressive.json +++ b/versions/b-/boost-xpressive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26cd8244e5c07efa76837461cd426c5f4ca25dab", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "b117a25b1705a9a21ddb41a01bc8c081121d6d95", "version": "1.78.0", diff --git a/versions/b-/boost-yap.json b/versions/b-/boost-yap.json index 6272a7bccf8843..04607903abc236 100644 --- a/versions/b-/boost-yap.json +++ b/versions/b-/boost-yap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b65c58d6abe35bd1300b250d8d7519a7d56292b8", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "692c496d822a9132dcf05c76bfee43bf7ab56c5e", "version": "1.78.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index 8b2083ba58b5d6..5d5f29777a1c08 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f742b459c69d004cd97fe8fd62e4b813224eba10", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c6924d40a63cbd74c48964edd069a5df1df8b615", "version": "1.78.0", diff --git a/versions/baseline.json b/versions/baseline.json index de6fc7f9047262..3b39a14693d129 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -521,139 +521,139 @@ "port-version": 0 }, "boost": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-accumulators": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-algorithm": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-align": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-any": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-array": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-asio": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-assert": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-assign": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-atomic": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-beast": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-bimap": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-bind": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-build": { - "baseline": "1.78.0", - "port-version": 1 + "baseline": "1.79.0", + "port-version": 0 }, "boost-callable-traits": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-chrono": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-circular-buffer": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-compatibility": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-compute": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-concept-check": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-config": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-container": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-container-hash": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-context": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-contract": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-conversion": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-convert": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-core": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-coroutine": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-coroutine2": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-crc": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-date-time": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-describe": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-detail": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-di": { @@ -661,467 +661,467 @@ "port-version": 0 }, "boost-dll": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-dynamic-bitset": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-endian": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-exception": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-fiber": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-filesystem": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-flyweight": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-foreach": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-format": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-function": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-function-types": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-functional": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-fusion": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-geometry": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-gil": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-graph": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-graph-parallel": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-hana": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-heap": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-histogram": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-hof": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-icl": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-integer": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-interprocess": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-interval": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-intrusive": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-io": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-iostreams": { - "baseline": "1.78.0", - "port-version": 2 + "baseline": "1.79.0", + "port-version": 0 }, "boost-iterator": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-json": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-lambda": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-lambda2": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-leaf": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-lexical-cast": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-local-function": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-locale": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-lockfree": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-log": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-logic": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-math": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-metaparse": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-modular-build-helper": { - "baseline": "1.78.0", - "port-version": 3 + "baseline": "1.79.0", + "port-version": 0 }, "boost-move": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-mp11": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-mpi": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-mpl": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-msm": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-multi-array": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-multi-index": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-multiprecision": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-nowide": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-numeric-conversion": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-odeint": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-optional": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-outcome": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-parameter": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-parameter-python": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-pfr": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-phoenix": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-poly-collection": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-polygon": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-pool": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-predef": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-preprocessor": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-process": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-program-options": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-property-map": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-property-map-parallel": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-property-tree": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-proto": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-ptr-container": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-python": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-qvm": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-random": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-range": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-ratio": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-rational": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-regex": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-safe-numerics": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-scope-exit": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-serialization": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-signals2": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-smart-ptr": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-sort": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-spirit": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-stacktrace": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-statechart": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-static-assert": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-static-string": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-stl-interfaces": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-system": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-test": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-thread": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-throw-exception": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-timer": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-tokenizer": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-tti": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-tuple": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-type-erasure": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-type-index": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-type-traits": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-typeof": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-ublas": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-uninstall": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-units": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-unordered": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-utility": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-uuid": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-variant": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-variant2": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-vcpkg-helpers": { - "baseline": "1.78.0", - "port-version": 1 + "baseline": "1.79.0", + "port-version": 0 }, "boost-vmd": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-wave": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-winapi": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-xpressive": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boost-yap": { - "baseline": "1.78.0", + "baseline": "1.79.0", "port-version": 0 }, "boringssl": { @@ -2182,7 +2182,7 @@ }, "fbthrift": { "baseline": "2022.03.21.00", - "port-version": 0 + "port-version": 1 }, "fcl": { "baseline": "0.7.0", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 2418aeecd53aed..e5044676ec5406 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed9295b0cad6c25b409e6e400148bb91017f3678", + "version-string": "2022.03.21.00", + "port-version": 1 + }, { "git-tree": "0cd01b0f0f6c77c87eea5331b75b01c9e9a20e2c", "version-string": "2022.03.21.00", From 8ea52bad1ac13e1afb892ccba6c261d8e82d06fd Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 21 Apr 2022 19:02:47 +0200 Subject: [PATCH 068/383] [opentracing] no tests (#24234) --- ports/opentracing/portfile.cmake | 8 ++++---- ports/opentracing/vcpkg.json | 15 +++++++++++++-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/o-/opentracing.json | 5 +++++ 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ports/opentracing/portfile.cmake b/ports/opentracing/portfile.cmake index 9a6312e8f61621..537b348ee7f030 100644 --- a/ports/opentracing/portfile.cmake +++ b/ports/opentracing/portfile.cmake @@ -16,16 +16,16 @@ vcpkg_from_github( repair_mojibake.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DENABLE_LINTING=OFF + -DBUILD_TESTING=OFF ${LOCAL_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenTracing) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenTracing) vcpkg_copy_pdbs() diff --git a/ports/opentracing/vcpkg.json b/ports/opentracing/vcpkg.json index 8061bc3d9c2749..e14d49d0bafb85 100644 --- a/ports/opentracing/vcpkg.json +++ b/ports/opentracing/vcpkg.json @@ -1,8 +1,19 @@ { "name": "opentracing", "version": "1.6.0", - "port-version": 2, + "port-version": 3, "description": "C++ implementation of the OpenTracing API", "homepage": "https://opentracing.io", - "supports": "!uwp" + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3dbf567ed465bc..fa419af52de302 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -923,8 +923,6 @@ openni2:x64-uwp=fail openni2:x64-windows-static=fail openscap:x64-linux=fail openscap:x64-osx=fail -opentracing:arm-uwp=fail -opentracing:x64-uwp=fail openvpn3:x64-osx=fail openvr:arm64-windows=fail openvr:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 3b39a14693d129..98854a003e571b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5182,7 +5182,7 @@ }, "opentracing": { "baseline": "1.6.0", - "port-version": 2 + "port-version": 3 }, "openvdb": { "baseline": "9.0.0", diff --git a/versions/o-/opentracing.json b/versions/o-/opentracing.json index 94c1d40af1e1ea..c8e944d7acc6b3 100644 --- a/versions/o-/opentracing.json +++ b/versions/o-/opentracing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eae79381338436b815e727eb25885e6c8631eb5f", + "version": "1.6.0", + "port-version": 3 + }, { "git-tree": "6bd6797b313b265c51c85ea2838efcdaa70f87f7", "version": "1.6.0", From ad580836811b732e387bc8069876d816b1ee33fb Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 22 Apr 2022 01:54:56 +0800 Subject: [PATCH 069/383] [libjuice] update to 1.0.0 (#24288) * [libjuice] update to 1.0.0 * update version * Add license * update version * update license * update version * update license * update version --- ports/libjuice/portfile.cmake | 4 ++-- ports/libjuice/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libjuice.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index b29ef11c3abfd7..cba06928d29d8e 100644 --- a/ports/libjuice/portfile.cmake +++ b/ports/libjuice/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libjuice - REF e2bb4df9c9a2d3a296312925f313bf6f26854010 #v0.9.8 - SHA512 98fa9cf8a1f22c0f43ef7b2dd438bdd299483384b8d81f1196d8a0fe7fa41c63df7d7acfb94b9af3b8edfe569aeb73b33569bea2557ed2d0a554ba3a81603c2f + REF ae954be55f17a100e99650d6c1286e80929a66bb #v1.0.0 + SHA512 1b303ddfc7b903e0ba5f35580a6ce2350e12d4ef6cbbe97dbd090e863b664ca7b2f13da24d70b20cfd30a9c1208779b9b9c8c2df9ff9a21f12f3fc1bfdc09b0e HEAD_REF master PATCHES fix-for-vcpkg.patch diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index 2e87efc9eaa7aa..8be1cb3d10829c 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libjuice", - "version": "0.9.8", + "version": "1.0.0", "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libjuice", + "license": "LGPL-2.1-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 98854a003e571b..d0af4ce5c42a4b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3685,7 +3685,7 @@ "port-version": 2 }, "libjuice": { - "baseline": "0.9.8", + "baseline": "1.0.0", "port-version": 0 }, "libjxl": { diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index cce469f9ae596d..8794a61c567496 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02ea9a1ae4e054d9474f801747e5edd17a3d8ad1", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "62c215b49c59158589a9bc98d02b20243ef1bf0b", "version": "0.9.8", From 9db088e2b06ab8dcfb8287df925d572e009617e0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 21 Apr 2022 20:42:59 +0200 Subject: [PATCH 070/383] [Qt6] update to 6.3.0 (#23015) * [Qt6] Latest feature to 6.3.0 * move failing patch to !latest * remove debug/include * more fixes * more fixes * more fixes * give me the binary names making it fail. * add new binary * fix qtimageformats * fix regressions? * retry qtopcua * fix regressions * correctly guard python * more fixes * add vcpkg-get-python-packages * hack webengine build to see if it will work. * move hack to a different position * noramlize path * update refs to 6.3 release * fix details * qtwebengine back to fail on baseline * comment long path stuff out since qtwebengine cannot be build with VS 2022 any way * update version to 6.3.0 in manifest files * version stuff Co-authored-by: Alexander Neumann --- ports/qt/vcpkg.json | 2 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtapplicationmanager/vcpkg.json | 2 +- ports/qtbase/cmake/qt_install_submodule.cmake | 17 ++- .../qtbase/cmake/qt_port_details-latest.cmake | 102 +++++++++++------- .../qtbase/dont_force_cmakecache_latest.patch | 13 +++ ports/qtbase/portfile.cmake | 16 ++- ports/qtbase/vcpkg.json | 2 +- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtconnectivity/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/portfile.cmake | 1 + ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdeviceutilities/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- .../no_target_promotion_latest.patch | 21 ++++ ports/qtimageformats/portfile.cmake | 6 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtinterfaceframework/vcpkg.json | 3 +- ports/qtlocation/vcpkg.json | 2 +- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtmultimedia/vcpkg.json | 2 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/vcpkg.json | 3 +- ports/qtpositioning/vcpkg.json | 2 +- ports/qtquick3d/portfile.cmake | 2 +- ports/qtquick3d/vcpkg.json | 2 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtremoteobjects/vcpkg.json | 2 +- ports/qtscxml/vcpkg.json | 2 +- ports/qtsensors/vcpkg.json | 2 +- ports/qtserialbus/vcpkg.json | 2 +- ports/qtserialport/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/vcpkg.json | 2 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- ports/qtwebchannel/vcpkg.json | 2 +- ports/qtwebengine/portfile.cmake | 18 +++- ports/qtwebengine/vcpkg.json | 6 +- ports/qtwebsockets/vcpkg.json | 2 +- ports/qtwebview/vcpkg.json | 2 +- versions/baseline.json | 78 +++++++------- versions/q-/qt.json | 5 + versions/q-/qt5compat.json | 5 + versions/q-/qtactiveqt.json | 5 + versions/q-/qtapplicationmanager.json | 5 + versions/q-/qtbase.json | 5 + versions/q-/qtcharts.json | 5 + versions/q-/qtcoap.json | 5 + versions/q-/qtconnectivity.json | 5 + versions/q-/qtdatavis3d.json | 5 + versions/q-/qtdeclarative.json | 5 + versions/q-/qtdeviceutilities.json | 5 + versions/q-/qtdoc.json | 5 + versions/q-/qtimageformats.json | 5 + versions/q-/qtinterfaceframework.json | 5 + versions/q-/qtlocation.json | 5 + versions/q-/qtlottie.json | 5 + versions/q-/qtmqtt.json | 5 + versions/q-/qtmultimedia.json | 5 + versions/q-/qtnetworkauth.json | 5 + versions/q-/qtopcua.json | 5 + versions/q-/qtpositioning.json | 5 + versions/q-/qtquick3d.json | 5 + versions/q-/qtquicktimeline.json | 5 + versions/q-/qtremoteobjects.json | 5 + versions/q-/qtscxml.json | 5 + versions/q-/qtsensors.json | 5 + versions/q-/qtserialbus.json | 5 + versions/q-/qtserialport.json | 5 + versions/q-/qtshadertools.json | 5 + versions/q-/qtsvg.json | 5 + versions/q-/qttools.json | 5 + versions/q-/qttranslations.json | 5 + versions/q-/qtvirtualkeyboard.json | 5 + versions/q-/qtwayland.json | 5 + versions/q-/qtwebchannel.json | 5 + versions/q-/qtwebengine.json | 5 + versions/q-/qtwebsockets.json | 5 + versions/q-/qtwebview.json | 5 + 86 files changed, 416 insertions(+), 130 deletions(-) create mode 100644 ports/qtbase/dont_force_cmakecache_latest.patch create mode 100644 ports/qtimageformats/no_target_promotion_latest.patch diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 4e51339debbfbf..392aa1a9f7f208 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 43291a052475c9..59a13e68c61297 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.2.4", + "version": "6.3.0", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index bd9b6055c7af43..f89842ac5db390 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.2.4", + "version": "6.3.0", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 4727a132804c8e..a74a219c734212 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index f235d367e48b3c..d193d075de4680 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -57,7 +57,7 @@ function(qt_cmake_configure) vcpkg_find_acquire_program(PERL) # Perl is probably required by all qt ports for syncqt get_filename_component(PERL_PATH ${PERL} DIRECTORY) vcpkg_add_to_path(${PERL_PATH}) - if(NOT PORT STREQUAL "qtwebengine") # qtwebengine requires python2 + if(NOT PORT STREQUAL "qtwebengine" OR QT_IS_LATEST) # qtwebengine requires python2; since 6.3 python3 vcpkg_find_acquire_program(PYTHON3) # Python is required by some qt ports get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) vcpkg_add_to_path(${PYTHON3_PATH}) @@ -99,6 +99,14 @@ function(qt_cmake_configure) list(TRANSFORM disabled_features REPLACE "(:BOOL)?=OFF" "") list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_features}) + if(QT_IS_LATEST) + list(APPEND _qarg_OPTIONS "-DQT_NO_FORCE_SET_CMAKE_BUILD_TYPE:BOOL=ON") + endif() + + if(NOT PORT MATCHES "qtbase") + list(APPEND _qarg_OPTIONS "-DQT_MKSPECS_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6/mkspecs") + endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ${ninja_option} @@ -144,6 +152,7 @@ function(qt_cmake_configure) INSTALL_INCLUDEDIR HOST_PERL QT_SYNCQT + QT_NO_FORCE_SET_CMAKE_BUILD_TYPE ${_qarg_OPTIONS_MAYBE_UNUSED} ) set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE) @@ -256,12 +265,14 @@ function(qt_fixup_and_cleanup) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/lib/cmake/" + "${CURRENT_PACKAGES_DIR}/debug/include" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*") - debug_message("Files in bin: '${_bin_files}'") - if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error. + if(NOT _bin_files STREQUAL "") + message(STATUS "Remaining files in bin: '${_bin_files}'") + else() # Only clean if empty otherwise let vcpkg throw and error. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") endif() endif() diff --git a/ports/qtbase/cmake/qt_port_details-latest.cmake b/ports/qtbase/cmake/qt_port_details-latest.cmake index e89df6b9689472..db721335a6d6df 100644 --- a/ports/qtbase/cmake/qt_port_details-latest.cmake +++ b/ports/qtbase/cmake/qt_port_details-latest.cmake @@ -1,18 +1,29 @@ -set(QT_VERSION 6.2.0) +set(QT_VERSION 6.3.0) if(PORT MATCHES "qtquickcontrols2") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") return() endif() -set(QT_GIT_TAG v${QT_VERSION}) +### Setting up the git tag. +set(QT_FETCH_REF "") +set(QT_GIT_TAG "v${QT_VERSION}") +if(PORT MATCHES "qtdeviceutilities") + set(QT_FETCH_REF FETCH_REF "6.3.0") + set(QT_GIT_TAG "6.3.0") +endif() +if(PORT MATCHES "qtlocation") + set(QT_FETCH_REF FETCH_REF "${QT_VERSION}") + set(QT_GIT_TAG "${QT_VERSION}") +endif() + +set(QT_IS_LATEST TRUE) #set(QT_UPDATE_VERSION TRUE) if(QT_UPDATE_VERSION) function(vcpkg_extract_source_archive) endfunction() endif() -set(QT_IS_LATEST 1) set(QT_PORTS qt qtbase @@ -35,13 +46,14 @@ set(QT_PORTS qt ## New in 6.1 qtactiveqt qtdatavis3d - #qtdeviceutils + qtdeviceutilities qtlottie qtscxml qtvirtualkeyboard qtcharts ## New in 6.2 qtconnectivity + qtpositioning qtlocation qtmultimedia qtremoteobjects @@ -52,48 +64,60 @@ set(QT_PORTS qt qtwebengine qtwebsockets qtwebview + ## New in 6.2.2 + qtinterfaceframework + qtapplicationmanager ) foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() -set(qtbase_REF 0c2d00de3488116db9f9d657fe18bcb972a83792) -set(qtshadertools_REF 119cd6e9c9e89f93b74db28f261382a2fcfe504e) -set(qtdeclarative_REF 37da36c97d9d557945abca3cea5c68d9985a06e3) -set(qt5compat_REF 291993c7813ec706e54069c7de339edfdd385c0d) -set(qttools_REF 00efbf90f978afefdcece314d19b79459eee2211) # Additional refs in portfile due to submodule -set(qtcoap_REF be7822dc920a3e3eb252d5693a7153aa606d3dc1) -set(qtdoc_REF 48a1fbab30a9f57f011fdea8ec2b47048dce4069) -set(qtimageformats_REF 7bb9dc839c0dd0806445fd475b027a82c961f686) -set(qtmqtt_REF 4fd647e23d95c522c45d86be584d18578f894823) -set(qtnetworkauth_REF aa23db40ca552d60383dea17d703b1cc0cbeace4) -set(qtopcua_REF cfb3767b2a6785e0437b99c015cb6aef7f40189c) -set(qtquicktimeline_REF e9578a6949f6192440df1cb261ed9de98a9de7d7) -set(qtquick3d_REF eaf9c60073b95b03c006279f08d4947699c32a4b) -set(qtsvg_REF cceecea040ca1247db0212217d07ec2c331004ba) -set(qttranslations_REF 03a146236e69ee41c0405a8b5707104b4ac0c6e8) -set(qtwayland_REF 8c4900dda393752faab14e39e60aec6b545c8a0f) -# set(qtquickcontrols2_REF 0) # Moved into qtdeclarative since Qt 6.2 +set(qtbase_REF 0668a36d2804b300010d874f5ff4073c25c2784c) +set(qtshadertools_REF e526e8ca88197d82996818db1f00e8a3e07bf584) +set(qtdeclarative_REF cbe89ee41aa219ce7e90143e3cf54283e580f7c1) +set(qt5compat_REF 32db676ab6854633512181b2c40950c98525c5ba) +set(qttools_REF a0a9cf1d1338b3e7f868bc0840e1e9a096c86dfa) # Additional refs below +set(qtcoap_REF 4453575b94836cf1cd52642eceb1d6f5d16b26a9) +set(qtdoc_REF d0da4d47f152dc50fb672bc5011b61a5bbb36f43) +set(qtimageformats_REF 45cfb044698df541ced53e3523799232599712a6) +set(qtmqtt_REF 3174dc30d2b37c74ea685d27ab0030c7392032c0) +set(qtnetworkauth_REF 507214965cbcebbbd563904d615cf7ebc464cc48) +set(qtopcua_REF 2c7051d85f640e9afe6c3f8f718bb2152305467c) +set(qtquicktimeline_REF 16bc2eb9f5e84923dc04c3941f5347cbc1b0e5b0) +set(qtquick3d_REF bf912a678898dcde61f139f63b49e1e42717fa8d) +set(qtsvg_REF cf900932886ebdd3de6c3a4a7e63cf363663eb87) +set(qttranslations_REF 19701f38b9dc10d925c6974833d693b5038e1589) +set(qtwayland_REF 840673bf1849595869873bad15c52a312e849ffb) ### New in 6.1 -set(qtactiveqt_REF 94c924a8501dba7487bf2648bdf06aefc33e726d) -set(qtcharts_REF d56b9f3de193cbf561f4b1ec332d8598dbdaaaca) -set(qtdatavis3d_REF 5c90e6642882b3b7440608f71b96ce28908f0ee8) -#set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF 48df4f1067514a3ae8b895b5f78fca09029d9288) -set(qtscxml_REF 68ac6986b9a9b3acfcab1e445edc7c198bbf7344) -set(qtvirtualkeyboard_REF 0e49e057777cd6c3f93d123e59a9399a2cf0040f) +set(qtactiveqt_REF 747fdd27c413ea42fb730230331984f388d3826b) +set(qtcharts_REF 03929b43d8e2a5c9b1487fdc6b8a2b067ada16f8) +set(qtdatavis3d_REF 137ebda0932e6faf0fbd61b0beb3cfb4dac8efbd) +set(qtdeviceutilities_REF 0520d7fd121f7773d04a7d3318553ff7fed1b3a9) # +set(qtlottie_REF e68bf89fefd941a930c83e2c29b629fcfea03eb3) +set(qtscxml_REF 4f52a1b6e4f25f3473f42ce249c4c183c5910183) +set(qtvirtualkeyboard_REF 92aee38dab196e8b5ca436f9f20c0fc66d8155d5) ### New in 6.2 -set(qtconnectivity_REF 78e7ffbe16469a19fa34cad711e0898d91bd2f30) -set(qtlocation_REF 47a945b0d054539eab3ba1cf3a1d7bf5977051d6) -set(qtmultimedia_REF d7d0e676abd4b280feb0d5105846378b64782487) -set(qtremoteobjects_REF 58932ba10420faa1cc989ed5bf101ff06475a4fc) -set(qtsensors_REF 192ca0fd252066101eb0456b957fdb51618fa7db) -set(qtserialbus_REF ce089bef29ca55d7fe46508d92d3e498eb5bb847) -set(qtserialport_REF 14dc155f3640af94c6ecff2de1489e14cd5b0047) -set(qtwebchannel_REF 09315a8d626e106953723ce68e68d6b4b97c2c52) -set(qtwebengine_REF 261d72c8afc72faf23d169a64749db216db68859) # Additional refs in portfile due to submodule -set(qtwebsockets_REF a01c2d6638fad700db23863258b7fc4a1ecdd542) -set(qtwebview_REF ca0053b6a5320046508e9ba205df775a62c1a211) +set(qtconnectivity_REF f62954bad729f7853c9fbe2ea0b3235cfae2701a) +set(qtmultimedia_REF 3d2dafab1eb60c17a30cf03213cd2f6f71185137) +set(qtremoteobjects_REF 2c53bf0e9262a24f8fc8553e5004e7d00bc7e556) +set(qtserialport_REF 7e44935b14b783add342a25f426fcdf299279024) +set(qtsensors_REF 3222894c246076c6e7bd151e638ce3eb4ce5c16b) +set(qtserialbus_REF 3ee1694d2a8fb0b755adce4b59001b784e9c301e) +set(qtlocation_REF 0) # Currently empty port +set(qtwebchannel_REF a85e05069a2b17ceb5b6332671a2eef261ec783f) +set(qtwebengine_REF 9158e7652f24800b2b7dbe59b7834687bc1baf13) # Additional refs below +set(qtwebsockets_REF 487116c9a85d8f5a920f47045dfce0b0defd5139) +set(qtwebview_REF d7498a108c67b21c39d8ba775330cc122ce21c1a) +set(qtpositioning_REF f61d2f336892b85cdcd5d508bb4a0db7f768d439) +### New in Qt 6.2.2 +set(qtapplicationmanager_REF 68464eb2b3fa89c69cfc5fc4f19450af61116dd2) # +set(qtinterfaceframework_REF 7ddeb99d6215a4b63102d6a5bc73e50d77ddb3d7) # + +#Submodule stuff: +set(qttools_qlitehtml_REF 4931b7aa30f256c20573d283561aa432fecf8f38) +set(qttools_litehtml_REF 6236113734bb0a28467e5999e86fdd2834be8e01) +set(qttools_litehtml_HASH 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc) +set(qtwebengine_chromium_REF 2c9916de251f15369fa0f0c6bd3f45f5cf1a6f06) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qtbase/dont_force_cmakecache_latest.patch b/ports/qtbase/dont_force_cmakecache_latest.patch new file mode 100644 index 00000000000000..752cefe6d2b8b1 --- /dev/null +++ b/ports/qtbase/dont_force_cmakecache_latest.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake +index 4f8106dfa..bec5c402e 100644 +--- a/cmake/QtPostProcessHelpers.cmake ++++ b/cmake/QtPostProcessHelpers.cmake +@@ -414,7 +414,7 @@ function(qt_generate_install_prefixes out_var) + + foreach(var ${vars}) + get_property(docstring CACHE "${var}" PROPERTY HELPSTRING) +- string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" FORCE)\n") ++ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\")\n") + endforeach() + + set(${out_var} "${content}" PARENT_SCOPE) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 9d90b9233d11a2..b49552e24ff77b 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -3,8 +3,10 @@ # Always check the toplevel CMakeLists.txt for the find_package call and search for linkage against the Qt:: targets # Often enough certain (bigger) dependencies are only used to build examples and/or tests. # As such getting the correct dependency information relevant for vcpkg requires a manual search/check - -#set(QT_IS_LATEST ON) +set(QT_IS_LATEST ON) +if("latest" IN_LIST FEATURES) + set(QT_IS_LATEST ON) +endif() ## All above goes into the qt_port_hashes in the future include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") @@ -13,7 +15,6 @@ set(${PORT}_PATCHES allow_outside_prefix.patch clang-cl_source_location.patch config_install.patch - dont_force_cmakecache.patch fix_cmake_build.patch harfbuzz.patch fix_egl.patch @@ -24,7 +25,12 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) - list(APPEND ${PORT}_PATCHES + list(APPEND ${PORT}_PATCHES + dont_force_cmakecache.patch + ) +else() + list(APPEND ${PORT}_PATCHES + dont_force_cmakecache_latest.patch ) endif() @@ -246,6 +252,8 @@ set(TOOL_NAMES uic qtpaths qtpaths6 + windeployqt + macdeployqt ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index df7b8406865674..da1c8c1fc10445 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtbase", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 5b5bba70571c44..ef321ae959def6 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.2.4", + "version": "6.3.0", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 933dd17eb3f6af..5a3474a9f8bcb6 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index 9939d05609e022..e6fb60802d52db 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 7c6ef9986cb4ae..bbef5e0d56e3c3 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/portfile.cmake b/ports/qtdeclarative/portfile.cmake index bf1d42cf3449de..9589d6284b0e81 100644 --- a/ports/qtdeclarative/portfile.cmake +++ b/ports/qtdeclarative/portfile.cmake @@ -16,6 +16,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") qmltime qmltyperegistrar qmldom + qmltc ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index a28b939d9d5f60..98039dc9f52129 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index 40887e480c9c0b..ca9d565bf23486 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.2.4", + "version": "6.3.0", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 9ed06dbe995bd5..2b683ec956f940 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/no_target_promotion_latest.patch b/ports/qtimageformats/no_target_promotion_latest.patch new file mode 100644 index 00000000000000..1b76e36b58ed74 --- /dev/null +++ b/ports/qtimageformats/no_target_promotion_latest.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7fdd7ddbd..f189c472c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,6 +9,15 @@ project(QtImageFormats # special case + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C + ) +- ++find_package(Threads) ++set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) ++find_package(ZLIB) ++if(TARGET ZLIB::ZLIB) ++ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) ++endif() ++find_package(JPEG) ++if(TARGET JPEG::JPEG) ++ set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) ++endif() + find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case + find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) # special case diff --git a/ports/qtimageformats/portfile.cmake b/ports/qtimageformats/portfile.cmake index 275b927af08580..80341bd83f0b76 100644 --- a/ports/qtimageformats/portfile.cmake +++ b/ports/qtimageformats/portfile.cmake @@ -2,7 +2,11 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES no_target_promotion.patch) +if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) + set(${PORT}_PATCHES no_target_promotion.patch) +else() + set(${PORT}_PATCHES no_target_promotion_latest.patch) +endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index 8d0bca44af00da..fb4eff8a6c271e 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.2.4", + "version": "6.3.0", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index 4d084f33e1c472..a3c3bf4e7abe9e 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.2.4", - "port-version": 2, + "version": "6.3.0", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index 9fde64ebe440d9..845debcbe746b8 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index f5b37860e2a0e5..654d11143e0c51 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.2.4", + "version": "6.3.0", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 1457f1ebf1a5d2..962679e2565637 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index b93a864ba6da94..dcd5e4e7b37797 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 03ab652c43e2a4..685bcaf022ca8b 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 87038f227dcfe4..6484e6abacb160 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, @@ -40,6 +40,7 @@ "default-features": false, "features": [ "amalgamation", + "historizing", "openssl" ] } diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 7858af023392b3..2d6fa1e4ab8313 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/portfile.cmake b/ports/qtquick3d/portfile.cmake index af7915a09ed2dd..43449146fa1777 100644 --- a/ports/qtquick3d/portfile.cmake +++ b/ports/qtquick3d/portfile.cmake @@ -16,7 +16,7 @@ else() list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=no) endif() -set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer) +set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer materialeditor shapegen) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 26d691f985d352..6828042ef3ac1e 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.2.4", + "version": "6.3.0", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 2bcaea99011d5f..fa1ad823b752f0 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.2.4", + "version": "6.3.0", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index b9f5c19b1cafc9..4c2591f079405f 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index b32abdee6f96c9..01a1d1387829f4 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.2.4", + "version": "6.3.0", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index 558c07d258a5bf..e7a799fa694c75 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index 060fe04e8ed439..5d26a8a1e4af0c 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.2.4", + "version": "6.3.0", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index af1875ab845aab..c4bde3e9cc71cd 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index c66a073f4627be..2384a42d46b9fb 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.2.4", + "version": "6.3.0", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index f540f80387fb2c..4c8bdb3fa41222 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 3532d725944f85..e2177e6e672257 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index c6fa365d67392c..135e746583009f 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index db0a9deb34a237..69c4aa803aec7f 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.2.4", + "version": "6.3.0", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index d201b62b7102cb..e662994d29f079 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.2.4", + "version": "6.3.0", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index 3dbef769aa6ac6..13315f04ecd303 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index 8b44f726a78ba0..3ffe0b37638f1d 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -45,7 +45,6 @@ endif() vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(GPERF) -vcpkg_find_acquire_program(PYTHON2) #vcpkg_find_acquire_program(GN) # Qt builds its own internal version @@ -63,8 +62,16 @@ get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${FLEX_DIR}") get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${BISON_DIR}") -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") + +if(NOT QT_IS_LATEST) + vcpkg_find_acquire_program(PYTHON2) + get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) + vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") + list(APPEND FEATURE_OPTIONS "-DPython2_EXECUTABLE=${PYTHON2}") +else() + vcpkg_find_acquire_program(PYTHON3) + x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES html5lib) +endif() if(WIN32) # WIN32 HOST probably has win_flex and win_bison! if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") @@ -75,6 +82,10 @@ if(WIN32) # WIN32 HOST probably has win_flex and win_bison! endif() endif() +#set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/../tmp") # avoid long path issues in CI. +#cmake_path(NORMAL_PATH CURRENT_BUILDTREES_DIR) +#file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}") + ### Download third_party modules vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE @@ -103,7 +114,6 @@ qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. -DBISON_EXECUTABLE=${BISON} -DFLEX_EXECUTABLE=${FLEX} #-DGn_EXECUTABLE=${GN} - -DPython2_EXECUTABLE=${PYTHON2} -DNodejs_EXECUTABLE=${NODEJS} OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 6365ebc0f64943..6b55e368c92c58 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, @@ -103,6 +103,10 @@ "name": "snappy", "platform": "!windows" }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, { "name": "vcpkg-tool-nodejs", "host": true diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 953e5ebf49086e..3f37294d95f56b 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index bc94b7435bb917..0842799214b983 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.2.4", + "version": "6.3.0", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index d0af4ce5c42a4b..4ea9b7d9ea9bad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5657,7 +5657,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5837,7 +5837,7 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qt6betablock": { @@ -5845,52 +5845,52 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtbase": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtcharts": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtcoap": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtdoc": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtimageformats": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.2.4", - "port-version": 2 + "baseline": "6.3.0", + "port-version": 0 }, "qtkeychain": { "baseline": "0.13.2", @@ -5901,35 +5901,35 @@ "port-version": 0 }, "qtlocation": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtlottie": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtmqtt": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtopcua": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtpositioning": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtquick3d": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtquickcontrols2": { @@ -5937,67 +5937,67 @@ "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtscxml": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtsensors": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtserialbus": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtserialport": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtshadertools": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtsvg": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qttools": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qttranslations": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtwayland": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtwebengine": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "qtwebview": { - "baseline": "6.2.4", + "baseline": "6.3.0", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 8d7d766101cc5e..a75d487a560019 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b4a7a1d86d93bd16d897b76cdf85abeac8e67d3", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "38c269c72f98a9fd49b28d428ad29cc5f1079fac", "version": "6.2.4", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index b88ffd90ddc2b4..c33c3f1d0b9fe4 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0de65b9a2c56a557ec23d71c0f9eb83d1814d01f", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "e9ffdd0f5186b67741f04c15121449eb62f21f45", "version": "6.2.4", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index ef6edccc242eb0..ca9603d80d64e7 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "774c1e6820a5c0271d4f228f7f680664e3407641", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "f58617e4fa4a6e358daffccd8d286cd9dab162ee", "version": "6.2.4", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 2e6fdb2a1a53a0..6a8915e6768aa3 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31b3d7a098e8f98ad1ee4d897c164236bfef040c", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "d51f980344bfb14ace79b30fbf510e92b4924da8", "version": "6.2.4", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 42f90f865923d8..2b67b6aa132845 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a107123c1e35b7e5fc0df157026d7fde8a42632", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "35e9386f344f01e0e37df7b2d2ae991db6bbb1cc", "version": "6.2.4", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index b840a15b691b8a..afca070b925922 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a6b0d90d87f22b85e513ae3aec86a31da8ba345", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "d5e059fea3a95f9b719d3b3069f09be05413ef99", "version": "6.2.4", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 3473d9933757be..828fd8e0a794ac 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d43d6c903f6d72b54187e9f6657a346929ab515", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7f05c6aaeb825647d3c802feeb1b06a0d14a83c0", "version": "6.2.4", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index b4b4e974113295..addefe2357ef2a 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c7069034cb39a6450178d52a58a0ddffda07b5d", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "db0fc2cda2cc383043f8e1fc4b48849183f038b8", "version": "6.2.4", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index ebd18f8b516cf8..da7d86be7146ed 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1fd864c050d29e79b16f84029402fcb3840d1a9", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "c35b1ffb8bc3d76b8537e2d5d59176545f4a02bc", "version": "6.2.4", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 5d3827b0e1452e..ffffb58e8b6f90 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "551991d8ec2c004a196cc0c3e6acc8babe34546f", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "ea64315431fd028d453a27e999d7e696f48923d4", "version": "6.2.4", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index 2b269d377b4756..795acfe145055c 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4945df086d916c7aa24e9ed44ac983b1ef65c84b", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "a688914d635b3b8f3295bfa76e3581b2db6d3d44", "version": "6.2.4", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 5edb3f9b867bea..2eee1ca53b9a15 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb9dbafdcf670a693bbdfb8c9d9f3a6282e8a455", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "5e04878cf2a70ff87ae027aaefc5d40c328cffba", "version": "6.2.4", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 52ba49b717584c..c73d127634f6dd 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8be93de3e45f5a409cb6606b1f9e240468513506", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "721c778bc9a6bd4e04a2e1cfb5437ffb7e59abc0", "version": "6.2.4", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 06e2dea89a9d67..a9fd1a0b451ad0 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdc3b41d77a6ee6160cfc442ddacf03aa91d0481", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "b54a54283fd7e3a5929b1d67721675ee1c8d5234", "version": "6.2.4", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index de75ba18c3fa91..5e90ec0efe5550 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a05ac67b49b7e904ecfbe1f717de1d958f534732", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "ef7c3db0a80c38d01ff341d090a291f4f1a098aa", "version": "6.2.4", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index cf263c8b053501..73f5ebe5371e95 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea1df3762dec91c8fb7709297007be459484e89c", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "57035eea5acd484e3a6a51f5da16046283c58f50", "version": "6.2.4", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index b62a8368013d56..3a4f689df0d61a 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f29ef7a81aacf9d33e6741138f80be59f69a8a2", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "0b09100a4e32240e79258ab69386b77370d916a0", "version": "6.2.4", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index fc552d13028239..69df371935ddd1 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21bab604cd34ebe659fdc7b12249d1e69359d939", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "d0e46329a8e66cf3f95eca5d4018c955a8b54a15", "version": "6.2.4", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index a524dc86a62ae8..4e5dabc7bc327d 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2449ff55a2b817d0f651aa00b2cadc914c0b68ae", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "edc058f97084276593fa00ebc1ad1dbf865abb57", "version": "6.2.4", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 47a362cff326ea..c3f649c3127ce5 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8083780556aa4e951599cc798aa4a64a3ccf7341", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7a9e72b88e14594db1752854941cb95174565be6", "version": "6.2.4", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 88693a1df33cbb..cb3cf2885343b6 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47fd199ee3c949ade116a3c070f2aaaedd2aa91f", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "26bbae5f5512a6ca58eada26e54c94666174ec71", "version": "6.2.4", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index bcbffd2c7201bc..9a84e09da26677 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5c67539ad28c84e99778aa173cda5950873a6ee", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "0782a581d66c7895e5fe12eb225bbd63ff6d0799", "version": "6.2.4", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index b546a117c6bd33..1cd036b973e29a 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28a8faa45cb13b376cd881be9494826bb9556009", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7797c7b3d33d915ba656bfc26717623fcd187109", "version": "6.2.4", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 2866acc0025d0c..69dc10ffc0307a 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce8e5b5c4570cf489ea6dd4e19c454e2e3ab54bb", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "c9f576479ffa0be9262702030362c0b030b1497b", "version": "6.2.4", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 1073b88269161b..28d95bcf17761b 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b64cdc43d7e83cb693720f28c13408a39ad0afa", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "82cfc4f68723b511524573f7492e44c0326378f7", "version": "6.2.4", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 34a1cbb8cbdecf..39a7e985e9782f 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8eefc49c6f1c874ba871cbb811e13b54a0fdf7ff", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "b52c1c71cc2c185f936b5e1e278ed4758bae6d6e", "version": "6.2.4", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index aab2381f8bd7d4..8cd62cd8ae375a 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8df6a16221d7abc2af7d76a7c809901e5ae45484", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "97a896e4a1812c908a3db8b73676fbda9280569b", "version": "6.2.4", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 67aa32223d53fd..e0803db96c0e51 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c74684c9a5e6b20ae4066a5f1b7af2decec2ced7", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "3a4f36aca9457e6a78f5b6c1f65b1d36f7666fd7", "version": "6.2.4", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 0c4363ce25b4f1..1cad19d17f270f 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75ac0d075ab14c918db6e38e398fca4bc877c146", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7d8e8be656c7dc865d98021272c0f716c14866ed", "version": "6.2.4", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 763ca70f672471..e04f0ab9be4a09 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3bc8989c9c61cc741186f5dc7fc4eda94f20f6a4", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "df716d6718c7fad4a45e9eecc493c6c4cc752744", "version": "6.2.4", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 8f827546361db7..d8aa3c99f573a5 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "002b7b9432d4c1f49de7a486f70a673285cd98a8", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "a00f4470b9264ccffc7dfb230684126e61fb0f2c", "version": "6.2.4", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index c702c0ccde2864..2827646445e3d2 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09befbf6b2bd7001465003cbdd49ae138b754316", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "d16f4613ad42d01be87aa75bf23013dc7da1845a", "version": "6.2.4", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index e95d822c844d60..07b21571686335 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5804d29790d75c7a40c1fe9c4f54c3cfd03a5eaa", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "fcfb5975545e28e64e2f5c71c5f5a2cbc0b22c70", "version": "6.2.4", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index eb7c396874aa7d..7f37d926ea69ba 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e7c6ecb71e8b4c3b8277f97f461d6f8b017ef1c", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "9930653065c44653bdf5f7285799d1a9ebb44d83", "version": "6.2.4", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 55122a8db427d3..03c186376b2285 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8c14bb3f3297e816d3f0df2bc0377fce7963c55", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7bc22dab6b47734c9163edde8bef8e9088a04301", "version": "6.2.4", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index edb49ebc8e8ac0..0e91c3f0b7ec38 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47cd0b321b5eda832afbb46e58159ca3adb65ce9", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7972a7fa77f29d83f91787c942f4f85d50651c05", "version": "6.2.4", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 459c87c45051d6..e2499a6ceca908 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "615c601a62d67874adfb14ae7f1d9859f87a6719", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "78911113c7407ff6403479ace90d0f4b2656e517", "version": "6.2.4", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index f4da583d93a505..699bcdf62b41d6 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "248b7ff0cd48d36410f9fde1119d2624260a4c6a", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "8a8cb6fb5af80519ad2f3d0e9f80a027f1d16165", "version": "6.2.4", From 0e1107ce6271119329bc261c100d26a18efca30d Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 21 Apr 2022 18:55:04 +0000 Subject: [PATCH 071/383] [tiff] fix invalid memory accesses (#24121) * [tiff] Patch for CVE-2022-0561 (microsoft#24120) See https://nvd.nist.gov/vuln/detail/CVE-2022-0561 for more details * [tiff] Patch for CVE-2022-0562 (microsoft#24120) See https://nvd.nist.gov/vuln/detail/CVE-2022-0562 for more details * [tiff] Patch for CVE-2022-0865 (microsoft#24120) See https://nvd.nist.gov/vuln/detail/CVE-2022-0865 for more details * [tiff] Patch for CVE-2022-0891 (microsoft#24120) See https://nvd.nist.gov/vuln/detail/CVE-2022-0891 for more details * [tiff] Patch for CVE-2022-0907 (microsoft#24120) See https://nvd.nist.gov/vuln/detail/CVE-2022-0907 for more details * [tiff] Patch for CVE-2022-0908 (microsoft#24120) See https://nvd.nist.gov/vuln/detail/CVE-2022-0908 for more details * [tiff] Patch for CVE-2022-0909 (microsoft#24120) See https://nvd.nist.gov/vuln/detail/CVE-2022-0909 for more details * [tiff] Patch for CVE-2022-0924 (microsoft#24120) See https://nvd.nist.gov/vuln/detail/CVE-2022-0924 for more details * [tiff] Patch for CVE-2022-22844 (microsoft#24120) See https://nvd.nist.gov/vuln/detail/CVE-2022-22844 for more details * [tiff] bump portversion and regenerate registries (microsoft#24120) --- ports/tiff/portfile.cmake | 63 +++++++++++++++++++++++++++++++++++++++ ports/tiff/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tiff.json | 5 ++++ 4 files changed, 70 insertions(+), 2 deletions(-) diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index dc8594f6efef2c..3c695f9b2aa0dc 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -1,5 +1,59 @@ set(LIBTIFF_VERSION 4.3.0) +vcpkg_download_distfile(CVE_2022_0561_diff + URLS https://gitlab.com/libtiff/libtiff/-/commit/eecb0712f4c3a5b449f70c57988260a667ddbdef.diff + FILENAME libtiff-CVE-2022-0561.diff + SHA512 48df4e93202723778fdb6b87bcb7e2e4118546c6deb47e9999b8818e69420ad52a4a7823c68ab74d30657adb2278641971e43db771a1796fda95d2433ad991a0 +) + +vcpkg_download_distfile(CVE_2022_0562_diff + URLS https://gitlab.com/libtiff/libtiff/-/commit/561599c99f987dc32ae110370cfdd7df7975586b.diff + FILENAME libtiff-CVE-2022-0562.diff + SHA512 4346098e7a2433cf15d02a7baa3d1fa4b648f58845200264ecc0a230035f15da4cf1427c4a4ff73797bc01f105bd9ff705371c2f3867be4f9103b07d4d0edea8 +) + +vcpkg_download_distfile(CVE_2022_0865_diff + URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/306.diff + FILENAME libtiff-CVE-2022-0865.diff + SHA512 f22e0cee03716e6c6f130606c74acc7033dd61e20276e38e89a0ba485857d05a7bc22e445c52010797b7020febc30d3aca854d8a0c4ed0e2453201de550b4058 +) + +vcpkg_download_distfile(CVE_2022_0891_diff + URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/307.diff + FILENAME libtiff-CVE-2022-0891.diff + SHA512 6a88a0423057da11121d5297e2f425199341cbc6b299a0f77dd57baddf3f6a022a6dfe1fb97caabfd6e95a40b6c95a0e6b9a80e199054c271ccb257e23671fcf +) + +vcpkg_download_distfile(CVE_2022_0907_diff + URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/314.diff + FILENAME libtiff-CVE-2022-0907.diff + SHA512 72455bb9698e8670b7ffcc1e6c644b9fd4d3aab46ca5940dc8130c796435a838f05555bf85293770c77b73690b137cd6931d59d61d649482b42b7b98afe88f3a +) + +vcpkg_download_distfile(CVE_2022_0908_diff + URLS https://gitlab.com/libtiff/libtiff/-/commit/a95b799f65064e4ba2e2dfc206808f86faf93e85.diff + FILENAME libtiff-CVE-2022-0908.diff + SHA512 1f6bb30c00d671665870aea46898390c1545d00d80e17db07b5136f6bfb85fff8d95c2c63493066b9257d871858935497062d992cf978ca5037d8b079bfdeab1 +) + +vcpkg_download_distfile(CVE_2022_0909_diff + URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/310.diff + FILENAME libtiff-CVE-2022-0909.diff + SHA512 d675ac09a40136bdc808ae75030f199ebcbaf38b2e904b3b26b21d18e39fe89a1c703d5ee6156b337ec9dde29ad311cb6551de984aa87d796c9af0a26d758af3 +) + +vcpkg_download_distfile(CVE_2022_0924_diff + URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/311.diff + FILENAME libtiff-CVE-2022-0924.diff + SHA512 dcd22b4ef121128aabc8b2aadf4eac16597ee8b211bb06467c93bbccafe47a45917f07a6f4264d43f4c1596eb54d7d0a073987e6899a9f8d057632244cf75c67 +) + +vcpkg_download_distfile(CVE_2022_22844_diff + URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/287.diff + FILENAME libtiff-CVE-2022-22844.diff + SHA512 2a3bb8ae9191794bff52a4b776a35b244a24e3b2ca963ccfd40166566fae18a2333d7db6c2e2cf17daa9fe61eaca3bd8c36d9807fd1aa0491a041ec22d65c70e +) + vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH @@ -10,6 +64,15 @@ vcpkg_from_gitlab( PATCHES cmakelists.patch fix-pkgconfig.patch FindCMath.patch + ${CVE_2022_0561_diff} + ${CVE_2022_0562_diff} + ${CVE_2022_0865_diff} + ${CVE_2022_0891_diff} + ${CVE_2022_0907_diff} + ${CVE_2022_0908_diff} + ${CVE_2022_0909_diff} + ${CVE_2022_0924_diff} + ${CVE_2022_22844_diff} ) set(EXTRA_OPTIONS "") diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index dad2b88d5a967d..498810b8c82836 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiff", "version": "4.3.0", - "port-version": 7, + "port-version": 8, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 4ea9b7d9ea9bad..d92e54ce3a7da9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6942,7 +6942,7 @@ }, "tiff": { "baseline": "4.3.0", - "port-version": 7 + "port-version": 8 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index f8d9cc569e70fd..1aa82bc5c0070c 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2cafe3465d7c00233114c75abd86ed11538c186", + "version": "4.3.0", + "port-version": 8 + }, { "git-tree": "4f05b5c8b426ce84fbc8930c8f935b792feeb1f4", "version": "4.3.0", From ecd55433fd37129109f663548f3b11204e35e630 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 21 Apr 2022 21:08:18 +0200 Subject: [PATCH 072/383] [qnnpack] fix arm64-osx (#24237) * [qnnpack] no arm osx * fix arm64-osx instead Co-authored-by: nicole mazzuca --- ports/qnnpack/fix-arm64-osx.patch | 18 ++++++++++++++++++ ports/qnnpack/portfile.cmake | 9 +++++---- ports/qnnpack/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/q-/qnnpack.json | 5 +++++ 5 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 ports/qnnpack/fix-arm64-osx.patch diff --git a/ports/qnnpack/fix-arm64-osx.patch b/ports/qnnpack/fix-arm64-osx.patch new file mode 100644 index 00000000000000..2b13997e8b0004 --- /dev/null +++ b/ports/qnnpack/fix-arm64-osx.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,12 +32,15 @@ + IF(NOT IOS_ARCH MATCHES "^(i386|x86_64|armv7.*|arm64.*)$") + MESSAGE(FATAL_ERROR "Unrecognized IOS_ARCH = ${IOS_ARCH}") + ENDIF() + ELSE() + MESSAGE(FATAL_ERROR "CMAKE_SYSTEM_PROCESSOR is not defined") + ENDIF() ++ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") ++ # on macOS, arm64 is called arm64 ++ SET(CMAKE_SYSTEM_PROCESSOR "aarch64") + ELSEIF(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3-6]86|x86_64|armv[5-8].*|aarch64)$") + MESSAGE(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}") + ENDIF() + + IF(NOT CMAKE_SYSTEM_NAME) + MESSAGE(FATAL_ERROR "CMAKE_SYSTEM_NAME not defined") diff --git a/ports/qnnpack/portfile.cmake b/ports/qnnpack/portfile.cmake index 673307bc479ad3..157d47ec75742d 100644 --- a/ports/qnnpack/portfile.cmake +++ b/ports/qnnpack/portfile.cmake @@ -6,17 +6,18 @@ vcpkg_from_github( HEAD_REF master PATCHES use-packages.patch + fix-arm64-osx.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DQNNPACK_BUILD_TESTS=OFF -DQNNPACK_BUILD_BENCHMARKS=OFF ) vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/bin +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/bin" ) diff --git a/ports/qnnpack/vcpkg.json b/ports/qnnpack/vcpkg.json index ea8b98f7aeb921..a22b2306e60382 100644 --- a/ports/qnnpack/vcpkg.json +++ b/ports/qnnpack/vcpkg.json @@ -1,11 +1,11 @@ { "name": "qnnpack", "version-date": "2021-02-26", - "port-version": 2, + "port-version": 3, "description": "Quantized Neural Network PACKage - mobile-optimized implementation of quantized neural network operators", "homepage": "https://github.com/pytorch/QNNPACK", "license": "BSD-3-Clause", - "supports": "linux | osx", + "supports": "!windows", "dependencies": [ "cpuinfo", "fp16", diff --git a/versions/baseline.json b/versions/baseline.json index d92e54ce3a7da9..bc595d7ed931ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5646,7 +5646,7 @@ }, "qnnpack": { "baseline": "2021-02-26", - "port-version": 2 + "port-version": 3 }, "qpid-proton": { "baseline": "0.37.0", diff --git a/versions/q-/qnnpack.json b/versions/q-/qnnpack.json index 802a45951b563a..e5789c3c289a29 100644 --- a/versions/q-/qnnpack.json +++ b/versions/q-/qnnpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cee68bf91e46cc783fe3f03d4525e02c0793389c", + "version-date": "2021-02-26", + "port-version": 3 + }, { "git-tree": "907c113d0c35b674976b5c3b7dc96b2c71084061", "version-date": "2021-02-26", From 8288d7ee5dc0c9df1729116d09abb3307b0eb876 Mon Sep 17 00:00:00 2001 From: Daniel Collins Date: Thu, 21 Apr 2022 22:30:13 +0100 Subject: [PATCH 073/383] [libunistring] Add support for building on Windows (#24253) * [libunistring] Add support for building on Windows Tweaked the portfile to no longer trigger autotools as it caused more problems when trying to build for MSVC, so the old automake patch is no longer needed. The awk script used in configure should've worked, but seems to somehow get double-interpolated somewhere along the way in such a way as to strip out quotes needed in the script, so put in in a dedicated script. Added wrappers so the build scripts can use "nm" and "ar" as if this were a UNIX target. Fixed compiler output (warnings) getting merged with dumpbin output and putting garbage into lib/config.h * [libunistring] Fix non-x64 Windows builds. * [libunistring] Bump port-version * vcpkg x-add-version --all * [libunistring] Mark failure under UWP as expected * [libunistring] Remove my wrapper scripts in favour of built-in ones. * vcpkg x-add-version --all * [libunistring] UWP isn't supported. * vcpkg x-add-version --all --- .../fix-for-automake-1.16.4.patch | 13 ----- .../libunistring-msys-msvc-build.patch | 53 +++++++++++++++++++ ports/libunistring/portfile.cmake | 5 +- ports/libunistring/vcpkg.json | 4 +- versions/baseline.json | 2 +- versions/l-/libunistring.json | 5 ++ 6 files changed, 64 insertions(+), 18 deletions(-) delete mode 100644 ports/libunistring/fix-for-automake-1.16.4.patch create mode 100644 ports/libunistring/libunistring-msys-msvc-build.patch diff --git a/ports/libunistring/fix-for-automake-1.16.4.patch b/ports/libunistring/fix-for-automake-1.16.4.patch deleted file mode 100644 index 2e9a2ebda0962b..00000000000000 --- a/ports/libunistring/fix-for-automake-1.16.4.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/m4/init-package-version.m4 -+++ b/m4/init-package-version.m4 -@@ -82,9 +82,9 @@ - [AC_SUBST([PACKAGE], [$1]) - AC_SUBST([VERSION], [$2]) - ]) - m4_define([AM_INIT_AUTOMAKE], - m4_defn([gl_RPL_INIT_AUTOMAKE])) - ]) --m4_define([gl_INIT_DUMMY], []) -+m4_define([gl_INIT_DUMMY], [dummy]) - AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [ - m4_ifval([$2], diff --git a/ports/libunistring/libunistring-msys-msvc-build.patch b/ports/libunistring/libunistring-msys-msvc-build.patch new file mode 100644 index 00000000000000..98d6d562d5b154 --- /dev/null +++ b/ports/libunistring/libunistring-msys-msvc-build.patch @@ -0,0 +1,53 @@ +--- /dev/null ++++ b/build-aux/dumpbin-to-nm.awk +@@ -0,0 +1,14 @@ ++{last_section=section; section=$ 3}; ++/^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]}; ++/Section length .*#relocs.*(pick any)/{hide[last_section]=1}; ++/^ *Symbol name *: /{split($ 0,sn,":"); si=substr(sn[2],2)}; ++/^ *Type *: code/{print "T",si,substr(si,length(prfx))}; ++/^ *Type *: data/{print "I",si,substr(si,length(prfx))}; ++$ 0!~/External *\|/{next}; ++$ 0~/__local_stdio_printf_options/{next}; ++/ 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next}; ++{if(hide[section]) next}; ++{f="D"}; $ 0~/\(\).*\|/{f="T"}; ++{split($ 0,a,/\||\r/); split(a[2],s)}; ++s[1]~/^[@?]/{print f,s[1],s[1]; next}; ++s[1]~prfx {split(s[1],t,"@"); print f,t[1],substr(t[1],length(prfx))} +--- a/configure ++++ b/configure +@@ -10274,21 +10274,7 @@ + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. +- lt_cv_sys_global_symbol_pipe="$AWK '"\ +-" {last_section=section; section=\$ 3};"\ +-" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +-" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +-" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +-" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ +-" \$ 0!~/External *\|/{next};"\ +-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +-" {if(hide[section]) next};"\ +-" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +-" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +-" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +-" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +-" ' prfx=^$ac_symprfx" ++ lt_cv_sys_global_symbol_pipe="$AWK -f '$(realpath "$(dirname $0)")/build-aux/dumpbin-to-nm.awk' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -5934,7 +5938,7 @@ + test -f $$sf || sf=$(srcdir)/$$sf; \ + of=`echo "$$f" | sed -e 's,^.*/,,' -e 's,\\.[^.]*$$,,'`.$(OBJEXT); \ + echo "$(COMPILE) -c $$sf" 1>&6; \ +- $(COMPILE) -c $$sf || { rm -f config.h; exit 1; }; \ ++ $(COMPILE) -c $$sf 1>&6 || { rm -f config.h; exit 1; }; \ + sh ./exported.sh $$of 1>&5; \ + rm -f $$of `echo "$$of" | sed -e 's,\\.$(OBJEXT)$$,.lo,'`; \ + ;; \ diff --git a/ports/libunistring/portfile.cmake b/ports/libunistring/portfile.cmake index e16d0a5bac1160..9e4e55ff05b6d4 100644 --- a/ports/libunistring/portfile.cmake +++ b/ports/libunistring/portfile.cmake @@ -13,16 +13,17 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" REF ${LIBUNISTRING_VERSION} - PATCHES fix-for-automake-1.16.4.patch # automake 1.16.4 uses m4_ifset instead of m4_ifdef + PATCHES libunistring-msys-msvc-build.patch ) vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG COPY_SOURCE + USE_WRAPPERS OPTIONS "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" ) + vcpkg_install_make() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libunistring/vcpkg.json b/ports/libunistring/vcpkg.json index c2aa59fc2de7b8..dfb16c1f85af3b 100644 --- a/ports/libunistring/vcpkg.json +++ b/ports/libunistring/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libunistring", "version": "0.9.10", - "port-version": 2, + "port-version": 3, "description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.", "homepage": "https://www.gnu.org/software/libunistring/", - "supports": "!windows", + "supports": "!uwp", "dependencies": [ "libiconv" ] diff --git a/versions/baseline.json b/versions/baseline.json index bc595d7ed931ac..d1775d6af621fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4114,7 +4114,7 @@ }, "libunistring": { "baseline": "0.9.10", - "port-version": 2 + "port-version": 3 }, "liburing": { "baseline": "2.0", diff --git a/versions/l-/libunistring.json b/versions/l-/libunistring.json index 90395ba3cec3ce..c534b9ba647dc8 100644 --- a/versions/l-/libunistring.json +++ b/versions/l-/libunistring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ae1c5ae3927f718073792b5cb86fa434b5c8c49", + "version": "0.9.10", + "port-version": 3 + }, { "git-tree": "1d6ff819975c70dc53d9aefa5d9046a0a21617b4", "version": "0.9.10", From 9234b343517cdb0375318784db74bc827fb0f115 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 21 Apr 2022 23:31:21 +0200 Subject: [PATCH 074/383] [wxwidgets] Fix absolute paths (#24261) * Fix absolute path fixup * Update versions --- ports/wxwidgets/portfile.cmake | 4 ++-- ports/wxwidgets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 2bf7be2680a7bf..12aa21a1716a03 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -145,11 +145,11 @@ if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/wx/setup.h") configure_file("${CMAKE_CURRENT_LIST_DIR}/setup.h.in" "${CURRENT_PACKAGES_DIR}/include/wx/setup.h" @ONLY) endif() -file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/wx/config/*" "${CURRENT_PACKAGES_DIR}/tools/wx-config") +file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/wx/config/*" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wx-config") foreach(config IN LISTS configs) vcpkg_replace_string("${config}" "${CURRENT_INSTALLED_DIR}" [[${prefix}]]) endforeach() -file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/debug/lib/wx/config/*") +file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/debug/lib/wx/config/*" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/wx-config") foreach(config IN LISTS configs) vcpkg_replace_string("${config}" "${CURRENT_INSTALLED_DIR}/debug" [[${prefix}]]) endforeach() diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 5f504972e23cfd..bb03ce03563ce5 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wxwidgets", "version-semver": "3.1.5", - "port-version": 9, + "port-version": 10, "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", diff --git a/versions/baseline.json b/versions/baseline.json index d1775d6af621fe..77157f7ea2db5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7514,7 +7514,7 @@ }, "wxwidgets": { "baseline": "3.1.5", - "port-version": 9 + "port-version": 10 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 392562d2375f5d..53c9c27d76f018 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99203047a716a1b39d06fb93c48daebb4b184141", + "version-semver": "3.1.5", + "port-version": 10 + }, { "git-tree": "26ad66271632adb4d00a270a90ad18514025859e", "version-semver": "3.1.5", From 94635bf7c1101e062c2aa8b90f3b8672163b576a Mon Sep 17 00:00:00 2001 From: Jonathan Sweemer Date: Fri, 22 Apr 2022 06:32:00 +0900 Subject: [PATCH 075/383] [quantlib] update to v1.26 (#24268) --- ports/quantlib/portfile.cmake | 4 ++-- ports/quantlib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quantlib.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index 158dd4813f9c25..a75a85b83171b4 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF QuantLib-v1.25 - SHA512 9a08c3d825f85c93e7db74b31dc93d03d7ec487b7a09f86b6f3efb0404791e1b3e1ea19e06cea19fd04ab190d2e8eb7bad889660d47eb9988c36609967646aa3 + REF QuantLib-v1.26 + SHA512 597dcb4aa3e2701bea758c7b0c62ca0b303a16eda5f324b349ba4e8cc011f6a256fb26d5c42f2bb432da06df1c7b5ec208195e1104e620b69d2a7e8265fd6470 HEAD_REF master ) diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index b3020874012e1b..49aa646ed37b57 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quantlib", - "version": "1.25", + "version": "1.26", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", "supports": "!(windows & !static)", diff --git a/versions/baseline.json b/versions/baseline.json index 77157f7ea2db5a..a04870eb78de0e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6005,7 +6005,7 @@ "port-version": 1 }, "quantlib": { - "baseline": "1.25", + "baseline": "1.26", "port-version": 0 }, "quaternions": { diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index c8bb6a47b5ca31..8e8b979b3a8387 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3af9ced73240dfb4e1ec776c5f9a16ac277d1c27", + "version": "1.26", + "port-version": 0 + }, { "git-tree": "4d702f6d14c1a91b83a4950dd05e3b200700cfd8", "version": "1.25", From 9f7c4cd4f801c2512bec61bcb487419e52d98cd4 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Thu, 21 Apr 2022 23:33:08 +0200 Subject: [PATCH 076/383] [mosquitto] Update to 2.0.14 (#24271) * [mosquitto] Update to 2.0.14 * version * remove tabs * version --- ...1-add-archive-destination-to-install.patch | 39 ----------- ports/mosquitto/0002-win64-support.patch | 2 +- .../0003-add-find_package-libwebsockets.patch | 16 +---- .../mosquitto/0004-support-static-build.patch | 4 +- ports/mosquitto/portfile.cmake | 64 +++++++++---------- ports/mosquitto/vcpkg.json | 13 ++-- versions/baseline.json | 4 +- versions/m-/mosquitto.json | 5 ++ 8 files changed, 51 insertions(+), 96 deletions(-) delete mode 100644 ports/mosquitto/0001-add-archive-destination-to-install.patch diff --git a/ports/mosquitto/0001-add-archive-destination-to-install.patch b/ports/mosquitto/0001-add-archive-destination-to-install.patch deleted file mode 100644 index 5df6128edb6385..00000000000000 --- a/ports/mosquitto/0001-add-archive-destination-to-install.patch +++ /dev/null @@ -1,39 +0,0 @@ -From df5ec7ba4e7b1516a2636e47c33a4a6161b5c422 Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Tue, 22 Sep 2020 15:38:44 -0700 -Subject: [PATCH 1/5] add archive destination to install - ---- - lib/CMakeLists.txt | 2 +- - lib/cpp/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index e1521f1..bd60b75 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -87,7 +87,7 @@ set_target_properties(libmosquitto PROPERTIES - SOVERSION 1 - ) - --install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") - - if (WITH_STATIC_LIBRARIES) - add_library(libmosquitto_static STATIC ${C_SRC}) -diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt -index b39ac3f..5805244 100644 ---- a/lib/cpp/CMakeLists.txt -+++ b/lib/cpp/CMakeLists.txt -@@ -13,7 +13,7 @@ set_target_properties(mosquittopp PROPERTIES - VERSION ${VERSION} - SOVERSION 1 - ) --install(TARGETS mosquittopp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+install(TARGETS mosquittopp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") - - if (WITH_STATIC_LIBRARIES) - add_library(mosquittopp_static STATIC --- -2.24.3 (Apple Git-128) - diff --git a/ports/mosquitto/0002-win64-support.patch b/ports/mosquitto/0002-win64-support.patch index dae3d03a36ddc2..c140a7873c52f5 100644 --- a/ports/mosquitto/0002-win64-support.patch +++ b/ports/mosquitto/0002-win64-support.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 07eff849..3edc7efa 100644 +index 2775a3da..ddd81b04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,12 +67,7 @@ option(WITH_THREADING "Include client library threading support?" ON) diff --git a/ports/mosquitto/0003-add-find_package-libwebsockets.patch b/ports/mosquitto/0003-add-find_package-libwebsockets.patch index b167b0da51f2a2..fc61ddfd5825f0 100644 --- a/ports/mosquitto/0003-add-find_package-libwebsockets.patch +++ b/ports/mosquitto/0003-add-find_package-libwebsockets.patch @@ -1,17 +1,8 @@ -From 902ab5bf91937188d3ebf0aece81a704729e5580 Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Tue, 22 Sep 2020 15:42:53 -0700 -Subject: [PATCH 3/5] add find_package libwebsockets - ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1a92fe3..3c78b2c 100644 +index 2775a3da..ef7ce14a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -45,6 +45,7 @@ endif (WITH_TLS) +@@ -55,6 +55,7 @@ endif (WITH_UNIX_SOCKETS AND NOT WIN32) option(WITH_SOCKS "Include SOCKS5 support?" ON) if (WITH_SOCKS) @@ -19,6 +10,3 @@ index 1a92fe3..3c78b2c 100644 add_definitions("-DWITH_SOCKS") endif (WITH_SOCKS) --- -2.24.3 (Apple Git-128) - diff --git a/ports/mosquitto/0004-support-static-build.patch b/ports/mosquitto/0004-support-static-build.patch index bd3e44d030b05a..85835730333dd8 100644 --- a/ports/mosquitto/0004-support-static-build.patch +++ b/ports/mosquitto/0004-support-static-build.patch @@ -1,5 +1,5 @@ diff --git a/apps/mosquitto_passwd/CMakeLists.txt b/apps/mosquitto_passwd/CMakeLists.txt -index 13a7d826..31069306 100644 +index 13a7d826..5e96f49c 100644 --- a/apps/mosquitto_passwd/CMakeLists.txt +++ b/apps/mosquitto_passwd/CMakeLists.txt @@ -13,6 +13,10 @@ if (WITH_TLS) @@ -15,7 +15,7 @@ index 13a7d826..31069306 100644 install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") endif (WITH_TLS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 5da221dc..c3e9fce0 100644 +index 31cc35e3..a1a3e01a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -69,7 +69,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID) diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index c20fe2a9fc9707..ab11f068f07d7d 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/mosquitto HEAD_REF master - REF v2.0.12 - SHA512 bf502f4f8c5f8d9ae9ee6e6a417e3f9deea9933c69176903d460a1c91132658ebe093c8e9ed000cb579fe93f15626c15d8041ceb6438e15caca1d153a67975f9 + REF v2.0.14 + SHA512 4b7066acd7d8ecb05fef6089997632381c34ce6631b7106afedf95b7f72d7280e45c9b2f8cce49349bf599520770ebbebb68ff71930bc44b615d177b4056a945 PATCHES - 0001-add-archive-destination-to-install.patch 0002-win64-support.patch 0003-add-find_package-libwebsockets.patch 0004-support-static-build.patch @@ -14,9 +13,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITH_STATIC_LIBRARIES=${STATIC_LINKAGE} -DWITH_SRV=OFF @@ -28,36 +26,36 @@ vcpkg_configure_cmake( -DDOCUMENTATION=OFF -DWITH_PLUGINS=OFF -DWITH_CJSON=OFF + -DWITH_CLIENTS=OFF + -DWITH_APPS=OFF + -DWITH_BROKER=OFF + -DWITH_BUNDLED_DEPS=OFF + MAYBE_UNUSED_VARIABLES + WITH_WEBSOCKETS + STATIC_WEBSOCKETS ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_fixup_pkgconfig() -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_passwd${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_passwd${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_pub${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_pub${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_rr${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_rr${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_sub${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_sub${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(GLOB VERSIONED_LIBRARIES LIST_DIRECTORIES FALSE - ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* - ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* - ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* - ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* + "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" + "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" + "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" + "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" ) if(NOT "x${VERSIONED_LIBRARIES}x" STREQUAL "xx") @@ -65,16 +63,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() if(NOT "x${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}x" STREQUAL "xx") - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") endif() endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json index b73e452f07f832..db31380700747d 100644 --- a/ports/mosquitto/vcpkg.json +++ b/ports/mosquitto/vcpkg.json @@ -1,13 +1,18 @@ { "name": "mosquitto", - "version": "2.0.12", - "port-version": 3, + "version": "2.0.14", "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino", - "homepage": "https://mosquitto.org/download/", + "homepage": "https://mosquitto.org/", + "license": "EPL-2.0", "dependencies": [ "c-ares", "libwebsockets", "openssl", - "pthreads" + "pthreads", + "uthash", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index a04870eb78de0e..0f80c12c0dc8a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4605,8 +4605,8 @@ "port-version": 1 }, "mosquitto": { - "baseline": "2.0.12", - "port-version": 3 + "baseline": "2.0.14", + "port-version": 0 }, "mozjpeg": { "baseline": "2021-09-27", diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json index 597552f8cd7ad5..b8884b9e345689 100644 --- a/versions/m-/mosquitto.json +++ b/versions/m-/mosquitto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8f2f0732c56a4cc622139bba1b7cb110dea985d", + "version": "2.0.14", + "port-version": 0 + }, { "git-tree": "f57ff6e27ac8e72ba497868198a9c9ae3d0bd281", "version": "2.0.12", From 44888a8daefb1b240856fa948439d2ef0a4becd9 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 21 Apr 2022 23:48:47 +0200 Subject: [PATCH 077/383] [rtmidi] no absolute paths (#24275) --- ports/rtmidi/portfile.cmake | 2 ++ ports/rtmidi/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/rtmidi.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake index ea74660e7a16c9..4ba83e243e500f 100644 --- a/ports/rtmidi/portfile.cmake +++ b/ports/rtmidi/portfile.cmake @@ -23,4 +23,6 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rtmidi/vcpkg.json b/ports/rtmidi/vcpkg.json index 9b6c4dd339133f..161861d885d4d8 100644 --- a/ports/rtmidi/vcpkg.json +++ b/ports/rtmidi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rtmidi", - "version-semver": "4.0.0", - "port-version": 5, + "version-semver": "5.0.0", "description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)", "homepage": "https://github.com/thestk/rtmidi", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0f80c12c0dc8a9..c7d1f10792f277 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6265,8 +6265,8 @@ "port-version": 3 }, "rtmidi": { - "baseline": "4.0.0", - "port-version": 5 + "baseline": "5.0.0", + "port-version": 0 }, "rttr": { "baseline": "0.9.6", diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json index a99857fc340aae..50eca9aba0a0f9 100644 --- a/versions/r-/rtmidi.json +++ b/versions/r-/rtmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4eb19141251ff7759838e0ab10f35876583d367b", + "version-semver": "5.0.0", + "port-version": 0 + }, { "git-tree": "1d922425c684e2dd87ea1691b2ac8f1c0fd808e4", "version-semver": "4.0.0", From c656e2eccdb8855678628c676f0189a098606f98 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 21 Apr 2022 14:50:05 -0700 Subject: [PATCH 078/383] [many ports] Fix version files (#24277) * [many ports] remove versions not in repo history * [many ports] fix wrong hashes caused by bad merges --- versions/c-/color-console.json | 5 ----- versions/c-/cuda.json | 5 ----- versions/d-/directxsdk.json | 5 ----- versions/g-/glad.json | 5 ----- versions/l-/libao.json | 5 ----- versions/l-/libarchive.json | 2 +- versions/l-/libtcod.json | 15 --------------- versions/m-/mailio.json | 2 +- versions/o-/opencv3.json | 2 +- versions/o-/opencv4.json | 2 +- versions/r-/robin-map.json | 2 +- versions/s-/sleepy-discord.json | 5 ----- 12 files changed, 5 insertions(+), 50 deletions(-) diff --git a/versions/c-/color-console.json b/versions/c-/color-console.json index 7aab6764a0eca5..cbeded048c67fc 100644 --- a/versions/c-/color-console.json +++ b/versions/c-/color-console.json @@ -4,11 +4,6 @@ "git-tree": "bdd7720df549670e50ef636219b7d093f7cc8bc6", "version-date": "2022-03-20", "port-version": 0 - }, - { - "git-tree": "9a371b999eb2e8c7d72d50267fbcad9c9b3967b1", - "version-semver": "1.0.0", - "port-version": 0 } ] } diff --git a/versions/c-/cuda.json b/versions/c-/cuda.json index 878a0c33fb6292..53553cb146522e 100644 --- a/versions/c-/cuda.json +++ b/versions/c-/cuda.json @@ -20,11 +20,6 @@ "version-string": "10.1", "port-version": 7 }, - { - "git-tree": "cd48424964a6d19d032e14e84dbd41c5cdcb05ef", - "version-string": "10.1", - "port-version": 6 - }, { "git-tree": "0022275f9aa9e2d70f6a35d7e28fb27ab21fd13e", "version-string": "10.1", diff --git a/versions/d-/directxsdk.json b/versions/d-/directxsdk.json index 8beece35ad5ddc..b2361108ae7688 100644 --- a/versions/d-/directxsdk.json +++ b/versions/d-/directxsdk.json @@ -25,11 +25,6 @@ "version-string": "jun10", "port-version": 1 }, - { - "git-tree": "b3a7a8a22c780726a74fb673c31454ef83e9ea79", - "version-string": "jun10b", - "port-version": 0 - }, { "git-tree": "dc3241d51d057a92ef8db501c80a749a46ed4461", "version-string": "jun10", diff --git a/versions/g-/glad.json b/versions/g-/glad.json index c704203e657652..a0c3aed4d8fa7a 100644 --- a/versions/g-/glad.json +++ b/versions/g-/glad.json @@ -15,11 +15,6 @@ "version": "0.1.34", "port-version": 0 }, - { - "git-tree": "d222f56675de6eedfc3a25e5a4b93fee39747f49", - "version-string": "0.1.34", - "port-version": 2 - }, { "git-tree": "abaac8ade7697e7f6ae4a82c981aafa2cc6a5359", "version-string": "0.1.33-1", diff --git a/versions/l-/libao.json b/versions/l-/libao.json index e5186e1ae4eeb6..c0d0833c8fa8b6 100644 --- a/versions/l-/libao.json +++ b/versions/l-/libao.json @@ -9,11 +9,6 @@ "git-tree": "931d3ed363323bdc4de00c91165f3a09e23fb6b1", "version": "1.2.2", "port-version": 3 - }, - { - "git-tree": "3ce3e18f2bb49577bbf0e0341cd0e5eb425e47bc", - "version": "1.2.2", - "port-version": 2 } ] } diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json index 1cb4b7bf07aee9..a66f04ef51d9e0 100644 --- a/versions/l-/libarchive.json +++ b/versions/l-/libarchive.json @@ -46,7 +46,7 @@ "port-version": 6 }, { - "git-tree": "fe188805a906d5d853bc330253242c12029ae0de", + "git-tree": "a8318f61dfe300b1b980b2ecaf295bd626572ad4", "version-semver": "3.4.3", "port-version": 5 }, diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index 4cc62a81d81a2b..4dcdd5289c598b 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -20,25 +20,10 @@ "version-semver": "1.16.7", "port-version": 2 }, - { - "git-tree": "40587cd0b117a21791c1da332c89c6e1a820e2a9", - "version-semver": "1.16.7", - "port-version": 1 - }, - { - "git-tree": "c8498087d7b87609436a7c5fb85c391592add740", - "version-string": "1.16.7", - "port-version": 0 - }, { "git-tree": "e2de0a47f3776252b6e04681c92d67b0730587ef", "version-string": "1.16.6", "port-version": 0 - }, - { - "git-tree": "b4899dcf1740634e91d040b66259568ecafaa1b6", - "version-string": "1.16.4", - "port-version": 0 } ] } diff --git a/versions/m-/mailio.json b/versions/m-/mailio.json index 156df34a5fc274..50519329663047 100644 --- a/versions/m-/mailio.json +++ b/versions/m-/mailio.json @@ -6,7 +6,7 @@ "port-version": 2 }, { - "git-tree": "f0fde0f6599aacd2b890c94326f504bf2af8f642", + "git-tree": "80186942edc09cad3c911ebbc6dd77d30af68502", "version": "0.21.0", "port-version": 1 }, diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index a780c1554bc279..636f629fc09578 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -81,7 +81,7 @@ "port-version": 0 }, { - "git-tree": "859d6618f0ff394cc940ede79ada4bff1b7655dc", + "git-tree": "ffd8270ed4798f25f3bd882a6089c72e86803466", "version": "3.4.12", "port-version": 1 }, diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 67e87467ffbbde..82178c48b28375 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -86,7 +86,7 @@ "port-version": 0 }, { - "git-tree": "ba164060f8a9e69ccc4c484a24b5e8085d20b3bd", + "git-tree": "a0522dbbb44877b9d4618bfe31a376e07e49bc72", "version": "4.5.0", "port-version": 1 }, diff --git a/versions/r-/robin-map.json b/versions/r-/robin-map.json index b4c622ba5eb263..fbbb42be007f0d 100644 --- a/versions/r-/robin-map.json +++ b/versions/r-/robin-map.json @@ -11,7 +11,7 @@ "port-version": 1 }, { - "git-tree": "3a6eb0ea067edf2d06baa7706281caf96df4216a", + "git-tree": "84f1433234bb4813feee71e4042174ec9e8d5a7a", "version-semver": "0.6.3", "port-version": 0 }, diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index 1105f0b27e6411..78559640b2c4bd 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -14,11 +14,6 @@ "git-tree": "9ef84b8cb8cdd5d278b005a551044a6635490bda", "version-date": "2021-07-07", "port-version": 0 - }, - { - "git-tree": "0d9d62b7213333d04c90878bb1e6573ad3f5316f", - "version-date": "2021-05-02", - "port-version": 0 } ] } From ed6dc3a43f976099525c5dcde2bfe7dc4092fb3d Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Fri, 22 Apr 2022 05:51:10 +0800 Subject: [PATCH 079/383] [gsl] install pkgconfig file (#24285) --- ports/gsl/CMakeLists.txt | 3 +++ ports/gsl/portfile.cmake | 2 ++ ports/gsl/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/g-/gsl.json | 5 +++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ports/gsl/CMakeLists.txt b/ports/gsl/CMakeLists.txt index 2d37f37e98bd98..7e522cc5cea23c 100644 --- a/ports/gsl/CMakeLists.txt +++ b/ports/gsl/CMakeLists.txt @@ -75,6 +75,9 @@ if(INSTALL_HEADERS) set(TARGET_INSTALL_OPTIONS PUBLIC_HEADER DESTINATION include/gsl) endif() +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gsl.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gsl.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gsl.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + install(TARGETS gsl gslcblas RUNTIME DESTINATION bin LIBRARY DESTINATION lib diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake index fb746d71f6882c..a107ce7b74cf84 100644 --- a/ports/gsl/portfile.cmake +++ b/ports/gsl/portfile.cmake @@ -24,6 +24,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) \ No newline at end of file diff --git a/ports/gsl/vcpkg.json b/ports/gsl/vcpkg.json index c01838c6135342..44c14d97f405ed 100644 --- a/ports/gsl/vcpkg.json +++ b/ports/gsl/vcpkg.json @@ -1,8 +1,10 @@ { "name": "gsl", "version": "2.7.1", + "port-version": 1, "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", "homepage": "https://www.gnu.org/software/gsl/", + "license": "GPL-3.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index c7d1f10792f277..dddcaa8b7acffa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2650,7 +2650,7 @@ }, "gsl": { "baseline": "2.7.1", - "port-version": 0 + "port-version": 1 }, "gsl-lite": { "baseline": "0.40.0", diff --git a/versions/g-/gsl.json b/versions/g-/gsl.json index 635882c89c4272..c80bd88015351d 100644 --- a/versions/g-/gsl.json +++ b/versions/g-/gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bf0e1015fe68141e3c5d0b6777c2d38c352b72d", + "version": "2.7.1", + "port-version": 1 + }, { "git-tree": "dc3b20f09d0d6131faaa2dc0448d60676af96672", "version": "2.7.1", From a77d23729a11bc66030d8b234bd7954f121e2b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horv=C3=A1t?= Date: Fri, 22 Apr 2022 17:49:39 +0200 Subject: [PATCH 080/383] [igraph] add support for external BLAS/LAPACK (#24207) * [igraph] use external BLAS/LAPACK * [igraph] x-add-version * [igraph] depend on blas metapackage * [igraph] x-add-version * [igraph] revert igraph.json * [igraph] increment port version * [igraph] x-add-version * [igraph] always use external BLAS/LAPACK * [igraph] x-add-version --- ports/igraph/portfile.cmake | 11 +++++------ ports/igraph/vcpkg.json | 3 +++ versions/baseline.json | 2 +- versions/i-/igraph.json | 5 +++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index 4061978e1d7822..5e622e0d6b513d 100644 --- a/ports/igraph/portfile.cmake +++ b/ports/igraph/portfile.cmake @@ -16,8 +16,8 @@ vcpkg_extract_source_archive_ex( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - graphml IGRAPH_GRAPHML_SUPPORT - openmp IGRAPH_OPENMP_SUPPORT + graphml IGRAPH_GRAPHML_SUPPORT + openmp IGRAPH_OPENMP_SUPPORT ) # Allow cross-compilation. See https://igraph.org/c/html/latest/igraph-Installation.html#igraph-Installation-cross-compiling @@ -38,10 +38,6 @@ vcpkg_cmake_configure( -DIGRAPH_ENABLE_LTO=AUTO # ARPACK not yet available in vcpkg. -DIGRAPH_USE_INTERNAL_ARPACK=ON - # OpenBLAS provides BLAS/LAPACK but some tests fail with OpenBLAS on Windows. - # See https://github.com/igraph/igraph/issues/1491 - -DIGRAPH_USE_INTERNAL_BLAS=ON - -DIGRAPH_USE_INTERNAL_LAPACK=ON -DIGRAPH_USE_INTERNAL_CXSPARSE=OFF # GLPK is not yet available in vcpkg. -DIGRAPH_USE_INTERNAL_GLPK=ON @@ -49,6 +45,9 @@ vcpkg_cmake_configure( -DIGRAPH_USE_INTERNAL_GMP=ON # PLFIT is not yet available in vcpkg. -DIGRAPH_USE_INTERNAL_PLFIT=ON + # Use BLAS and LAPACK from vcpkg + -DIGRAPH_USE_INTERNAL_BLAS=OFF + -DIGRAPH_USE_INTERNAL_LAPACK=OFF -DF2C_EXTERNAL_ARITH_HEADER=${ARITH_H} ${FEATURE_OPTIONS} ) diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index f5a73ff0edcc2d..2f0f5fe90b9fbb 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,10 +1,13 @@ { "name": "igraph", "version": "0.9.8", + "port-version": 1, "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "license": "GPL-2.0-or-later", "dependencies": [ + "blas", + "lapack", "suitesparse", { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index dddcaa8b7acffa..79e3cda0a79b94 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2894,7 +2894,7 @@ }, "igraph": { "baseline": "0.9.8", - "port-version": 0 + "port-version": 1 }, "iir1": { "baseline": "1.9.0", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index a37f62b31ecbba..c500e043d03ea1 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "635707a7146747b8b5a35ba35d5e94669e499d3b", + "version": "0.9.8", + "port-version": 1 + }, { "git-tree": "5af04d279a55817e0ca26a113a67cf48884f9aaf", "version": "0.9.8", From ecc57a5c4d20b4f618e3d152fb34a15d0135df65 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 22 Apr 2022 18:00:19 +0200 Subject: [PATCH 081/383] [msix] add support expression (#24228) --- ports/msix/vcpkg.json | 4 +++- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/m-/msix.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/msix/vcpkg.json b/ports/msix/vcpkg.json index b3e01e092b865d..589d03298da6d7 100644 --- a/ports/msix/vcpkg.json +++ b/ports/msix/vcpkg.json @@ -1,9 +1,11 @@ { "name": "msix", "version": "1.7", - "port-version": 3, + "port-version": 4, "description": "The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks.The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details.", "homepage": "https://github.com/microsoft/msix-packaging", + "license": "MIT", + "supports": "!static", "dependencies": [ "catch2", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fa419af52de302..8cc1e7066809c1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -786,9 +786,6 @@ mpir:x64-windows-static-md=skip mpir:arm64-windows=skip mpir:x64-osx=skip mpir:x64-linux=skip -msix:x64-linux=fail -msix:x64-osx=fail -msix:x64-windows-static=fail msmpi:arm64-windows=fail msmpi:arm-uwp=fail msmpi:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index 79e3cda0a79b94..ff43b6d221dc67 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4686,7 +4686,7 @@ }, "msix": { "baseline": "1.7", - "port-version": 3 + "port-version": 4 }, "msmpi": { "baseline": "10.1.12498", diff --git a/versions/m-/msix.json b/versions/m-/msix.json index f76cdce2f4a33a..c915f2459a7595 100644 --- a/versions/m-/msix.json +++ b/versions/m-/msix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13d1f847b9d20c6ff27d6bed27728fb145aedd50", + "version": "1.7", + "port-version": 4 + }, { "git-tree": "e544825ca69bfca4e3f54141bf62cacb1cd878ea", "version": "1.7", From 624bb3029b3a65c861a3c7c25c25a39f07fd3901 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 22 Apr 2022 09:03:57 -0700 Subject: [PATCH 082/383] [glog] Add feature unwind (#24292) * [glog] Add feature unwind * update version Co-authored-by: Lily Wang --- ports/glog/portfile.cmake | 5 +++++ ports/glog/vcpkg.json | 10 ++++++++-- versions/baseline.json | 2 +- versions/g-/glog.json | 5 +++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 297ee84ae62ee5..47a85914076105 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -12,10 +12,15 @@ vcpkg_from_github( ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + unwind WITH_UNWIND +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index 5f9b2962eaf872..b9e198f55e9738 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glog", "version": "0.5.0", - "port-version": 1, + "port-version": 2, "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", "license": null, @@ -15,5 +15,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "unwind": { + "description": "Enable libunwind support", + "supports": "linux" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index ff43b6d221dc67..f913b8da1c2bbd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2550,7 +2550,7 @@ }, "glog": { "baseline": "0.5.0", - "port-version": 1 + "port-version": 2 }, "gloo": { "baseline": "20201203", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index db91915a0bc64c..18f3d4be4567cc 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10e0077ffa3485fa75178aa8e2a3f8ec0314573b", + "version": "0.5.0", + "port-version": 2 + }, { "git-tree": "c0809e03781b0f3f322236ad964b6caa464dfe21", "version": "0.5.0", From 694a8eb9d3001124b4ca7e4a9fa9c9c8d4670c9a Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 23 Apr 2022 00:21:15 +0800 Subject: [PATCH 083/383] [wren] update to v0.4.0 (#24325) * update wren to v0.4.0 * update * update --- ports/wren/portfile.cmake | 17 ++++++++--------- ports/wren/vcpkg.json | 12 +++++++++--- versions/baseline.json | 4 ++-- versions/w-/wren.json | 5 +++++ 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ports/wren/portfile.cmake b/ports/wren/portfile.cmake index dbd71b8df67090..d20b518b45d568 100644 --- a/ports/wren/portfile.cmake +++ b/ports/wren/portfile.cmake @@ -3,25 +3,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wren-lang/wren - REF d1a0d0682ac072fa20f2dcca356dac06565e93a1 - SHA512 d6b7555da10ea209d04308467563ec401f699a22ca8524e4ae65fd050b0403c5e70430047dbb6a883b8021ab50525c17bb63d76543e7c59dfe4b521cfde6c413 + REF 4a18fc489f9ea3d253b20dd40f4cdad0d6bb40eb #0.4.0 + SHA512 b3d79e9cb647e52db06d5cddfc8c93d05ae0e8d87f0f879ac2b812fcc7f55e018d21d3b04d62eaeb12e6d931b5e43fbe357b187e7f446e86e39be015c51c2eee HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCOMPILE_AS_CPP=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/wren/vcpkg.json b/ports/wren/vcpkg.json index 09f2b8aed7aece..4cb9889ef83b30 100644 --- a/ports/wren/vcpkg.json +++ b/ports/wren/vcpkg.json @@ -1,7 +1,13 @@ { "name": "wren", - "version-string": "2019-07-01", - "port-version": 1, + "version": "0.4.0", "description": "Wren is a small, fast, class-based concurrent scripting language.", - "homepage": "https://github.com/wren-lang/wren" + "homepage": "https://github.com/wren-lang/wren", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index f913b8da1c2bbd..ccf87e5784755a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7497,8 +7497,8 @@ "port-version": 2 }, "wren": { - "baseline": "2019-07-01", - "port-version": 1 + "baseline": "0.4.0", + "port-version": 0 }, "wt": { "baseline": "4.6.1", diff --git a/versions/w-/wren.json b/versions/w-/wren.json index 98fc8dfc4d6551..565c88763c7aa3 100644 --- a/versions/w-/wren.json +++ b/versions/w-/wren.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d845edef970204677adb20d8f51acf22b1c9fb00", + "version": "0.4.0", + "port-version": 0 + }, { "git-tree": "558979dc3ff66a524b930d85fbf856679ebd0208", "version-string": "2019-07-01", From 93a80809d20898755e6d238332c1c8dba825fe5b Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 23 Apr 2022 00:23:02 +0800 Subject: [PATCH 084/383] [gtk] update to v4.6.2 (#24324) --- ports/gtk/0001-build.patch | 8 ++++---- ports/gtk/portfile.cmake | 8 ++++---- ports/gtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gtk.json | 5 +++++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ports/gtk/0001-build.patch b/ports/gtk/0001-build.patch index 9b01b2c43374e2..f0e2d2e87462cf 100644 --- a/ports/gtk/0001-build.patch +++ b/ports/gtk/0001-build.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 9fe9cd5ac..19a19e5c6 100644 +index 41cf592..cb4d638 100644 --- a/meson.build +++ b/meson.build -@@ -845,24 +845,24 @@ subdir('po-properties') +@@ -897,24 +897,24 @@ subdir('po-properties') subdir('docs/tools') subdir('docs/reference') @@ -11,7 +11,7 @@ index 9fe9cd5ac..19a19e5c6 100644 - gnome.post_install( - glib_compile_schemas: true, - gio_querymodules: gio_module_dirs, -- gtk_update_icon_cache: true, +- gtk_update_icon_cache: get_option('demos'), - ) - else - meson.add_install_script('build-aux/meson/post-install.py', @@ -29,7 +29,7 @@ index 9fe9cd5ac..19a19e5c6 100644 +# gnome.post_install( +# glib_compile_schemas: true, +# gio_querymodules: gio_module_dirs, -+# gtk_update_icon_cache: true, ++# gtk_update_icon_cache: get_option('demos'), +# ) +# else +# meson.add_install_script('build-aux/meson/post-install.py', diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 8c7595e60ed2bd..5c89135dd262f9 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -1,11 +1,11 @@ -set(GTK_VERSION 4.6.0) +set(GTK_VERSION 4.6.2) vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/gtk - REF 70cb61fb7104c76a15bc6494a10e6ff1d470f6d8 #v4.6.0 - SHA512 dba6ce5a8306f9dda290f3785d6d15aee67c66329ab0756b7b7573387c1a512e96d3b53b24ed342ce7376832dcac20fb24025f2b8986f74d91a88e4fcf3de6ae + REF aec7ca82007dbe07faee6be084d20758ebac2b91 #v4.6.2 + SHA512 05ebba53e71a997b4dc04bc018f420f62d569cb66a2f3e713bd2b48abd7c0051f67939e42c812388bd0565d12a3f82b45731a086d3ab0e75d16eee200a3be95f HEAD_REF master # branch name PATCHES 0001-build.patch @@ -109,7 +109,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -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) set(TOOL_NAMES gtk4-builder-tool gtk4-encode-symbolic-svg diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 4966aae5be56a6..4a8a991c773dc6 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtk", - "version": "4.6.0", + "version": "4.6.2", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index ccf87e5784755a..6e9e0097b7f7d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2673,7 +2673,7 @@ "port-version": 5 }, "gtk": { - "baseline": "4.6.0", + "baseline": "4.6.2", "port-version": 0 }, "gtkmm": { diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 9d944fe71b29c8..a0f3c9c2413d3d 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00d7796e9bcff96a64e45b977a72129b1dc7be43", + "version": "4.6.2", + "port-version": 0 + }, { "git-tree": "ae837c3a08bb71e486641d8b4464c132dbf54464", "version": "4.6.0", From 79afdf87b338e4ca0ac6dd781e4e755d6ec940a1 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 22 Apr 2022 18:25:01 +0200 Subject: [PATCH 085/383] [libsigcpp] Update to 3.2.0 (#24306) * [libsigcpp] Update to 3.2.0 * version --- .../disable_tests_enable_static_build.patch | 23 +++++-------- .../libsigcpp/fix-shared-windows-build.patch | 33 ++++++++++++++----- .../libsigcpp/fix-usage-in-static-build.patch | 29 ---------------- ports/libsigcpp/portfile.cmake | 6 ++-- ports/libsigcpp/vcpkg.json | 3 +- ports/libsigcpp/version.patch | 17 ---------- versions/baseline.json | 2 +- versions/l-/libsigcpp.json | 5 +++ 8 files changed, 42 insertions(+), 76 deletions(-) delete mode 100644 ports/libsigcpp/fix-usage-in-static-build.patch delete mode 100644 ports/libsigcpp/version.patch diff --git a/ports/libsigcpp/disable_tests_enable_static_build.patch b/ports/libsigcpp/disable_tests_enable_static_build.patch index 2c4909df3261b9..017a0ac1be30cf 100644 --- a/ports/libsigcpp/disable_tests_enable_static_build.patch +++ b/ports/libsigcpp/disable_tests_enable_static_build.patch @@ -1,18 +1,14 @@ -From 219b3f5a681731bcaeee9fee0f136e6eb6143d33 Mon Sep 17 00:00:00 2001 -From: Bruk Tedla -Date: Thu, 17 Sep 2020 19:45:27 +0300 -Subject: [PATCH] disable_tests_enable_static_build - ---- - CMakeLists.txt | 4 ++-- - sigc++/CMakeLists.txt | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2e7f383..b2b8395 100644 +index e1b28fe..b9a9d40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -89,8 +89,8 @@ enable_testing() +@@ -84,13 +84,13 @@ install (FILES + DESTINATION + "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") + +-enable_testing() ++#enable_testing() + add_subdirectory (sigc++) @@ -36,6 +32,3 @@ index fa5a91a..86f1be7 100644 set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION}) set_property(TARGET ${SIGCPP_LIB_NAME} PROPERTY SOVERSION ${LIBSIGCPP_SOVERSION}) --- -2.27.0.windows.1 - diff --git a/ports/libsigcpp/fix-shared-windows-build.patch b/ports/libsigcpp/fix-shared-windows-build.patch index f62e1eb14a197a..83cd2b9dc90ba6 100644 --- a/ports/libsigcpp/fix-shared-windows-build.patch +++ b/ports/libsigcpp/fix-shared-windows-build.patch @@ -1,17 +1,32 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index e1b28fe..73990c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -53,8 +53,11 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") +@@ -53,6 +53,13 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") include_directories (${sigc++_SOURCE_DIR}) include_directories (${sigc++_BINARY_DIR}) --if(BUILD_SHARED_LIBS) -- add_compile_options(-DBUILD_SHARED) +if (BUILD_SHARED_LIBS) -+ add_compile_options (-DBUILD_SHARED) -+ if (MSVC) -+ add_compile_options (-D_WINDLL) -+ endif() - endif() - ++ add_compile_options (-DBUILD_SHARED) ++ if (MSVC) ++ add_compile_options (-D_WINDLL) ++ endif() ++endif() ++ configure_file (sigc++config.h.cmake sigc++config.h) + + set (prefix ${CMAKE_INSTALL_PREFIX}) +diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake +index 74d348a..43a99c5 100644 +--- a/sigc++config.h.cmake ++++ b/sigc++config.h.cmake +@@ -16,7 +16,9 @@ + # if defined(_MSC_VER) + # define SIGC_MSC 1 + # define SIGC_WIN32 1 ++# ifdef BUILD_SHARED + # define SIGC_DLL 1 ++# endif + # elif defined(__CYGWIN__) + # define SIGC_CONFIGURE 1 + # elif defined(__MINGW32__) diff --git a/ports/libsigcpp/fix-usage-in-static-build.patch b/ports/libsigcpp/fix-usage-in-static-build.patch deleted file mode 100644 index 378f1f96a3cdd1..00000000000000 --- a/ports/libsigcpp/fix-usage-in-static-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f54e830..972d0dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,6 +53,10 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") - include_directories (${sigc++_SOURCE_DIR}) - include_directories (${sigc++_BINARY_DIR}) - -+if(BUILD_SHARED_LIBS) -+ add_compile_options(-DBUILD_SHARED) -+endif() -+ - configure_file (sigc++config.h.cmake sigc++config.h) - - set (prefix ${CMAKE_INSTALL_PREFIX}) -diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake -index 74d348a..43a99c5 100644 ---- a/sigc++config.h.cmake -+++ b/sigc++config.h.cmake -@@ -16,7 +16,9 @@ - # if defined(_MSC_VER) - # define SIGC_MSC 1 - # define SIGC_WIN32 1 -+# ifdef BUILD_SHARED - # define SIGC_DLL 1 -+# endif - # elif defined(__CYGWIN__) - # define SIGC_CONFIGURE 1 - # elif defined(__MINGW32__) diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index 278dc310a9f40f..b060ebe209698c 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsigcplusplus/libsigcplusplus - REF 3.0.7 - SHA512 4c9251613c30cc5d455dc30a039a12b73d6369ac03583dab382307b894f93d4733cebea0a6eef82e8d80b1354c812b4ff6bfc68913f0df5a61146d56a6afde13 + REF 3.2.0 + SHA512 95ab0acfc2c5a151335e73bdc9b0e058af67d9706d0697bfd938e38c51e853fdb29d7a26484f192abe150640c60d5e30075a23deaa043a8deed70616bc9f508a HEAD_REF master PATCHES disable_tests_enable_static_build.patch - version.patch - fix-usage-in-static-build.patch fix-shared-windows-build.patch ) diff --git a/ports/libsigcpp/vcpkg.json b/ports/libsigcpp/vcpkg.json index 51286da7838e1f..31ec34fbefeea4 100644 --- a/ports/libsigcpp/vcpkg.json +++ b/ports/libsigcpp/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libsigcpp", - "version": "3.0.7", + "version": "3.2.0", "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", + "license": "LGPL-3.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libsigcpp/version.patch b/ports/libsigcpp/version.patch deleted file mode 100644 index 1492bed70dfe24..00000000000000 --- a/ports/libsigcpp/version.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b06ef121c..9b9520342 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,9 +16,9 @@ - - cmake_minimum_required (VERSION 3.2) - --set (SIGCXX_MAJOR_VERSION 2) --set (SIGCXX_MINOR_VERSION 99) --set (SIGCXX_MICRO_VERSION 1) -+set (SIGCXX_MAJOR_VERSION 3) -+set (SIGCXX_MINOR_VERSION 0) -+set (SIGCXX_MICRO_VERSION 7) - - set (SIGCXX_API_VERSION 3.0) - set (PACKAGE_VERSION ${SIGCXX_MAJOR_VERSION}.${SIGCXX_MINOR_VERSION}.${SIGCXX_MICRO_VERSION}) diff --git a/versions/baseline.json b/versions/baseline.json index 6e9e0097b7f7d6..bcdcbb6c22ed5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3981,7 +3981,7 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "3.0.7", + "baseline": "3.2.0", "port-version": 0 }, "libsigcpp-3": { diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index 4191440741216b..a1a014cb970145 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7631555eb4ab142a7f643a266f79a87bc8aeca12", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "bdb51863c5589b8e47c717b7c96a1ead39d4dd27", "version": "3.0.7", From 2ac61f87f69f0484b8044f95ab274038fbaf7bdd Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 22 Apr 2022 17:51:17 +0100 Subject: [PATCH 086/383] [libxslt] add optional feature support (#24240) Signed-off-by: Gordon Smith --- ports/libxslt/portfile.cmake | 25 ++++++++++++-- ports/libxslt/require-dependencies.patch | 44 ++++++++++++++++++++++++ ports/libxslt/vcpkg.json | 38 ++++++++++++++++++-- versions/baseline.json | 2 +- versions/l-/libxslt.json | 5 +++ 5 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 ports/libxslt/require-dependencies.patch diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 05df04a3189a3d..3e8917227a65c4 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_from_github( 0002-Fix-lzma.patch 0003-Fix-configure.patch only_build_one_lib_type.patch + require-dependencies.patch ) if (VCPKG_TARGET_IS_WINDOWS) @@ -125,13 +126,31 @@ if (VCPKG_TARGET_IS_WINDOWS) file(COPY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") endif() else() + if("python" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + set(OPTION_PYTHON "--with-python=${PYTHON3}") + else() + set(OPTION_PYTHON "--without-python") + endif() + if ("plugins" IN_LIST FEATURES) + set(OPTION_PLUGINS "--with-plugins") + else() + set(OPTION_PLUGINS "--without-plugins") + endif() + if("crypto" IN_LIST FEATURES) + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/tools/libgcrypt/bin") + set(OPTION_CRYPTO "--with-crypto") + else() + set(OPTION_CRYPTO "--without-crypto") + endif() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG OPTIONS - --without-python - --without-plugins - --with-crypto + ${OPTION_PYTHON} + ${OPTION_PLUGINS} + ${OPTION_CRYPTO} OPTIONS_DEBUG --with-mem-debug --with-debug diff --git a/ports/libxslt/require-dependencies.patch b/ports/libxslt/require-dependencies.patch new file mode 100644 index 00000000000000..8bf85366576382 --- /dev/null +++ b/ports/libxslt/require-dependencies.patch @@ -0,0 +1,44 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -240,12 +240,13 @@ + else + if test -x "$with_python" + then + echo Found python in $with_python + PYTHON="$with_python" + else ++ AC_MSG_ERROR([Python not found; --with-python should be set to the python path]) + if test -x "$PYTHON" + then + echo Found python in environment PYTHON=$PYTHON + with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` + else + AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) +@@ -333,25 +334,25 @@ + if test "$LIBGCRYPT_CONFIG" != "no" ; then + LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version` + if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42") + then + LIBGCRYPT_CFLAGS="" + LIBGCRYPT_LIBS="" +- echo 'gcrypt library version < 1.1.42 - Crypto extensions will not be available.' ++ AC_MSG_ERROR([gcrypt library version < 1.1.42 - this is an error]) + else + LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags` + LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs` + AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.]) + echo 'Crypto extensions will be available.' + WITH_CRYPTO=1 + CRYPTO_TESTDIR=crypto + fi + else + LIBGCRYPT_CFLAGS="" + LIBGCRYPT_LIBS="" +- echo 'Crypto extensions will not be available. Install libgcrypt and reconfigure to make available.' ++ AC_MSG_ERROR([libgcrypt not found - this is a bug in the vcpkg port]) + fi + esac + fi + AC_SUBST(WITH_CRYPTO) + AC_SUBST(CRYPTO_TESTDIR) + AC_SUBST(LIBGCRYPT_CFLAGS) diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index 03e3bc74be0d95..1912a492fd814c 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxslt", "version": "1.1.34", - "port-version": 4, + "port-version": 5, "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "license": null, @@ -9,5 +9,39 @@ "dependencies": [ "liblzma", "libxml2" - ] + ], + "default-features": [ + "default-features" + ], + "features": { + "crypto": { + "description": "Build with crypto support (--with-crypto)", + "supports": "mingw | !windows", + "dependencies": [ + { + "name": "libgcrypt", + "platform": "!mingw" + } + ] + }, + "default-features": { + "description": "default features for the current platform", + "dependencies": [ + { + "name": "libxslt", + "default-features": false, + "features": [ + "crypto" + ], + "platform": "mingw | !windows" + } + ] + }, + "plugins": { + "description": "Build with plugins (--with-plugins)" + }, + "python": { + "description": "Builds with python support (--with-python)" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index bcdcbb6c22ed5b..053f8a940803ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4198,7 +4198,7 @@ }, "libxslt": { "baseline": "1.1.34", - "port-version": 4 + "port-version": 5 }, "libyaml": { "baseline": "0.2.5", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 4305d6ee5aa107..f1d753a3ea288a 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "063e2e6a6b9ef700f0c2587d2def57eb0e2285e6", + "version": "1.1.34", + "port-version": 5 + }, { "git-tree": "034ea26a2cde47c4d19df6eb35bc124a79ad37a3", "version": "1.1.34", From ce910bb87b9252ea6a821de6bc67cef465686c00 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Mon, 25 Apr 2022 15:39:10 -0700 Subject: [PATCH 087/383] [skia,crashpad,zeroc-ice,vcpkg-tool-gn] New vcpkg-tool-gn and update of several ports (#24066) --- ports/chromium-base/vcpkg.json | 13 +- ports/crashpad/portfile.cmake | 10 +- ports/crashpad/vcpkg.json | 10 +- ports/skia/add-missing-tuple.patch | 12 - ports/skia/dawn_use_vcpkg_spirv.patch | 13 + ports/skia/fontconfig.gn | 10 + ports/skia/portfile.cmake | 267 +++++++++++++++--- ports/skia/skiaConfig.cmake.in | 48 +--- ports/skia/use_vcpkg_fontconfig.patch | 42 +++ ports/skia/vcpkg.json | 35 ++- ports/v8/vcpkg.json | 5 +- ports/vcpkg-tool-gn/portfile.cmake | 62 ++++ ports/vcpkg-tool-gn/vcpkg.json | 8 + ports/zeroc-ice/change_to_mt.ps1 | 53 ++++ ports/zeroc-ice/portfile.cmake | 10 +- ports/zeroc-ice/prepare_for_build.cmake | 60 ++-- ports/zeroc-ice/vcpkg.json | 4 +- scripts/ci.baseline.txt | 2 - scripts/cmake/vcpkg_configure_gn.cmake | 6 +- .../cmake/vcpkg_find_acquire_program.cmake | 56 +++- versions/baseline.json | 18 +- versions/c-/chromium-base.json | 5 + versions/c-/crashpad.json | 5 + versions/s-/skia.json | 5 + versions/v-/v8.json | 5 + versions/v-/vcpkg-tool-gn.json | 9 + versions/z-/zeroc-ice.json | 5 + 27 files changed, 604 insertions(+), 174 deletions(-) delete mode 100644 ports/skia/add-missing-tuple.patch create mode 100644 ports/skia/dawn_use_vcpkg_spirv.patch create mode 100644 ports/skia/fontconfig.gn create mode 100644 ports/skia/use_vcpkg_fontconfig.patch create mode 100644 ports/vcpkg-tool-gn/portfile.cmake create mode 100644 ports/vcpkg-tool-gn/vcpkg.json create mode 100644 ports/zeroc-ice/change_to_mt.ps1 create mode 100644 versions/v-/vcpkg-tool-gn.json diff --git a/ports/chromium-base/vcpkg.json b/ports/chromium-base/vcpkg.json index a96735ba3a4a81..d84ea24e0f5bed 100644 --- a/ports/chromium-base/vcpkg.json +++ b/ports/chromium-base/vcpkg.json @@ -1,8 +1,15 @@ { "name": "chromium-base", - "version-string": "86.0.4199.1", - "port-version": 3, + "version": "86.0.4199.1", + "port-version": 4, "description": "Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.", "homepage": "https://chromium.googlesource.com/chromium/src", - "supports": "x64 & (osx | windows | linux) & !uwp" + "license": "BSD-3-Clause", + "supports": "x64 & (osx | windows | linux) & !uwp", + "dependencies": [ + { + "name": "vcpkg-tool-gn", + "host": true + } + ] } diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index 1764fc99ac0a12..6c8eb1f35f0cc0 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://chromium.googlesource.com/crashpad/crashpad - REF 9a31d3f8e9815774026a753a1ff6155347cd549f + REF 68aba08c48bb428b7b159b3371163f86e8d5a126 ) +vcpkg_find_acquire_program(PYTHON3) +vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"") + function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") return() @@ -24,7 +27,7 @@ endfunction() checkout_in_path( "${SOURCE_PATH}/third_party/mini_chromium/mini_chromium" "https://chromium.googlesource.com/chromium/mini_chromium" - "c426ff98e1d9e9d59777fe8b883a5c0ceeca9ca3" + "5654edb4225bcad13901155c819febb5748e502b" ) function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES) @@ -119,6 +122,9 @@ file(REMOVE_RECURSE configure_file("${CMAKE_CURRENT_LIST_DIR}/crashpadConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/crashpadConfig.cmake" @ONLY) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/util/mach/__pycache__") + vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index d244f5987365bb..c506e340940c4c 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,14 +1,18 @@ { "name": "crashpad", - "version-date": "2020-03-18", - "port-version": 2, + "version-date": "2022-04-16", "description": [ "Crashpad is a crash-reporting system.", "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." ], "homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md", - "supports": "x64 & (osx | windows)", + "license": "Apache-2.0", + "supports": "osx | windows", "dependencies": [ + { + "name": "vcpkg-tool-gn", + "host": true + }, "zlib" ] } diff --git a/ports/skia/add-missing-tuple.patch b/ports/skia/add-missing-tuple.patch deleted file mode 100644 index e33d44e3aefa0a..00000000000000 --- a/ports/skia/add-missing-tuple.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/private/SkPathRef.h b/include/private/SkPathRef.h -index 7afe4f9..502f83e 100644 ---- a/include/private/SkPathRef.h -+++ b/include/private/SkPathRef.h -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - class SkRBuffer; - class SkWBuffer; diff --git a/ports/skia/dawn_use_vcpkg_spirv.patch b/ports/skia/dawn_use_vcpkg_spirv.patch new file mode 100644 index 00000000000000..02e25148c7507f --- /dev/null +++ b/ports/skia/dawn_use_vcpkg_spirv.patch @@ -0,0 +1,13 @@ +diff --git a/src/dawn_native/BUILD.gn b/src/dawn_native/BUILD.gn +index f73bfe24..e37792a0 100644 +--- a/src/dawn_native/BUILD.gn ++++ b/src/dawn_native/BUILD.gn +@@ -145,7 +145,7 @@ source_set("dawn_native_sources") { + ":dawn_native_headers", + ":dawn_native_utils_gen", + "${dawn_root}/src/common", +- "${dawn_root}/third_party/gn/spirv_cross:spirv_cross", ++ "//third_party/spirv-cross:spirv_cross", + "${dawn_spirv_tools_dir}:spvtools_opt", + "${dawn_spirv_tools_dir}:spvtools_val", + "${dawn_tint_dir}/src:libtint", diff --git a/ports/skia/fontconfig.gn b/ports/skia/fontconfig.gn new file mode 100644 index 00000000000000..ae4fe7b46bff52 --- /dev/null +++ b/ports/skia/fontconfig.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + + system("fontconfig") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } + } diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index e7cf8d1557b8f1..6c68b7fc94ec3d 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -1,10 +1,17 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - URL https://skia.googlesource.com/skia.git - REF fb0b35fed5580d49392df7ce9374551b348fffbf - PATCHES add-missing-tuple.patch + URL https://github.com/google/skia + REF 3aa7f602018816ab3f009f1b8d359ccde752e1de + PATCHES + "use_vcpkg_fontconfig.patch" ) +# Replace hardcoded python paths +vcpkg_find_acquire_program(PYTHON3) +vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"") + +vcpkg_replace_string("${SOURCE_PATH}/gn/toolchain/BUILD.gn" "command = \"$shell python" "command = \"$shell '${PYTHON3}'") + function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") return() @@ -19,10 +26,27 @@ function(checkout_in_path PATH URL REF) file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") endfunction() +function(checkout_in_path_with_patch PATH URL REF PATCH) + if(EXISTS "${PATH}") + return() + endif() + + vcpkg_from_git( + OUT_SOURCE_PATH DEP_SOURCE_PATH + URL "${URL}" + REF "${REF}" + PATCHES "${PATCH}" + ) + file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") + file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") +endfunction() + set(EXTERNALS "${SOURCE_PATH}/third_party/externals") file(MAKE_DIRECTORY "${EXTERNALS}") # these following aren't available in vcpkg +# to update, visit the DEPS file in Skia's root directory +# define SKIA_USE_MIRROR in a triplet to use the mirrors checkout_in_path("${EXTERNALS}/sfntly" "https://github.com/googlefonts/sfntly" "b55ff303ea2f9e26702b514cf6a3196a2e3e2974" @@ -33,7 +57,7 @@ checkout_in_path("${EXTERNALS}/dng_sdk" ) checkout_in_path("${EXTERNALS}/libgifcodec" "https://skia.googlesource.com/libgifcodec" - "d06d2a6d42baf6c0c91cacc28df2542a911d05fe" + "fd59fa92a0c86788dcdd84d091e1ce81eda06a77" ) checkout_in_path("${EXTERNALS}/piex" "https://android.googlesource.com/platform/external/piex" @@ -94,38 +118,165 @@ set(_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") replace_skia_dep(expat "/include" "libexpat,libexpatd,libexpatdMD" "libexpat,libexpatMD" "") replace_skia_dep(freetype2 "/include" "freetype,freetyped" "freetype" "") -replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz-icu" "harfbuzz-icu" "") +replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz;harfbuzz-subset" "harfbuzz;harfbuzz-subset" "") replace_skia_dep(icu "/include" "icuuc,icuucd" "icuuc" "U_USING_ICU_NAMESPACE=0") replace_skia_dep(libjpeg-turbo "/include" "jpeg,jpegd;turbojpeg,turbojpegd" "jpeg;turbojpeg" "") replace_skia_dep(libpng "/include" "libpng16,libpng16d" "libpng16" "") -replace_skia_dep(libwebp "/include" "webp;webpdemux;webpdecoder;webpmux" "webp;webpdemux;webpdecoder;webpmux" "") +replace_skia_dep(libwebp "/include" + "webp,webpd;webpdemux,webpdemuxd;webpdecoder,webpdecoderd;webpmux,webpmuxd" + "webp;webpdemux;webpdecoder;webpmux" "") replace_skia_dep(zlib "/include" "z,zlib,zlibd" "z,zlib" "") +if(CMAKE_HOST_UNIX) + replace_skia_dep(fontconfig "/include" "fontconfig" "fontconfig" "") + endif() set(OPTIONS "\ skia_use_lua=false \ skia_enable_tools=false \ -skia_enable_spirv_validation=false") - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(OPTIONS "${OPTIONS} target_cpu=\"arm64\"") -endif() +skia_enable_spirv_validation=false \ +target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\"") # used for passing feature-specific definitions to the config file -set(SKIA_PUBLIC_DEFINITIONS "") +set(SKIA_PUBLIC_DEFINITIONS + SK_SUPPORT_PDF + SK_HAS_JPEG_LIBRARY + SK_USE_LIBGIFCODEC + SK_HAS_PNG_LIBRARY + SK_HAS_WEBP_LIBRARY + SK_XML) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OPTIONS "${OPTIONS} is_component_build=true") + string(APPEND OPTIONS " is_component_build=true") + if(CMAKE_HOST_WIN32) + set(SKIA_PUBLIC_DEFINITIONS SKIA_DLL) + endif() else() - set(OPTIONS "${OPTIONS} is_component_build=false") + string(APPEND OPTIONS " is_component_build=false") +endif() + +if(CMAKE_HOST_APPLE) + if("metal" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_metal=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_METAL) + endif() endif() -if("metal" IN_LIST FEATURES) - set(OPTIONS "${OPTIONS} skia_use_metal=true") - list(APPEND SKIA_PUBLIC_DEFINITIONS SK_METAL) +if("vulkan" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_vulkan=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_VULKAN) + endif() + +if(CMAKE_HOST_WIN32) + if("direct3d" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_direct3d=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_DIRECT3D) + + checkout_in_path("${EXTERNALS}/spirv-cross" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + "6a67891418a3f08be63f92726e049dc788e46f5b" + ) + + checkout_in_path("${EXTERNALS}/spirv-headers" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" + "82becc8a8a92e509d3d8d635889da0a3c17d0606" + ) + + checkout_in_path("${EXTERNALS}/spirv-tools" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" + "cb96abbf7affd986016f17dd09f9f971138a922b" + ) + + checkout_in_path("${EXTERNALS}/d3d12allocator" + "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git" + "169895d529dfce00390a20e69c2f516066fe7a3b" + ) + endif() +endif() + +if("dawn" IN_LIST FEATURES) + + if (VCPKG_TARGET_IS_LINUX) + message(WARNING +[[ +dawn support requires the following libraries from the system package manager: + + libx11-xcb-dev mesa-common-dev + +They can be installed on Debian based systems via + + apt-get install libx11-xcb-dev mesa-common-dev +]] + ) + endif() + + set(OPTIONS "${OPTIONS} skia_use_dawn=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_DAWN) + + checkout_in_path("${EXTERNALS}/spirv-cross" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + "6a67891418a3f08be63f92726e049dc788e46f5b" + ) + + checkout_in_path("${EXTERNALS}/spirv-headers" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" + "82becc8a8a92e509d3d8d635889da0a3c17d0606" + ) + + checkout_in_path("${EXTERNALS}/spirv-tools" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" + "cb96abbf7affd986016f17dd09f9f971138a922b" + ) + + checkout_in_path("${EXTERNALS}/tint" + "https://dawn.googlesource.com/tint" + "b612c505939bf86c80a55c193b93c41ed0f252a1" + ) + + checkout_in_path("${EXTERNALS}/jinja2" + "https://chromium.googlesource.com/chromium/src/third_party/jinja2" + "ee69aa00ee8536f61db6a451f3858745cf587de6" + ) + + checkout_in_path("${EXTERNALS}/markupsafe" + "https://chromium.googlesource.com/chromium/src/third_party/markupsafe" + "0944e71f4b2cb9a871bcbe353f95e889b64a611a" + ) + +## Remove + checkout_in_path("${EXTERNALS}/vulkan-headers" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + "76f00ef6cbb1886eb1162d1fa39bee8b51e22ee8" + ) + + checkout_in_path("${EXTERNALS}/vulkan-tools" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + "ef20059aea7ec24d0842edca2f75255eaa33a7b0" + ) + + checkout_in_path("${EXTERNALS}/abseil-cpp" + "https://skia.googlesource.com/external/github.com/abseil/abseil-cpp.git" + "c5a424a2a21005660b182516eb7a079cd8021699" + ) + +## REMOVE ^ + checkout_in_path("${EXTERNALS}/dawn" + "https://dawn.googlesource.com/dawn.git" + "e6d4598d36157639606a780164c425c6bffb93f6" + ) + + vcpkg_find_acquire_program(GIT) + file(READ "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py" DVG_CONTENT) + string(REPLACE "return 'git.bat' if sys.platform == 'win32' else 'git'" "return '${GIT}'" DVG_CONTENT ${DVG_CONTENT}) + file(WRITE "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py" ${DVG_CONTENT}) +endif() + +if("gl" IN_LIST FEATURES) + string(APPEND OPTIONS " skia_use_gl=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_GL) endif() -set(OPTIONS_REL "${OPTIONS} is_official_build=true") set(OPTIONS_DBG "${OPTIONS} is_debug=true") +set(OPTIONS_REL "${OPTIONS} is_official_build=true") if(CMAKE_HOST_WIN32) # Load toolchains @@ -149,17 +300,15 @@ if(CMAKE_HOST_WIN32) to_gn_list(SKIA_CXX_FLAGS_DBG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") to_gn_list(SKIA_CXX_FLAGS_REL "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") - set(OPTIONS_DBG "${OPTIONS_DBG} extra_cflags_c=${SKIA_C_FLAGS_DBG} \ + string(APPEND OPTIONS_DBG " extra_cflags_c=${SKIA_C_FLAGS_DBG} \ extra_cflags_cc=${SKIA_CXX_FLAGS_DBG}") - - set(OPTIONS_REL "${OPTIONS_REL} extra_cflags_c=${SKIA_C_FLAGS_REL} \ + string(APPEND OPTIONS_REL " extra_cflags_c=${SKIA_C_FLAGS_REL} \ extra_cflags_cc=${SKIA_CXX_FLAGS_REL}") set(WIN_VC "$ENV{VCINSTALLDIR}") string(REPLACE "\\VC\\" "\\VC" WIN_VC "${WIN_VC}") - set(OPTIONS_DBG "${OPTIONS_DBG} win_vc=\"${WIN_VC}\"") - set(OPTIONS_REL "${OPTIONS_REL} win_vc=\"${WIN_VC}\"") - + string(APPEND OPTIONS_DBG " win_vc=\"${WIN_VC}\"") + string(APPEND OPTIONS_REL " win_vc=\"${WIN_VC}\"") endif() vcpkg_configure_gn( @@ -168,9 +317,26 @@ vcpkg_configure_gn( OPTIONS_RELEASE "${OPTIONS_REL}" ) +set(DAWN_LINKAGE "") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(DAWN_LINKAGE "shared") +else() + set(DAWN_LINKAGE "static") +endif() + +vcpkg_list(SET SKIA_TARGETS ":skia") +if("dawn" IN_LIST FEATURES) + vcpkg_list(APPEND SKIA_TARGETS + "third_party/externals/dawn/src/dawn:proc_${DAWN_LINKAGE}" + "third_party/externals/dawn/src/dawn/native:${DAWN_LINKAGE}" + "third_party/externals/dawn/src/dawn/platform:${DAWN_LINKAGE}" + ) +endif() + vcpkg_install_gn( SOURCE_PATH "${SOURCE_PATH}" - TARGETS ":skia" + TARGETS + ${SKIA_TARGETS} ) message(STATUS "Installing: ${CURRENT_PACKAGES_DIR}/include/${PORT}") @@ -186,33 +352,46 @@ endforeach() # get a list of library dependencies for TARGET function(gn_desc_target_libs OUTPUT BUILD_DIR TARGET) - vcpkg_find_acquire_program(GN) - execute_process( - COMMAND ${GN} desc "${BUILD_DIR}" "${TARGET}" libs - WORKING_DIRECTORY "${SOURCE_PATH}" - OUTPUT_VARIABLE OUTPUT_ - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - string(REGEX REPLACE "\n|(\r\n)" ";" OUTPUT_ "${OUTPUT_}") + z_vcpkg_install_gn_get_desc("${OUTPUT}" + SOURCE_PATH "${SOURCE_PATH}" + BUILD_DIR "${BUILD_DIR}" + TARGET "${TARGET}" + WHAT_TO_DISPLAY libs) +endfunction() + +function(gn_desc_target_defines OUTPUT BUILD_DIR TARGET) + z_vcpkg_install_gn_get_desc(OUTPUT_ + SOURCE_PATH "${SOURCE_PATH}" + BUILD_DIR "${BUILD_DIR}" + TARGET "${TARGET}" + WHAT_TO_DISPLAY defines) + # exclude system defines such as _HAS_EXCEPTIONS=0 + list(FILTER OUTPUT_ EXCLUDE REGEX "^_") set(${OUTPUT} ${OUTPUT_} PARENT_SCOPE) endfunction() # skiaConfig.cmake.in input variables -gn_desc_target_libs(SKIA_DEP_DBG - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - //:skia) -gn_desc_target_libs(SKIA_DEP_REL - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - //:skia) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + gn_desc_target_libs(SKIA_DEP_DBG + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + //:skia) + gn_desc_target_defines(SKIA_DEFINITIONS_DBG + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + //extract_public_config:extract_skia) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + gn_desc_target_libs(SKIA_DEP_REL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + //:skia) + gn_desc_target_defines(SKIA_DEFINITIONS_REL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + //extract_public_config:extract_skia) +endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/skiaConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/skia/skiaConfig.cmake" @ONLY) -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/skia") -vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/skia/skiaConfig.cmake.in b/ports/skia/skiaConfig.cmake.in index b4c7c82ce86db9..62f816a6ba44e1 100644 --- a/ports/skia/skiaConfig.cmake.in +++ b/ports/skia/skiaConfig.cmake.in @@ -1,12 +1,9 @@ add_library(skia INTERFACE) add_library(skia::skia ALIAS skia) - -set(SKIA_LIBRARY_NAME_DBG @SKIA_LIBRARY_NAME_DBG@) -set(SKIA_LIBRARY_NAME_REL @SKIA_LIBRARY_NAME_REL@) -set(SKIA_LIBRARY_IMPLIB_DBG @SKIA_LIBRARY_IMPLIB_DBG@) -set(SKIA_LIBRARY_IMPLIB_REL @SKIA_LIBRARY_IMPLIB_REL@) - -set(SKIA_PUBLIC_DEFINITIONS @SKIA_PUBLIC_DEFINITIONS@) +set(SKIA_DEP_DBG @SKIA_DEP_DBG@) +set(SKIA_DEP_REL @SKIA_DEP_REL@) +set(SKIA_DEFINITIONS_DBG @SKIA_DEFINITIONS_DBG@) +set(SKIA_DEFINITIONS_REL @SKIA_DEFINITIONS_REL@) # Compute the installation prefix relative to this file. get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) @@ -16,9 +13,6 @@ if(_IMPORT_PREFIX STREQUAL "/") set(_IMPORT_PREFIX "") endif() -set(SKIA_DEP_DBG @SKIA_DEP_DBG@) -set(SKIA_DEP_REL @SKIA_DEP_REL@) - find_library(SKIA_LIB NAMES skia skia.dll) target_link_libraries(skia INTERFACE "${SKIA_LIB}") @@ -45,42 +39,8 @@ endfunction() set_dependencies(Debug "${SKIA_DEP_DBG}") set_dependencies(Release "${SKIA_DEP_REL}") -set(SKIA_DEFINITIONS_DBG - _CRT_SECURE_NO_WARNINGS - _HAS_EXCEPTIONS=0 - WIN32_LEAN_AND_MEAN - NOMINMAX - SK_GL - SK_ENABLE_DUMP_GPU - SK_SUPPORT_PDF - SK_HAS_JPEG_LIBRARY - SK_USE_LIBGIFCODEC - SK_HAS_HEIF_LIBRARY - SK_HAS_PNG_LIBRARY - SK_ENABLE_SKSL_INTERPRETER - SK_HAS_WEBP_LIBRARY - SK_XML - SKIA_DLL - SK_SUPPORT_ATLAS_TEXT=1) - -set(SKIA_DEFINITIONS_REL - _CRT_SECURE_NO_WARNINGS - _HAS_EXCEPTIONS=0 - WIN32_LEAN_AND_MEAN - NOMINMAX - NDEBUG - SK_GL - SK_SUPPORT_PDF - SK_HAS_JPEG_LIBRARY - SK_USE_LIBGIFCODEC - SK_HAS_PNG_LIBRARY - SK_HAS_WEBP_LIBRARY - SK_XML - SKIA_DLL) - target_compile_definitions(skia INTERFACE $<$:${SKIA_DEFINITIONS_DBG}> $<$:${SKIA_DEFINITIONS_REL}>) target_include_directories(skia INTERFACE ${_IMPORT_PREFIX}/include) -target_compile_definitions(skia INTERFACE ${SKIA_PUBLIC_DEFINITIONS}) diff --git a/ports/skia/use_vcpkg_fontconfig.patch b/ports/skia/use_vcpkg_fontconfig.patch new file mode 100644 index 00000000000000..56bfd2c2b7a4dc --- /dev/null +++ b/ports/skia/use_vcpkg_fontconfig.patch @@ -0,0 +1,42 @@ +diff --git a/BUILD.gn b/BUILD.gn +index aeb46b4664..2ddbcd0ebe 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -452,7 +452,7 @@ optional("fontmgr_fontconfig") { + enabled = skia_enable_fontmgr_fontconfig + + # The public header includes fontconfig.h and uses FcConfig* +- public_deps = [ "//third_party:fontconfig" ] ++ public_deps = [ "//third_party/fontconfig" ] + public = [ "include/ports/SkFontMgr_fontconfig.h" ] + deps = [ ":typeface_freetype" ] + sources = [ "src/ports/SkFontMgr_fontconfig.cpp" ] +@@ -469,7 +469,7 @@ optional("fontmgr_FontConfigInterface") { + + deps = [ + ":typeface_freetype", +- "//third_party:fontconfig", ++ "//third_party/fontconfig", + ] + public = [ + "include/ports/SkFontConfigInterface.h", +diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn +index 63fa748d16..6760e0f41b 100644 +--- a/third_party/BUILD.gn ++++ b/third_party/BUILD.gn +@@ -6,9 +6,9 @@ + declare_args() { + } + +-config("system_fontconfig") { +- libs = [ "fontconfig" ] +-} +-group("fontconfig") { +- public_configs = [ ":system_fontconfig" ] +-} ++#config("system_fontconfig") { ++# libs = [ "fontconfig" ] ++#} ++#group("fontconfig") { ++# public_configs = [ ":system_fontconfig" ] ++#} diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 756ab79e83b255..39f604a2d52a82 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,26 +1,22 @@ { "name": "skia", - "version-date": "2020-05-18", - "port-version": 9, + "version-date": "2022-04-15", "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", "Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source." ], "homepage": "https://skia.org", - "supports": "osx | windows", + "license": "BSD-3-Clause", + "supports": "(osx | windows | linux) & !(windows & x86)", "dependencies": [ "expat", + "fontconfig", { "name": "freetype", "default-features": false }, - { - "name": "harfbuzz", - "features": [ - "icu" - ] - }, + "harfbuzz", "icu", "libjpeg-turbo", "libpng", @@ -29,11 +25,30 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-tool-gn", + "host": true + }, "zlib" ], + "default-features": [ + "gl" + ], "features": { + "dawn": { + "description": "dawn support for skia" + }, + "direct3d": { + "description": "Direct3D support for skia" + }, + "gl": { + "description": "OpenGL support for skia" + }, "metal": { - "description": "metal support for skia" + "description": "Metal support for skia" + }, + "vulkan": { + "description": "Vulkan support for skia" } } } diff --git a/ports/v8/vcpkg.json b/ports/v8/vcpkg.json index 5f82dceb8c4acd..eae65fcd0c5a3d 100644 --- a/ports/v8/vcpkg.json +++ b/ports/v8/vcpkg.json @@ -1,10 +1,11 @@ { "name": "v8", "version": "9.1.269.39", - "port-version": 3, + "port-version": 4, "description": "Google Chrome's JavaScript engine", "homepage": "https://v8.dev", - "supports": "!(arm | arm64 | uwp | osx)", + "license": "BSD-3-Clause", + "supports": "!(arm | arm64 | uwp | osx | linux)", "dependencies": [ { "name": "glib", diff --git a/ports/vcpkg-tool-gn/portfile.cmake b/ports/vcpkg-tool-gn/portfile.cmake new file mode 100644 index 00000000000000..a8c42daa4950f9 --- /dev/null +++ b/ports/vcpkg-tool-gn/portfile.cmake @@ -0,0 +1,62 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(program GN) +set(search_names gn gn.exe) +set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/gn") + +set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "aarch64") + set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC") + set(gn_platform "linux-arm64") + set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B") + else() + set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC") + set(gn_platform "linux-amd64") + set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F") + endif() +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "arm64") + set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC") + set(gn_platform "mac-arm64") + set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8") + else() + set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC") + set(gn_platform "mac-amd64") + set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5") + endif() +else() + if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64") + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + else() # AMD64 + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + endif() +endif() + +set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}") +set(download_filename "gn-${gn_platform}.zip") +vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" +) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/gn") +vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/gn" +) + +z_vcpkg_find_acquire_program_find_internal("${program}" + PATHS ${paths_to_search} + NAMES ${search_names} +) + +message(STATUS "Using gn: ${GN}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/gn/version.txt" "${program_version}") # For vcpkg_find_acquire_program diff --git a/ports/vcpkg-tool-gn/vcpkg.json b/ports/vcpkg-tool-gn/vcpkg.json new file mode 100644 index 00000000000000..2239a3aa5303f0 --- /dev/null +++ b/ports/vcpkg-tool-gn/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vcpkg-tool-gn", + "version-date": "2022-04-16", + "description": "GN build system", + "homepage": "https://gn.googlesource.com/gn/", + "license": null, + "supports": "native" +} diff --git a/ports/zeroc-ice/change_to_mt.ps1 b/ports/zeroc-ice/change_to_mt.ps1 new file mode 100644 index 00000000000000..91306095423bd0 --- /dev/null +++ b/ports/zeroc-ice/change_to_mt.ps1 @@ -0,0 +1,53 @@ + +$projFilePath = $args[0] +$crtLinkage = $args[1] + +if($projFilePath) +{ + $xpath = "/rs:Project/rs:ItemGroup/rs:ProjectConfiguration" + $xmldoc = New-Object System.Xml.XmlDocument + $xmldoc.load($projFilePath) + $nsmgr = New-Object System.Xml.XmlNamespaceManager($xmldoc.NameTable); + $nsmgr.AddNamespace("rs", "http://schemas.microsoft.com/developer/msbuild/2003"); + $root = $xmldoc.DocumentElement + + foreach($conf in $root.ItemDefinitionGroup) + { + if($conf.Condition) + { + if(-Not ($conf.ClCompile.RuntimeLibrary)) + { + $rtl = $xmldoc.CreateElement("RuntimeLibrary", $conf.ClCompile.NamespaceURI) + $conf.ClCompile.AppendChild($rtl) + } + + if($conf.Condition.Contains("Debug")) + { + if($crtLinkage -eq "static") + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDebug" + } + else + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDebugDLL" + } + } + else + { + if($crtLinkage -eq "static") + { + $conf.ClCompile.RuntimeLibrary = "Multithreaded" + } + else + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDLL" + } + } + } + } + $xmldoc.save($projFilePath) +} +else +{ + Write-Error "Error: No path defined!" +} diff --git a/ports/zeroc-ice/portfile.cmake b/ports/zeroc-ice/portfile.cmake index c1eaf7d02192e6..c1cf8c1d36fc35 100644 --- a/ports/zeroc-ice/portfile.cmake +++ b/ports/zeroc-ice/portfile.cmake @@ -257,6 +257,12 @@ else() # VCPKG_TARGET_IS_WINDOWS include("${CURRENT_PORT_DIR}/prepare_for_build.cmake") prepare_for_build("${SOURCE_PATH}") + vcpkg_list(SET MSBUILD_OPTIONS + "/p:UseVcpkg=yes" + "/p:IceBuildingSrc=yes" + ${ICE_OPTIONAL_COMPONENTS_MSBUILD} + ) + # Build Ice vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} @@ -265,9 +271,7 @@ else() # VCPKG_TARGET_IS_WINDOWS TARGET "C++11\\ice++11" USE_VCPKG_INTEGRATION OPTIONS - /p:UseVcpkg=yes - /p:IceBuildingSrc=yes - ${ICE_OPTIONAL_COMPONENTS_MSBUILD} + ${MSBUILD_OPTIONS} ) if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll") diff --git a/ports/zeroc-ice/prepare_for_build.cmake b/ports/zeroc-ice/prepare_for_build.cmake index 4287fbdc820e9e..df3e93003d0efa 100644 --- a/ports/zeroc-ice/prepare_for_build.cmake +++ b/ports/zeroc-ice/prepare_for_build.cmake @@ -1,37 +1,53 @@ -# This function removes hardcoded RuntimeLibrary directives from Ice's vcxproh files and downloads +# This function modifies hardcoded RuntimeLibrary directives in Ice's .vcxproj files and downloads # Ice Builder for MSBuild, which is required to generate C++ files based on the interface definition -# files (.ice). +# files (.ice). function(prepare_for_build ICE_SOURCE_DIR) - message("-- Removing hardcoded 'RuntimeLibrary' directives from .vcxproj files") + message("-- Modifying hardcoded 'RuntimeLibrary' directives in .vcxproj files") set(CPP_SOURCE_DIR "${ICE_SOURCE_DIR}/cpp/src") file(GLOB_RECURSE PROJ_FILES "${CPP_SOURCE_DIR}/*.vcxproj") foreach(PROJ_FILE ${PROJ_FILES}) file(READ ${PROJ_FILE} PROJ_FILE_CONTENT) - STRING(REGEX - REPLACE - "" + STRING(REGEX + REPLACE + "" "" PROJ_FILE_CONTENT "${PROJ_FILE_CONTENT}" ) - STRING(REGEX - REPLACE - "MultiThreadedDebug" - "" - PROJ_FILE_CONTENT - "${PROJ_FILE_CONTENT}" - ) - STRING(REGEX - REPLACE - "MultiThreaded" - "" - PROJ_FILE_CONTENT - "${PROJ_FILE_CONTENT}" - ) + + if((NOT ${PROJ_FILE} MATCHES ".*slice\.vcxproj") AND + (NOT ${PROJ_FILE} MATCHES ".*iceutil\.vcxproj") AND + (NOT ${PROJ_FILE} MATCHES ".*slice2cpp\.vcxproj")) + + if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "static") + STRING(REGEX + REPLACE + "DynamicLibrary" + "StaticLibrary" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + else() + STRING(REGEX + REPLACE + "StaticLibrary" + "DynamicLibrary" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + endif() + endif() + file(WRITE ${PROJ_FILE} "${PROJ_FILE_CONTENT}") + + vcpkg_execute_required_process( + COMMAND pwsh ${CURRENT_PORT_DIR}/change_to_mt.ps1 ${PROJ_FILE} ${VCPKG_CRT_LINKAGE} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME change_to_mt-${TARGET_TRIPLET}-rel + ) endforeach() set(ICE_CPP_MSBUILD_PACKAGES_DIR "${ICE_SOURCE_DIR}/cpp/msbuild/packages") @@ -46,8 +62,8 @@ function(prepare_for_build ICE_SOURCE_DIR) ) vcpkg_extract_source_archive( - ICE_BUILDER_MSBUILD_DIRECTORY - ARCHIVE + ICE_BUILDER_MSBUILD_DIRECTORY + ARCHIVE "${ICE_BUILDER_MSBUILD_ARCHIVE}" NO_REMOVE_ONE_LEVEL SOURCE_BASE icebuilder diff --git a/ports/zeroc-ice/vcpkg.json b/ports/zeroc-ice/vcpkg.json index fa2d4c4968b8f3..2335597fc32261 100644 --- a/ports/zeroc-ice/vcpkg.json +++ b/ports/zeroc-ice/vcpkg.json @@ -1,12 +1,12 @@ { "name": "zeroc-ice", "version": "3.7.7", - "port-version": 1, + "port-version": 2, "maintainers": "Benjamin Oldenburg ", "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", "homepage": "https://github.com/zeroc-ice/ice", "license": null, - "supports": "!uwp & !(windows & arm) & !(windows & staticcrt) & !wasm32", + "supports": "!uwp & !(windows & arm) & !wasm32", "dependencies": [ "bzip2", "expat", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8cc1e7066809c1..2ab6bde42a2ad2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1155,9 +1155,7 @@ shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail skia:arm-uwp=fail -skia:x64-linux=fail skia:x64-uwp=fail -skia:x86-windows=fail sleef:x86-windows=fail slikenet:arm-uwp=fail slikenet:x64-uwp=fail diff --git a/scripts/cmake/vcpkg_configure_gn.cmake b/scripts/cmake/vcpkg_configure_gn.cmake index cdd4c313aa2385..d3ec8ab59d5ebb 100644 --- a/scripts/cmake/vcpkg_configure_gn.cmake +++ b/scripts/cmake/vcpkg_configure_gn.cmake @@ -56,9 +56,9 @@ function(vcpkg_configure_gn) message(FATAL_ERROR "SOURCE_PATH must be specified.") endif() - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) - vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") vcpkg_find_acquire_program(GN) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index c85932dc7c92e0..b5be6bbcbad1f8 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -216,21 +216,47 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "GN") set(program_name gn) set(rename_binary_to "gn") - set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(supported_on_unix ON) - set(program_version "xus7xtaPhpv5vCmKFOnsBVoB-PKmhZvRsSTjbQAuF0MC") - set(gn_platform "linux-amd64") - set(download_sha512 "871e75d7f3597b74fb99e36bb41fe5a9f8ce8a4d9f167f4729fc6e444807a59f35ec8aca70c2274a99c79d70a1108272be1ad991678a8ceb39e30f77abb13135") - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(supported_on_unix ON) - set(program_version "qhxILDNcJ2H44HfHmfiU-XIY3E_SIXvFqLd2wvbIgOoC") - set(gn_platform "mac-amd64") - set(download_sha512 "03ee64cb15bae7fceb412900d470601090bce147cfd45eb9b46683ac1a5dca848465a5d74c55a47df7f0e334d708151249a6d37bb021de74dd48b97ed4a07937") - else() - set(program_version "qUkAhy9J0P7c5racy-9wB6AHNK_btS18im8S06_ehhwC") - set(gn_platform "windows-amd64") - set(download_sha512 "263e02bd79eee0cb7b664831b7898565c5656a046328d8f187ef7ae2a4d766991d477b190c9b425fcc960ab76f381cd3e396afb85cba7408ca9e74eb32c175db") + if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt") + file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt" program_version) + set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/gn") + else() # Old behavior + message("Consider adding vcpkg-tool-gn as a host dependency of this port or create an issue at https://github.com/microsoft/vcpkg/issues") + set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "aarch64") + set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC") + set(gn_platform "linux-arm64") + set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B") + else() + set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC") + set(gn_platform "linux-amd64") + set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F") + endif() + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "arm64") + set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC") + set(gn_platform "mac-arm64") + set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8") + else() + set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC") + set(gn_platform "mac-amd64") + set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5") + endif() + else() + if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64") + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + else() # AMD64 + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + endif() + endif() endif() set(tool_subdirectory "${program_version}") set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}") diff --git a/versions/baseline.json b/versions/baseline.json index 053f8a940803ea..c5143ecdae770e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1366,7 +1366,7 @@ }, "chromium-base": { "baseline": "86.0.4199.1", - "port-version": 3 + "port-version": 4 }, "cimg": { "baseline": "2.9.9", @@ -1669,8 +1669,8 @@ "port-version": 1 }, "crashpad": { - "baseline": "2020-03-18", - "port-version": 2 + "baseline": "2022-04-16", + "port-version": 0 }, "crashrpt": { "baseline": "1.4.3", @@ -6521,8 +6521,8 @@ "port-version": 0 }, "skia": { - "baseline": "2020-05-18", - "port-version": 9 + "baseline": "2022-04-15", + "port-version": 0 }, "skyr-url": { "baseline": "1.13.0", @@ -7274,7 +7274,7 @@ }, "v8": { "baseline": "9.1.269.39", - "port-version": 3 + "port-version": 4 }, "valijson": { "baseline": "0.6", @@ -7328,6 +7328,10 @@ "baseline": "2022-02-14", "port-version": 0 }, + "vcpkg-tool-gn": { + "baseline": "2022-04-16", + "port-version": 0 + }, "vcpkg-tool-gyp-nss": { "baseline": "2022-03-04", "port-version": 0 @@ -7662,7 +7666,7 @@ }, "zeroc-ice": { "baseline": "3.7.7", - "port-version": 1 + "port-version": 2 }, "zeromq": { "baseline": "4.3.4", diff --git a/versions/c-/chromium-base.json b/versions/c-/chromium-base.json index 74ed1896208618..c539ab612d0a42 100644 --- a/versions/c-/chromium-base.json +++ b/versions/c-/chromium-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dbf253ab140a0d754230e2cffa7b4f94686a9e9", + "version": "86.0.4199.1", + "port-version": 4 + }, { "git-tree": "36e6dbafdea0e90a8717907171efa375d2580d8b", "version-string": "86.0.4199.1", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 6a57a61610372b..013a9dacf385e9 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "448abcac90e97d8b5ee03843775dd7fcba971979", + "version-date": "2022-04-16", + "port-version": 0 + }, { "git-tree": "88ee612aa949155b1e363bb710578811d3283033", "version-date": "2020-03-18", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 7499ae3b7cd593..00a465e3e9ca34 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d167d79c12796fb226b9a869705fde2f4594e789", + "version-date": "2022-04-15", + "port-version": 0 + }, { "git-tree": "cdf8cda1612a4770f3a01e35ae5da93654abc17d", "version-date": "2020-05-18", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index 9583dc8d42738f..3be97ab880e29a 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f57ec75cb9169900555359752c65e8e4c79c34ec", + "version": "9.1.269.39", + "port-version": 4 + }, { "git-tree": "3abf0953ae7dcf4bb4b4ede21adb27ad850b1e1c", "version": "9.1.269.39", diff --git a/versions/v-/vcpkg-tool-gn.json b/versions/v-/vcpkg-tool-gn.json new file mode 100644 index 00000000000000..cd79c22ef4dfe7 --- /dev/null +++ b/versions/v-/vcpkg-tool-gn.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "811d8c3a4d4489a291c69cde7788c620f950eb9e", + "version-date": "2022-04-16", + "port-version": 0 + } + ] +} diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json index cf4a0d74ce330f..905dc77c32195e 100644 --- a/versions/z-/zeroc-ice.json +++ b/versions/z-/zeroc-ice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ddc4746c1f19fca41706071fac4575ea99fe6b9", + "version": "3.7.7", + "port-version": 2 + }, { "git-tree": "f32e4c338e25d36018095348e632c794b13fc513", "version": "3.7.7", From 45c885b07fe5134aadb08bd10da81f6560bd5214 Mon Sep 17 00:00:00 2001 From: Daniele Pallastrelli <5451767+daniele77@users.noreply.github.com> Date: Tue, 26 Apr 2022 00:40:38 +0200 Subject: [PATCH 088/383] [cli] Update to 2.0.1 (#24250) --- ports/cli/portfile.cmake | 5 ++--- ports/cli/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/c-/cli.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/cli/portfile.cmake b/ports/cli/portfile.cmake index a9dee4d7d59612..0ab65b1a92516c 100644 --- a/ports/cli/portfile.cmake +++ b/ports/cli/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO daniele77/cli - REF v2.0.0 - SHA512 8a3e42d02f8bf757628fb876ccfa376771bbe66e7820d7fd5b34119fca262129f5122e67d939e0898b5964a162a8fd4538d5e6ffa96c4935a8c3979e5d5dbd9d + REF v2.0.1 + SHA512 cf91512bb960ead60b7a2a021e3851b998a2228f482a1a7921acb3e2ab4ff10e542c6c910997326b3e059cef7509223ec34077ce545d9af29d8903e8fecfd5ac HEAD_REF master ) @@ -17,5 +17,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cli) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - vcpkg_fixup_pkgconfig() diff --git a/ports/cli/vcpkg.json b/ports/cli/vcpkg.json index 96f9e55556db74..472af76a5fc16b 100644 --- a/ports/cli/vcpkg.json +++ b/ports/cli/vcpkg.json @@ -1,9 +1,9 @@ { "name": "cli", - "version-semver": "2.0.0", - "port-version": 1, + "version": "2.0.1", "description": "A library for interactive command line interfaces in modern C++", "homepage": "https://github.com/daniele77/cli", + "license": "BSL-1.0", "dependencies": [ "boost-asio", { diff --git a/versions/baseline.json b/versions/baseline.json index c5143ecdae770e..abc15ebb194d24 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1409,8 +1409,8 @@ "port-version": 4 }, "cli": { - "baseline": "2.0.0", - "port-version": 1 + "baseline": "2.0.1", + "port-version": 0 }, "cli11": { "baseline": "2.1.2", diff --git a/versions/c-/cli.json b/versions/c-/cli.json index 4da89892f00631..1c705d9ba73961 100644 --- a/versions/c-/cli.json +++ b/versions/c-/cli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25a075116903bfd73e5a1e4f63638955c1a52732", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "2c5da108b7e41bd3da82fe9b670a308d664b3a0e", "version-semver": "2.0.0", From a2de7817a5106d478834fcb3143c74313842f0f6 Mon Sep 17 00:00:00 2001 From: Ronald <3665590+playgithub@users.noreply.github.com> Date: Tue, 26 Apr 2022 06:45:16 +0800 Subject: [PATCH 089/383] [wxcharts] Add new port (#24263) * port wxcharts * regulate * add license in vcpkg.json * fix url * Update version database * Update ports/wxcharts/portfile.cmake vcpkg_from_github instead of vcpkg_from_git Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * try vcpkg_from_github instead of vcpkg_from_git * add hash * remove comments * Update version database * the patch has been merged in upstream, no need here * Update version * Update ports/wxcharts/vcpkg.json Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update version * Update versions/w-/wxcharts.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: abc Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/wxcharts/portfile.cmake | 18 ++++++++++++++++++ ports/wxcharts/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/w-/wxcharts.json | 9 +++++++++ 4 files changed, 49 insertions(+) create mode 100644 ports/wxcharts/portfile.cmake create mode 100644 ports/wxcharts/vcpkg.json create mode 100644 versions/w-/wxcharts.json diff --git a/ports/wxcharts/portfile.cmake b/ports/wxcharts/portfile.cmake new file mode 100644 index 00000000000000..cee9220505c982 --- /dev/null +++ b/ports/wxcharts/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wxIshiko/wxCharts + REF c7c7eb4c4132eeb83f25546b1b981dc61e5c188f + SHA512 f46cf467b356e2ffa46db020de42f8aca9beab801e2ade50f7e75650bba9bc83c641702dcd5ee45e82425b96d4371b82e7f16dce3077050a86ba696ed5c326de +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/wxcharts/vcpkg.json b/ports/wxcharts/vcpkg.json new file mode 100644 index 00000000000000..6e3928655d9e5a --- /dev/null +++ b/ports/wxcharts/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "wxcharts", + "version-date": "2022-04-22", + "description": "Chart controls for the wxWidgets cross-platform GUI library", + "homepage": "https://www.wxishiko.com/wxCharts", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wxwidgets" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index abc15ebb194d24..3a7e8d04d0e6bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7516,6 +7516,10 @@ "baseline": "1.0.0", "port-version": 1 }, + "wxcharts": { + "baseline": "2022-04-22", + "port-version": 0 + }, "wxwidgets": { "baseline": "3.1.5", "port-version": 10 diff --git a/versions/w-/wxcharts.json b/versions/w-/wxcharts.json new file mode 100644 index 00000000000000..4001a09f01e20d --- /dev/null +++ b/versions/w-/wxcharts.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b1e9c16349a281b499d1ff50cdee4dd21c4aafec", + "version-date": "2022-04-22", + "port-version": 0 + } + ] +} From 9e7ae260cfc8fb84cbef2539661ca0e818c84fdc Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Tue, 26 Apr 2022 00:49:08 +0200 Subject: [PATCH 090/383] [sentry-native] Update to 0.4.17 (#24309) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 10 ++++++---- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 59ad22c2eb87a6..49ef2a03ad87c6 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.15/sentry-native.zip" - FILENAME "sentry-native-0.4.15.zip" - SHA512 bbe568cc92fa20d69db5bb9efc5ac1a27d05c3ac28c36addd827fba64b2945ce23cbdb3c0daf76b0a140de4949b6c76607f00000ceb7989d8a33b791d30c8152 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.17/sentry-native.zip" + FILENAME "sentry-native-0.4.17.zip" + SHA512 03ee36f5420b0f3a21b1e4b58fe88b67a883abda27c0c644e3a9916674e1847a91ee2a3815908747738a77e8984b46f92fc776405ee443c71c69e352eeecebe6 ) vcpkg_extract_source_archive_ex( @@ -38,6 +38,8 @@ vcpkg_cmake_configure( -DSENTRY_BUILD_EXAMPLES=OFF -DSENTRY_BACKEND=${SENTRY_BACKEND} -DCRASHPAD_ZLIB_SYSTEM=ON + MAYBE_UNUSED_VARIABLES + CRASHPAD_ZLIB_SYSTEM ) vcpkg_cmake_install() @@ -46,7 +48,7 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sentry) +vcpkg_cmake_config_fixup(PACKAGE_NAME sentry CONFIG_PATH lib/cmake/sentry) if (SENTRY_BACKEND STREQUAL "crashpad") vcpkg_copy_tools( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index b25d67db0a6981..ce741d2266fa5f 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version-semver": "0.4.15", + "version": "0.4.17", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 3a7e8d04d0e6bd..66dca2c1851c5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6417,7 +6417,7 @@ "port-version": 1 }, "sentry-native": { - "baseline": "0.4.15", + "baseline": "0.4.17", "port-version": 0 }, "septag-sx": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 20d816302c7ac8..147696607b1254 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d6b1817e6134faaf9a3f85d1719c925dd15a3a9", + "version": "0.4.17", + "port-version": 0 + }, { "git-tree": "3dff7be1b47155d1580f43be48d8b95761251883", "version-semver": "0.4.15", From 69f8fc1dcae8f23f7c7a3063385b801def1d68a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Tue, 26 Apr 2022 00:49:42 +0200 Subject: [PATCH 091/383] [tracy] update to 0.8.1 (#24318) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: MACHIZAUD AndrĆ©a --- ports/tracy/portfile.cmake | 4 ++-- ports/tracy/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/t-/tracy.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 38607261d5034e..e687dd3a2f1be9 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF e83e83dae9852a9d4d451589f324776710b34ee6 - SHA512 1286a54bc9c874b076ca36be63055b78ed8af3df0f10da06478bd5a7036538ce0ee26f3e7bec771e1408b78bc8094d6e7a9f420645b6a0da8eef415fb2717133 + REF 80f6a93da79af94fc4604e37439f5a75d5e7dfbd + SHA512 80d24fd969a9f8ac000b127c586745c85239139c50f6aacf625cea50551303031a7e14da01fd96a0e17d59ea639019cab119b76945e96cb6e7cfc7e5399252f8 HEAD_REF master PATCHES 001-fix-vcxproj-vcpkg.patch diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index a66c50e6c2e8a1..8e6345964ce614 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tracy", - "version-semver": "0.8.0", - "port-version": 1, + "version-semver": "0.8.1", "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 66dca2c1851c5b..1ca11c881d9e4e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7089,8 +7089,8 @@ "port-version": 3 }, "tracy": { - "baseline": "0.8.0", - "port-version": 1 + "baseline": "0.8.1", + "port-version": 0 }, "transwarp": { "baseline": "2.2.2", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index e95ccfb6f1dc88..17181457306977 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a703a83cacfbb242afd294baeb87ca1a497c5bf1", + "version-semver": "0.8.1", + "port-version": 0 + }, { "git-tree": "65aeedc7adaa4e1b13998f781e702d7672b2aca5", "version-semver": "0.8.0", From d4a516114a9dc1258a9ef78ff0e6c78a8ca0dd6e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 26 Apr 2022 06:56:40 +0800 Subject: [PATCH 092/383] [mongoose] update to 7.6 (#24332) * [mongoose] Update port to version 7.6 * delets license * update version * add license * update verison Co-authored-by: FrankXie --- ports/mongoose/portfile.cmake | 4 ++-- ports/mongoose/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/m-/mongoose.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/mongoose/portfile.cmake b/ports/mongoose/portfile.cmake index d5912f6e0b2b8c..e9c0f9903f92af 100644 --- a/ports/mongoose/portfile.cmake +++ b/ports/mongoose/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cesanta/mongoose - REF 9d38e26b817b6b151fd925e9a8420a46c99a8375 #v7.5 - SHA512 ce488a6b9dc1e7437b17ea32e62c2c90fe05b298df995e624f24f05c539ee96444fa892dab7958a81541c711bb3e399808f793c8ce317b0fd904b037955d81fa + REF 1b82aa02aa3d6fecfc23ed0a94c6917f139de1ad #v7.6 + SHA512 50f13a2cc5dca6ccbc30e9686166b8615faad0ea010966d215d583c04338396a5d2613fe065cc17d8f918673b20004596ca8f73f1b636679db82dbb063698a80 HEAD_REF master ) diff --git a/ports/mongoose/vcpkg.json b/ports/mongoose/vcpkg.json index 1177b737ea83e6..b8f4f4e1a095c7 100644 --- a/ports/mongoose/vcpkg.json +++ b/ports/mongoose/vcpkg.json @@ -1,9 +1,9 @@ { "name": "mongoose", - "version": "7.5", - "port-version": 1, + "version": "7.6", "description": "Embedded web server / embedded networking library", "homepage": "https://cesanta.com/", + "license": null, "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 1ca11c881d9e4e..71e18f17d8940b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4581,8 +4581,8 @@ "port-version": 3 }, "mongoose": { - "baseline": "7.5", - "port-version": 1 + "baseline": "7.6", + "port-version": 0 }, "monkeys-audio": { "baseline": "5.70", diff --git a/versions/m-/mongoose.json b/versions/m-/mongoose.json index 7d09a84ad15882..35a0e8175e3723 100644 --- a/versions/m-/mongoose.json +++ b/versions/m-/mongoose.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbba0161f41a1ea996f1e64afecc998e01e59661", + "version": "7.6", + "port-version": 0 + }, { "git-tree": "504d873811dc91402f21952ea4c9fd08602cc822", "version": "7.5", From c4844deb7d158b2ad903a16b1f08e2d54ac95fd1 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 26 Apr 2022 07:08:47 +0800 Subject: [PATCH 093/383] [dav1d] update to 0.9.2 (#24336) * [dav1d] update to 0.9.2 * update version * use version * update version * update ref * update version --- ports/dav1d/portfile.cmake | 8 ++++---- ports/dav1d/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/d-/dav1d.json | 5 +++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/dav1d/portfile.cmake b/ports/dav1d/portfile.cmake index cd727622586ce0..4709b593bd4882 100644 --- a/ports/dav1d/portfile.cmake +++ b/ports/dav1d/portfile.cmake @@ -2,10 +2,10 @@ vcpkg_from_gitlab( GITLAB_URL https://code.videolan.org OUT_SOURCE_PATH SOURCE_PATH REPO videolan/dav1d - REF 0.8.2 - SHA512 2f48c88fdbe627f089eb378f43b8f18e1c5cff4645148ee7e14b8f3f8e9d690b28e58fc9cb466e7a9a4c147f06b0d34c47c132070acefbd01abe23cd3c6047d8 + REF 7b433e077298d0f4faf8da6d6eb5774e29bffa54 #v0.9.2 + SHA512 f889f969f6d612770132cbd2faf8685b1613661b5fbb9e7efe86e9cd074cbd99d5d0cd23894ffc3743fb34301b387df3a81bf067d2c7102358e3fdacf5959782 PATCHES - "patch_underscore_prefix.patch" + patch_underscore_prefix.patch ) vcpkg_find_acquire_program(NASM) @@ -18,7 +18,7 @@ if (LIBRARY_TYPE STREQUAL "dynamic") endif(LIBRARY_TYPE STREQUAL "dynamic") vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS --default-library=${LIBRARY_TYPE} -Denable_tests=false diff --git a/ports/dav1d/vcpkg.json b/ports/dav1d/vcpkg.json index 0a10cfc65b787d..9460efa85db293 100644 --- a/ports/dav1d/vcpkg.json +++ b/ports/dav1d/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dav1d", - "version-semver": "0.8.2", - "port-version": 3, + "version": "0.9.2", "description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.", "homepage": "https://code.videolan.org/videolan/dav1d", + "license": "BSD-2-Clause", "supports": "!(uwp | arm | x86)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 71e18f17d8940b..e0b83501587a06 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1793,8 +1793,8 @@ "port-version": 2 }, "dav1d": { - "baseline": "0.8.2", - "port-version": 3 + "baseline": "0.9.2", + "port-version": 0 }, "daw-header-libraries": { "baseline": "1.29.7", diff --git a/versions/d-/dav1d.json b/versions/d-/dav1d.json index 064c5d579d6540..d77ca746cf1f7c 100644 --- a/versions/d-/dav1d.json +++ b/versions/d-/dav1d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c06788e881e79f8c6a169f0f666baf2dc04faa6", + "version": "0.9.2", + "port-version": 0 + }, { "git-tree": "d92dfe48dbd557d90d9c216bc5a5a4b9435939c1", "version-semver": "0.8.2", From da3640e826234269e4a83d5fca0e37c0f9ef5f69 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Mon, 25 Apr 2022 16:09:12 -0700 Subject: [PATCH 094/383] [pango] Update to v1.50.7 (#24345) * update to v1.50.7 * updated version --- ports/pango/portfile.cmake | 4 ++-- ports/pango/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pango.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 3dd0e5b96f94da..6c434e156fa734 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/pango - REF 37a427018c92a2bc679ef104097e07a619609c9c #v1.50.6 - SHA512 4990022cae2130b4842d0d9d3161545c7214ac3dd445d85a7ec49b0a89e39319b404fecc66d4025965cd2407823c7476b937e6ee53e2e6763b35048db8ff387f + REF a2ccd36a42e039d3600b04fe37fdc47f267d90c7 #v1.50.7 + SHA512 1116080b98e46eb436b5a8712f1f16b3debd22e4e549b7ed74e5f37985644b30c4639cf248758f1d8e72581b7b2009aed95cab47781b09cb9234fcf03f2b425c HEAD_REF master # branch name ) diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index faf48574fff6ca..3f181b2762b790 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pango", - "version": "1.50.6", + "version": "1.50.7", "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index e0b83501587a06..446585a6462cbb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5277,7 +5277,7 @@ "port-version": 0 }, "pango": { - "baseline": "1.50.6", + "baseline": "1.50.7", "port-version": 0 }, "pangolin": { diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 4533caaec0fc11..2cbeede2cef894 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5275b5581f4cfc5ccb547a556f3affc4c92e05cd", + "version": "1.50.7", + "port-version": 0 + }, { "git-tree": "db85fd904e40578950bcc478e2bfad06c70e787a", "version": "1.50.6", From 6c953be2ac523e21765e1e2a50d41c71b2e91144 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Mon, 25 Apr 2022 16:11:33 -0700 Subject: [PATCH 095/383] [lmdb] Remove 'd' suffix from debug libraries (#24347) * append 'd' only on windows * removed d suffix * add version --- ports/lmdb/cmake/CMakeLists.txt | 2 +- ports/lmdb/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/lmdb.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/lmdb/cmake/CMakeLists.txt b/ports/lmdb/cmake/CMakeLists.txt index b7ef12450b748b..babddef004e598 100644 --- a/ports/lmdb/cmake/CMakeLists.txt +++ b/ports/lmdb/cmake/CMakeLists.txt @@ -27,7 +27,7 @@ endif() set(SRCS lmdb mdb.c lmdb.h midl.c midl.h ) add_library(lmdb ${SRCS}) -set_target_properties(lmdb PROPERTIES DEBUG_POSTFIX d) + if (WIN32) target_link_libraries(lmdb PRIVATE ntdll.lib) endif() diff --git a/ports/lmdb/vcpkg.json b/ports/lmdb/vcpkg.json index 1a15ee7a4fec48..15ef262df8e55a 100644 --- a/ports/lmdb/vcpkg.json +++ b/ports/lmdb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lmdb", "version": "0.9.29", + "port-version": 1, "description": "LMDB is an extraordinarily fast, memory-efficient database", "homepage": "https://github.com/LMDB/lmdb", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 446585a6462cbb..ef1ae4191954aa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4258,7 +4258,7 @@ }, "lmdb": { "baseline": "0.9.29", - "port-version": 0 + "port-version": 1 }, "lodepng": { "baseline": "2021-12-04", diff --git a/versions/l-/lmdb.json b/versions/l-/lmdb.json index 027244f68e7ae2..22e21e7ef8553e 100644 --- a/versions/l-/lmdb.json +++ b/versions/l-/lmdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02d32452e2c5a3284fcdd1f448ab513dbb18a085", + "version": "0.9.29", + "port-version": 1 + }, { "git-tree": "980e2c4a26c75996e3940a9b46032356643e592b", "version": "0.9.29", From 3db88df0352e0150899b28cc0ee90258a9ec2acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 26 Apr 2022 01:15:28 +0200 Subject: [PATCH 096/383] [celero] Update to 2.8.3 (#24349) * [celero] Update to 2.8.3 * [celero] Update version files * [celero] fix binaries install path * [celero] Update version files --- ports/celero/fix-bin-install-path.patch | 17 +++++++++++++++++ ports/celero/portfile.cmake | 24 +++++++++++------------- ports/celero/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/c-/celero.json | 5 +++++ 5 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 ports/celero/fix-bin-install-path.patch diff --git a/ports/celero/fix-bin-install-path.patch b/ports/celero/fix-bin-install-path.patch new file mode 100644 index 00000000000000..3a73c36005200d --- /dev/null +++ b/ports/celero/fix-bin-install-path.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0158c4f..5be0fbc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -220,9 +220,11 @@ install( + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + install( + TARGETS celero +- DESTINATION ${CMAKE_INSTALL_LIBDIR} + EXPORT celero-targets ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib + ) + install( + EXPORT celero-targets diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake index e39bac92d716df..94524f5210a85d 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -1,33 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF 6208b63dcd4baeea6817d3e84f79fb04ad99c720 #2.8.2 - SHA512 13a486dafba394cc3e072292008d00e8a3e1b12b4fe7c82cf2ce43b3d24629d08b5762494c19da0a12b186a70114cba101553ed1b4cea90d090514307b06dec8 + REF v2.8.3 + SHA512 f6774f6076bae5d37d4f5bd12153bc99b97893f43fe9253fe805b5b0c2475ffe878e32f3fc7391544ea24020e59d5ae48e44e5b3a302f7280ad15b6a6820f70b HEAD_REF master + PATCHES + fix-bin-install-path.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CELERO_COMPILE_DYNAMIC_LIBRARIES) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCELERO_ENABLE_EXPERIMENTS=OFF -DCELERO_ENABLE_TESTS=OFF - -DCELERO_RUN_EXAMPLE_ON_BUILD=OFF -DCELERO_COMPILE_DYNAMIC_LIBRARIES=${CELERO_COMPILE_DYNAMIC_LIBRARIES} -DCELERO_TREAT_WARNINGS_AS_ERRORS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/celero/Export.h "ifdef CELERO_STATIC" "if 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/celero/Export.h" "#ifdef CELERO_STATIC" "#define CELERO_STATIC\n#ifdef CELERO_STATIC") endif() -file(RENAME ${CURRENT_PACKAGES_DIR}/share/celero/celero-target.cmake ${CURRENT_PACKAGES_DIR}/share/celero/celero-config.cmake) - -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/celero/vcpkg.json b/ports/celero/vcpkg.json index 5296cfa17d4032..fbf37ae55e5c9d 100644 --- a/ports/celero/vcpkg.json +++ b/ports/celero/vcpkg.json @@ -1,7 +1,17 @@ { "name": "celero", - "version-string": "2.8.2", - "port-version": 1, + "version": "2.8.3", "description": "Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++.", - "homepage": "https://github.com/DigitalInBlue/Celero" + "homepage": "https://github.com/DigitalInBlue/Celero", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ef1ae4191954aa..50e49e77e29acc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1293,8 +1293,8 @@ "port-version": 3 }, "celero": { - "baseline": "2.8.2", - "port-version": 1 + "baseline": "2.8.3", + "port-version": 0 }, "cello": { "baseline": "2019-07-23", diff --git a/versions/c-/celero.json b/versions/c-/celero.json index ccc9cac516983c..11097e0dea9e27 100644 --- a/versions/c-/celero.json +++ b/versions/c-/celero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9beee7ba313a9770888b114a8146bc1a983577e", + "version": "2.8.3", + "port-version": 0 + }, { "git-tree": "58fca5af8a14714f953c3d8a4653e90ac8d11e2f", "version-string": "2.8.2", From e66dded96cc8f995272dd47c80adbce35fccdd3c Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 26 Apr 2022 01:15:56 +0200 Subject: [PATCH 097/383] [openvpn3] update to 3.7 (#24360) * [openvpn3] update to 3.7 * version --- ports/openvpn3/portfile.cmake | 23 +++++++++++------------ ports/openvpn3/vcpkg.json | 9 +++++++-- versions/baseline.json | 4 ++-- versions/o-/openvpn3.json | 5 +++++ 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/ports/openvpn3/portfile.cmake b/ports/openvpn3/portfile.cmake index e638f1a42c1aff..3580f8d875e44b 100644 --- a/ports/openvpn3/portfile.cmake +++ b/ports/openvpn3/portfile.cmake @@ -3,24 +3,23 @@ set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenVPN/openvpn3 - REF release/3.4.1 - SHA512 2d0a7d2d48047c969ba1cb49b34d51c85dd82ae97296d7c096ead13a8e7cc69fa3908262228e29d93f60b7273814d8ef5a402a5d401cd7f91370868d5d308678 + REF release/3.7 + SHA512 de95bd2b1a01179aa81e1612be175540c2486b856f66880372d09966655bbbadd71d874ed49b032566dde2896207bc76298c5cfcf73e86272c04d5aaa977d660 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(COPY ${SOURCE_PATH}/openvpn DESTINATION ${CURRENT_PACKAGES_DIR}/include/) -file(COPY ${SOURCE_PATH}/client/ovpncli.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/openvpn/) +file(COPY "${SOURCE_PATH}/openvpn" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/client/ovpncli.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/openvpn") -file(GLOB_RECURSE HEADERS ${CURRENT_PACKAGES_DIR}/include/openvpn/*) +file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/openvpn/*") foreach(HEADER IN LISTS HEADERS) file(READ "${HEADER}" _contents) string(REPLACE "defined(USE_ASIO)" "1" _contents "${_contents}") @@ -31,5 +30,5 @@ foreach(HEADER IN LISTS HEADERS) endforeach() file(INSTALL - ${SOURCE_PATH}/COPYRIGHT.AGPLV3 - DESTINATION ${CURRENT_PACKAGES_DIR}/share/openvpn3 RENAME copyright) + "${SOURCE_PATH}/COPYRIGHT.AGPLV3" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openvpn3/vcpkg.json b/ports/openvpn3/vcpkg.json index ea718ed621af0e..f515b53513ea94 100644 --- a/ports/openvpn3/vcpkg.json +++ b/ports/openvpn3/vcpkg.json @@ -1,14 +1,19 @@ { "name": "openvpn3", - "version-string": "3.4.1", - "port-version": 2, + "version": "3.7.0", "description": "a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.", + "homepage": "https://openvpn.net", + "license": "AGPL-3.0", "dependencies": [ "asio", "mbedtls", { "name": "tap-windows6", "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 50e49e77e29acc..f78ec13c87cf51 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5189,8 +5189,8 @@ "port-version": 0 }, "openvpn3": { - "baseline": "3.4.1", - "port-version": 2 + "baseline": "3.7.0", + "port-version": 0 }, "openvr": { "baseline": "1.16.8", diff --git a/versions/o-/openvpn3.json b/versions/o-/openvpn3.json index 26f6e68e090304..4961868eef3fda 100644 --- a/versions/o-/openvpn3.json +++ b/versions/o-/openvpn3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "901a710e937496a572cdb5b64d2401c18919ffde", + "version": "3.7.0", + "port-version": 0 + }, { "git-tree": "bf20f11ad1fb64e74ebcfda5a3b3c19b8e4770ae", "version-string": "3.4.1", From e50d5baf66260493b8b5c6ed7b456a71d6e4f897 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Mon, 25 Apr 2022 16:36:25 -0700 Subject: [PATCH 098/383] [caf] update to 0.18.6 (#24335) * [caf] update to 0.18.6 * update version * Correct license identifier to BSD 3 clause. https://github.com/actor-framework/actor-framework/blob/master/LICENSE Co-authored-by: Billy Robert O'Neal III --- ports/caf/portfile.cmake | 4 ++-- ports/caf/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/caf.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index 128eb5bee5b150..a8afe9ffae05e1 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework - REF c2be26e7f9e3e84ef14730590fc4e7b25fb9d29a # 0.18.5 - SHA512 e8d1e9417ea71c4f92f51f4f7dbb7bcc9d0468623d2202be9b4ed4411406a3b6f6fc903309b74bb130e7cf1c7a0ec349d8bc2ac8f216a28216d1c808c1bde039 + REF bfa0f83dd5c9151c263c304300c79161ae8cb595 # 0.18.6 + SHA512 58ebd40623edc0245dd38b3a2bbbda7af7d9b030155746949dfe7c4c30bdc07ee2ee84d195dc2e914d69f58c6c46bc9ad496bbc34e7cafe0530200458a4c5a76 HEAD_REF master PATCHES fix_dependency.patch diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json index 71bb3846858999..a47199eace8a2b 100644 --- a/ports/caf/vcpkg.json +++ b/ports/caf/vcpkg.json @@ -1,8 +1,9 @@ { "name": "caf", - "version": "0.18.5", + "version": "0.18.6", "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.", "homepage": "https://github.com/actor-framework/actor-framework", + "license": "BSD-3-Clause", "dependencies": [ "openssl", { diff --git a/versions/baseline.json b/versions/baseline.json index f78ec13c87cf51..7bbfa6b8502c92 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1217,7 +1217,7 @@ "port-version": 0 }, "caf": { - "baseline": "0.18.5", + "baseline": "0.18.6", "port-version": 0 }, "caffe2": { diff --git a/versions/c-/caf.json b/versions/c-/caf.json index 7e81e9e8fc9dd2..f576dbd6783252 100644 --- a/versions/c-/caf.json +++ b/versions/c-/caf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be83968f892180d5ee2f1943cf9cac3782e9111e", + "version": "0.18.6", + "port-version": 0 + }, { "git-tree": "6f4b297fc5ad4bd021fa9d72787b27e69a558237", "version": "0.18.5", From 69dc103b6d326e1b563f7a6bf66e2c0d6c8aa422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 26 Apr 2022 01:47:29 +0200 Subject: [PATCH 099/383] [quill] Update to 1.7.1 (#24363) * [quill] Update to 1.7.1 * [quill] Update version files --- ports/quill/portfile.cmake | 4 ++-- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 7a899315107f68..3c718d12fa04f7 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill - REF v1.7.0 - SHA512 9acc1d9eb446882f934fb201f92417fa102ea68781144d673d3440037693738d520a595186c713b2ebf8b9fabd6327761ee7b569ad880af54be5480071ec15b5 + REF v1.7.1 + SHA512 93f8bd4b28f7568562b71abdfba89ca7f43133e6ebf6f80a46f2af81a88ec621420432c6e90a3dbd85944cecca57ec94e5bd25d896b0ffe9888f19ae4534f2f7 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index dee0985d1bb026..83425ec22cbd04 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "1.7.0", + "version": "1.7.1", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7bbfa6b8502c92..ed33f30c90a663 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6025,7 +6025,7 @@ "port-version": 7 }, "quill": { - "baseline": "1.7.0", + "baseline": "1.7.1", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 84a96bbe3d3cab..d606b03a604e28 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfe7d0bbdf62856534c0d3783135b2bca1fea312", + "version": "1.7.1", + "port-version": 0 + }, { "git-tree": "a267f26f50e991400ca01b2dd40dec6a71cefee3", "version": "1.7.0", From 6a5e541af50f13968ef9a67f8bee73f5e570dcf6 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:09:38 -0700 Subject: [PATCH 100/383] [libpqxx] update to 7.7.3 (#24366) * [libpqxx] update to 7.7.3 * update version --- .../fix_build_with_apple_clang_13.patch | 15 ------ ports/libpqxx/fix_build_with_vs2017.patch | 47 ++++++++++--------- ports/libpqxx/portfile.cmake | 5 +- ports/libpqxx/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/l-/libpqxx.json | 5 ++ 6 files changed, 35 insertions(+), 45 deletions(-) delete mode 100644 ports/libpqxx/fix_build_with_apple_clang_13.patch diff --git a/ports/libpqxx/fix_build_with_apple_clang_13.patch b/ports/libpqxx/fix_build_with_apple_clang_13.patch deleted file mode 100644 index 9b9a26e9459b2b..00000000000000 --- a/ports/libpqxx/fix_build_with_apple_clang_13.patch +++ /dev/null @@ -1,15 +0,0 @@ -# apple clang 13 has a bug where [[likely]] or [[unlikely]] returns -# don't count for checking that a constexpr function has a return, -# so at least one return must be unmarked ---- a/src/robusttransaction.cxx -+++ b/src/robusttransaction.cxx -@@ -62,9 +62,8 @@ constexpr tx_stat parse_status(std::string_view text) noexcept - case 'i': - if (text == in_progress) - PQXX_LIKELY return tx_in_progress; - break; - } -- PQXX_UNLIKELY - return tx_unknown; - } - diff --git a/ports/libpqxx/fix_build_with_vs2017.patch b/ports/libpqxx/fix_build_with_vs2017.patch index a10b8d161c9126..9892415b0add1c 100644 --- a/ports/libpqxx/fix_build_with_vs2017.patch +++ b/ports/libpqxx/fix_build_with_vs2017.patch @@ -1,11 +1,12 @@ -diff --git a/include/pqxx/compiler-public.hxx b/include/pqxx/compiler-public.hxx -index 5d24c7e..8087191 100644 ---- a/include/pqxx/compiler-public.hxx -+++ b/include/pqxx/compiler-public.hxx -@@ -43,6 +43,11 @@ +diff --git a/include/pqxx/internal/header-pre.hxx b/include/pqxx/internal/header-pre.hxx +index abc1a39..cba0242 100644 +--- a/include/pqxx/internal/header-pre.hxx ++++ b/include/pqxx/internal/header-pre.hxx +@@ -90,6 +90,12 @@ // Workarounds for Microsoft Visual C++ # ifdef _MSC_VER ++ +// Workarounds for deprecated attribute syntax error in Visual Studio 2017. +# if _MSC_VER < 1920 +# define PQXX_DEPRECATED(MESSAGE) __declspec(deprecated( #MESSAGE )) @@ -14,7 +15,7 @@ index 5d24c7e..8087191 100644 // Suppress vtables on abstract classes. # define PQXX_NOVTABLE __declspec(novtable) -@@ -112,6 +117,10 @@ +@@ -159,6 +165,10 @@ # define PQXX_NOVTABLE /* novtable */ #endif @@ -22,15 +23,15 @@ index 5d24c7e..8087191 100644 +# define PQXX_DEPRECATED(MESSAGE) [[deprecated( #MESSAGE )]] +#endif + - // TODO: Assume support once we're on C++20. + // C++20: Assume support. #if defined(PQXX_HAVE_LIKELY) # define PQXX_LIKELY [[likely]] diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx -index f2dcc31..6a74b55 100644 +index ff4a93d..5b300d6 100644 --- a/include/pqxx/stream_from.hxx +++ b/include/pqxx/stream_from.hxx -@@ -148,7 +148,7 @@ public: - /** @deprecated Use factory function @c table() or @c raw_table() instead. +@@ -153,7 +153,7 @@ public: + /** @deprecated Use factories @ref table or @ref raw_table instead. */ template - [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( @@ -38,8 +39,8 @@ index f2dcc31..6a74b55 100644 transaction_base &, from_table_t, std::string_view table, Iter columns_begin, Iter columns_end); -@@ -156,13 +156,13 @@ public: - /** @deprecated Use factory function @c query() instead. +@@ -161,13 +161,13 @@ public: + /** @deprecated Use factory function @ref query instead. */ template - [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( @@ -48,15 +49,15 @@ index f2dcc31..6a74b55 100644 Columns const &columns); #include "pqxx/internal/ignore-deprecated-pre.hxx" - /// @deprecated Use factory function @c table() or @c raw_table() instead. + /// @deprecated Use factories @ref table or @ref raw_table instead. - [[deprecated("Use the from_table_t overload instead.")]] stream_from( + PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( transaction_base &tx, std::string_view table) : stream_from{tx, from_table, table} {} -@@ -170,14 +170,14 @@ public: +@@ -175,14 +175,14 @@ public: - /// @deprecated Use factory function @c table() or @c raw_table() instead. + /// @deprecated Use factories @ref table or @ref raw_table instead. template - [[deprecated("Use the from_table_t overload instead.")]] stream_from( + PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( @@ -64,7 +65,7 @@ index f2dcc31..6a74b55 100644 stream_from{tx, from_table, table, columns} {} - /// @deprecated Use factory function @c table() or @c raw_table() instead. + /// @deprecated Use factories @ref table or @ref raw_table instead. template - [[deprecated("Use the from_table_t overload instead.")]] stream_from( + PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( @@ -72,10 +73,10 @@ index f2dcc31..6a74b55 100644 Iter columns_end); diff --git a/include/pqxx/stream_to.hxx b/include/pqxx/stream_to.hxx -index 3ad0292..4b52e31 100644 +index 2a49d8f..06e602e 100644 --- a/include/pqxx/stream_to.hxx +++ b/include/pqxx/stream_to.hxx -@@ -168,7 +168,7 @@ public: +@@ -169,7 +169,7 @@ public: * your data fields and the table is explicit in your code, and not hidden * in an "implicit contract" between your code and your schema. */ @@ -84,20 +85,20 @@ index 3ad0292..4b52e31 100644 transaction_base &tx, std::string_view table_name) : stream_to{tx, table_name, ""sv} {} -@@ -177,14 +177,14 @@ public: - /** @deprecated Use @c table() or @c raw_table() as a factory. +@@ -178,14 +178,14 @@ public: + /** @deprecated Use @ref table or @ref raw_table as a factory. */ template - [[deprecated("Use table() or raw_table() factory.")]] stream_to( -+ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( ++ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( transaction_base &, std::string_view table_name, Columns const &columns); /// Create a stream, specifying column names as a sequence of strings. - /** @deprecated Use @c table() or @c raw_table() as a factory. + /** @deprecated Use @ref table or @ref raw_table as a factory. */ template - [[deprecated("Use table() or raw_table() factory.")]] stream_to( -+ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( ++ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( transaction_base &, std::string_view table_name, Iter columns_begin, Iter columns_end); diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index 86d1813fdf01a1..84df953975da62 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jtv/libpqxx - REF 221ddc8be329bafb376a3d83b9cd257fd52fc7b7 # 7.6.0 - SHA512 32a673bbae2f26fbc41bdcba007d9a5ded29680cb49ba434d1913cd5007bc1c1443bf38c88d9c5a6abe0a3ee519c0f691464c8d2b144cd3f16652447d644e400 + REF 90768b07f7feb55a9bd70cfaacb5543bfd074022 # 7.7.3 + SHA512 cbb21b148135d9426acd8006bfab872997bae65cfaa7af414083a8d219f099edcc83de7bde5e36016c1f8333f1e4d03fc401a4e741dfd0881afda3e1a20009ff HEAD_REF master PATCHES fix_build_with_vs2017.patch - fix_build_with_apple_clang_13.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in" DESTINATION "${SOURCE_PATH}") diff --git a/ports/libpqxx/vcpkg.json b/ports/libpqxx/vcpkg.json index a0fe57f9b23e50..56d171359fba98 100644 --- a/ports/libpqxx/vcpkg.json +++ b/ports/libpqxx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libpqxx", - "version-semver": "7.6.0", - "port-version": 3, + "version": "7.7.3", "description": "The official C++ client API for PostgreSQL", "homepage": "https://www.postgresql.org/", + "license": "BSD-3-Clause", "dependencies": [ "libpq", { diff --git a/versions/baseline.json b/versions/baseline.json index ed33f30c90a663..649e662d16e049 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3897,8 +3897,8 @@ "port-version": 1 }, "libpqxx": { - "baseline": "7.6.0", - "port-version": 3 + "baseline": "7.7.3", + "port-version": 0 }, "libprotobuf-mutator": { "baseline": "1.0", diff --git a/versions/l-/libpqxx.json b/versions/l-/libpqxx.json index 5c0592d27a1284..332f8470d4c967 100644 --- a/versions/l-/libpqxx.json +++ b/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da2e393b9844105fa00c800afb44bc93541dcb00", + "version": "7.7.3", + "port-version": 0 + }, { "git-tree": "6dd0107ca668c589cf18a57a884dd3ef276730cf", "version-semver": "7.6.0", From ba919a0fd5ccd8950bdd3f90c2c26cf270887742 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:10:15 -0700 Subject: [PATCH 101/383] [wxchartdir] update to 2.0.0 (#24368) * [wxchartdir] update to 2.0.0 * update version --- ports/wxchartdir/portfile.cmake | 37 ++++++++++++++++----------------- ports/wxchartdir/vcpkg.json | 12 +++++++++-- versions/baseline.json | 4 ++-- versions/w-/wxchartdir.json | 5 +++++ 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/ports/wxchartdir/portfile.cmake b/ports/wxchartdir/portfile.cmake index 2947d7922d8391..8ad0c550090e5c 100644 --- a/ports/wxchartdir/portfile.cmake +++ b/ports/wxchartdir/portfile.cmake @@ -3,31 +3,30 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO utelle/wxchartdir - REF v1.0.0 - SHA512 018e588a4bcff594e0049c64597d55b680e58ae239822fcc20d415a1efd8a6b3c0c7c6c836969f01a378209307b9720b938e3826a31e18c843d52897b44b4818 - HEAD_REF master + REF v2.0.0 + SHA512 dd255af1031465c635df7ea7eee2dd15f0dcce30f91cae1eff6527b8b78ea872fa22fa05da5363f57817dc8844c0bc171a2c68f54c38f2519c7bfe0256605622 + HEAD_REF main ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/wxchartdir) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/wxchartdir) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/wxchartdir/copyright COPYONLY) +configure_file("${SOURCE_PATH}/COPYING.txt" "${CURRENT_PACKAGES_DIR}/share/wxchartdir/copyright" COPYONLY) -file(COPY ${SOURCE_PATH}/CHARTDIRECTOR-LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/CHARTDIRECTOR-README.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/GPL-3.0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/LGPL-3.0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/LICENSE.spdx DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/WxWindows-exception-3.1.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) +file(COPY "${SOURCE_PATH}/CHARTDIRECTOR-LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/CHARTDIRECTOR-README.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/GPL-3.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/LGPL-3.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/LICENSE.spdx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/WxWindows-exception-3.1.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") diff --git a/ports/wxchartdir/vcpkg.json b/ports/wxchartdir/vcpkg.json index 29f8cb251e9f47..008135748139cb 100644 --- a/ports/wxchartdir/vcpkg.json +++ b/ports/wxchartdir/vcpkg.json @@ -1,11 +1,19 @@ { "name": "wxchartdir", - "version": "1.0.0", - "port-version": 1, + "version": "2.0.0", "description": "wxChartDir provides components for the integration and use of the commercial C++ library ChartDirector, a universal chart component developed by Advanced Software Engineering Ltd, in wxWidgets based applications.", "homepage": "https://github.com/utelle/wxchartdir", + "license": "GPL-3.0-only AND LGPL-3.0 AND wxWindows", "dependencies": [ "chartdir", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "wxwidgets" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 649e662d16e049..cbddc5cb9d382a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7513,8 +7513,8 @@ "port-version": 2 }, "wxchartdir": { - "baseline": "1.0.0", - "port-version": 1 + "baseline": "2.0.0", + "port-version": 0 }, "wxcharts": { "baseline": "2022-04-22", diff --git a/versions/w-/wxchartdir.json b/versions/w-/wxchartdir.json index 6cd71a59b94547..ec31d371c698b4 100644 --- a/versions/w-/wxchartdir.json +++ b/versions/w-/wxchartdir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84db89440d1592907ba9d7513fb1b99695736caa", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "a08e6fa005143547643f47527bb263aca530b715", "version": "1.0.0", From 4e095771ae8c99ad9f8df7e061990b8cd4eb943d Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:10:37 -0700 Subject: [PATCH 102/383] [rhash] update to 1.4.2 (#24369) * [rhash] update to 1.4.2 * update version * remove unused method * overwrite-version --- ports/rhash/portfile.cmake | 17 ++++++++--------- ports/rhash/vcpkg.json | 12 +++++++++--- versions/baseline.json | 4 ++-- versions/r-/rhash.json | 5 +++++ 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ports/rhash/portfile.cmake b/ports/rhash/portfile.cmake index d80f7fce644365..8c18f5b5928196 100644 --- a/ports/rhash/portfile.cmake +++ b/ports/rhash/portfile.cmake @@ -1,22 +1,21 @@ -set(RHASH_XVERSION 1.4.0) +set(RHASH_XVERSION 1.4.2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rhash/RHash - REF df0c969966b5da10f2db5060cf329790db95080e # v1.4.0 - SHA512 eebd5872f5d40d5ef5b7fe857ff3099c3b60e37cedaacf7ae8da63bd18790a16546de1809fa9f8e4fa7eef178121051b267fedd5d237135b80201f8609d613b6 + REF 02c8b1dbae01c8d56613b6a3034c3698f94a52be # v1.4.2 + SHA512 4c1d0a91a758ba85bc9ea194cf148834d6a0ebd849ed5384444798c522723ad78c3eedf65e7460fba61989a69b2c0f9a0f12bd6583381c544778c4b1c199a4ba HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/librhash) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/librhash") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/librhash - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/librhash" OPTIONS_DEBUG -DRHASH_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -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) diff --git a/ports/rhash/vcpkg.json b/ports/rhash/vcpkg.json index 252e0b0cf77a1e..47cfe74d7d7f1d 100644 --- a/ports/rhash/vcpkg.json +++ b/ports/rhash/vcpkg.json @@ -1,8 +1,14 @@ { "name": "rhash", - "version": "1.4.0", - "port-version": 2, + "version": "1.4.2", "description": "C library for computing a wide variety of hash sums", "homepage": "https://github.com/rhash/RHash", - "supports": "!uwp" + "license": "0BSD", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index cbddc5cb9d382a..c48d4cf06fc5fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6185,8 +6185,8 @@ "port-version": 0 }, "rhash": { - "baseline": "1.4.0", - "port-version": 2 + "baseline": "1.4.2", + "port-version": 0 }, "rhasheq": { "baseline": "0.0.1", diff --git a/versions/r-/rhash.json b/versions/r-/rhash.json index 5645f745819011..02940d03455326 100644 --- a/versions/r-/rhash.json +++ b/versions/r-/rhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "385025c1a8f84dfaf6035c2d730fb4ae0d8b16fd", + "version": "1.4.2", + "port-version": 0 + }, { "git-tree": "db6e2fc777b1ffb5257989484d303fc52e9b39f5", "version": "1.4.0", From 8d5311bf3c706f6bf2512b78ad8ba3adde4f5082 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 26 Apr 2022 08:15:03 +0800 Subject: [PATCH 103/383] [refl-cpp] update to 0.12.3 (#24374) * [refl-cpp] update to 0.12.3 * update version * add license * revert vcpkg.json --- ports/refl-cpp/portfile.cmake | 5 ++--- ports/refl-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/refl-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/refl-cpp/portfile.cmake b/ports/refl-cpp/portfile.cmake index ab90b3e5bf66cb..c6f83e865662f4 100644 --- a/ports/refl-cpp/portfile.cmake +++ b/ports/refl-cpp/portfile.cmake @@ -1,10 +1,9 @@ # header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO veselink1/refl-cpp - REF v0.12.2 - SHA512 a124f12f2a491b3f2ea74bcf3b8cd3e14f1a4aa5ede105edbed90c3329af7d7fffa5c7a287f2e1e6079d9f0fad34190887700ae20a7d15f00299526317b41137 + REF ce47c1355219f3b9af56ae91d997daf2b1555d97 v0.12.3 + SHA512 f73e542a9ee00d677e2445c148b732cbdf6247adc1f4f412ad8e9587c5971b3cb02b39b15cdb9b0788f53e9efea6c5a485367505ecb569a367be012f6246ea92 HEAD_REF master ) diff --git a/ports/refl-cpp/vcpkg.json b/ports/refl-cpp/vcpkg.json index 591cab09b38463..8cbcc31a5b1900 100644 --- a/ports/refl-cpp/vcpkg.json +++ b/ports/refl-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "refl-cpp", - "version": "0.12.2", + "version": "0.12.3", "description": "Static reflection for C++17 (compile-time enumeration, attributes, proxies, overloads, template functions, metaprogramming).", "homepage": "https://github.com/veselink1/refl-cpp" } diff --git a/versions/baseline.json b/versions/baseline.json index c48d4cf06fc5fb..f33c2fcac81de1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6141,7 +6141,7 @@ "port-version": 0 }, "refl-cpp": { - "baseline": "0.12.2", + "baseline": "0.12.3", "port-version": 0 }, "refprop-headers": { diff --git a/versions/r-/refl-cpp.json b/versions/r-/refl-cpp.json index 83d6be7ad9f308..2eb82df9d67fcb 100644 --- a/versions/r-/refl-cpp.json +++ b/versions/r-/refl-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7018b2c10e3c2e2be8dd774fb43d2f04fa520a02", + "version": "0.12.3", + "port-version": 0 + }, { "git-tree": "f5aea911f8cfd7c6eecadb50142f00205a2e7f57", "version": "0.12.2", From 7ee7648cb6ea31ead235323eca4e920dfcdd14f5 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 26 Apr 2022 08:15:24 +0800 Subject: [PATCH 104/383] [libusb] update to 1.0.26 (#24375) * [libusb] update to 1.0.26 * update version --- ports/libusb/portfile.cmake | 7 +++---- ports/libusb/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/libusb.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index d3a3c39c0ca9bb..34f6664dac8c91 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -1,14 +1,13 @@ - if(VCPKG_TARGET_IS_LINUX) message("${PORT} currently requires the following tools and libraries from the system package manager:\n autoreconf\n libudev\n\nThese can be installed on Ubuntu systems via apt-get install autoreconf libudev-dev") endif() -set(VERSION 1.0.24) +set(VERSION 1.0.26) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/libusb - REF c6a35c56016ea2ab2f19115d2ea1e85e0edae155 # v1.0.24 - SHA512 985c020d9ae6f7135e3bfee68dddcf70921481db3d10e420f55d5ee9534f7fe7be6a2a31ee73a3b282b649fcc36da4fed848e0bd0410c20eaf1deb9a8e3086e8 + REF 4239bc3a50014b8e6a5a2a59df1fff3b7469543b # v1.0.26 + SHA512 f07ec9ef4df555733dab9388595cd10bc87195da54f4c646478d4a0496ee7b8933de03e957c7466291c120102d8801e8b26846cb27b201bb9cbca5df03f3a6ef HEAD_REF master ) diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index 840ac16c209584..d89566f0cca22a 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,8 +1,8 @@ { "name": "libusb", - "version": "1.0.24", - "port-version": 7, + "version": "1.0.26", "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", + "license": "LGPL-2.1", "supports": "!uwp" } diff --git a/versions/baseline.json b/versions/baseline.json index f33c2fcac81de1..fa39794db3f13b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4121,8 +4121,8 @@ "port-version": 3 }, "libusb": { - "baseline": "1.0.24", - "port-version": 7 + "baseline": "1.0.26", + "port-version": 0 }, "libusb-win32": { "baseline": "1.2.6.0", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index a5a7bc304438ee..5496021afbd6e7 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67fc457e16066e047803888e45b8ea3aaf713501", + "version": "1.0.26", + "port-version": 0 + }, { "git-tree": "337aac12b9bf6aab68dd1375c3592f1575efbda9", "version": "1.0.24", From 47a587c0e1ccf074f84539f49f53773aeef72815 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 26 Apr 2022 08:15:43 +0800 Subject: [PATCH 105/383] [wt] update to 4.7.1 (#24376) * [wt] update to 4.7.1 * update version * add license * update version --- ports/wt/portfile.cmake | 4 ++-- ports/wt/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/w-/wt.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 9b8dd56241f0f7..a04cee499f6a81 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emweb/wt - REF bc76cbea5bb845c4d0fb642968eb1b278ddbb047 # 4.6.1 - SHA512 416baaaf89cdbe2e9cf234df44dc0b90493c995b52ca9840cb5a5acf2904fe7d81da178ac4e0bf06dcd44fbac74fa75fe570901dd8fd4987a1bec4aeb54baad6 + REF d0e9f2e8096a1acb4558130a851812dd424d8f3e # 4.7.1 + SHA512 ddda642e464a0c93017161404911cd8261e105971162171cd6aa0e4334e22b5f284a753e8b81a4f43c9269b14389abd28c61e2cdfe706b414808e82fc4bc1680 HEAD_REF master PATCHES 0002-link-glew.patch diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json index 727e7cd835f233..443486fe20ee93 100644 --- a/ports/wt/vcpkg.json +++ b/ports/wt/vcpkg.json @@ -1,8 +1,9 @@ { "name": "wt", - "version": "4.6.1", + "version": "4.7.1", "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", + "license": "GPL-2.0-only", "dependencies": [ "boost-algorithm", "boost-array", diff --git a/versions/baseline.json b/versions/baseline.json index fa39794db3f13b..2e7dec630795e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7505,7 +7505,7 @@ "port-version": 0 }, "wt": { - "baseline": "4.6.1", + "baseline": "4.7.1", "port-version": 0 }, "wtl": { diff --git a/versions/w-/wt.json b/versions/w-/wt.json index a965342635ea7f..88eaa5f941e355 100644 --- a/versions/w-/wt.json +++ b/versions/w-/wt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24546bcb3aa44c987d85536d39420e4159d4ad99", + "version": "4.7.1", + "port-version": 0 + }, { "git-tree": "0d5d5d96583b44370437e567f086173a2c0ad51e", "version": "4.6.1", From 810775e3671550a14013a496f41be337659a3e86 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 26 Apr 2022 02:17:07 +0200 Subject: [PATCH 106/383] [geos] Update, cleanup (#24382) * Update geos to 3.10.2 * Minor cleanup * Drop the legacy debug postfix All downstream ports in vcpkg use either CMake config or pkg-config. * Fix EXTRA_OPTIONS list handling * Update versions --- ports/geos/install-hpp-files.patch | 13 -------- ports/geos/portfile.cmake | 50 ++++++++++-------------------- ports/geos/vcpkg.json | 5 +-- versions/baseline.json | 2 +- versions/g-/geos.json | 5 +++ 5 files changed, 26 insertions(+), 49 deletions(-) delete mode 100644 ports/geos/install-hpp-files.patch diff --git a/ports/geos/install-hpp-files.patch b/ports/geos/install-hpp-files.patch deleted file mode 100644 index c5d4b21e79289e..00000000000000 --- a/ports/geos/install-hpp-files.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20c8907..accc1a2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -367,7 +367,7 @@ install(DIRECTORY - "${CMAKE_CURRENT_LIST_DIR}/include/geos" - "${CMAKE_CURRENT_BINARY_DIR}/include/geos" - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -- FILES_MATCHING PATTERN "*.h") -+ FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") - if(NOT DISABLE_GEOS_INLINE) - install(DIRECTORY - "${CMAKE_CURRENT_LIST_DIR}/include/geos" diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index 7be171ac2fcf90..6118fcf6263551 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -1,24 +1,22 @@ -set(GEOS_VERSION 3.10.0) +set(GEOS_VERSION 3.10.2) vcpkg_download_distfile(ARCHIVE URLS "https://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2" FILENAME "geos-${GEOS_VERSION}.tar.bz2" - SHA512 12657c6649bfbf6efa3232a054969c6229bb23fc16a7c72d6ca5fdb662e0d08e14bbcaa6944a17de8972b6c236608d94c870ead0b04fada2d2af3d42c238058e + SHA512 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF ${GEOS_VERSION} + REF "${GEOS_VERSION}" PATCHES disable-warning-4996.patch fix-exported-config.patch - install-hpp-files.patch ) +vcpkg_list(SET EXTRA_OPTIONS) if(VCPKG_TARGET_IS_MINGW) - set(_CMAKE_EXTRA_OPTIONS "-DDISABLE_GEOS_INLINE=ON") -else() - set(_CMAKE_EXTRA_OPTIONS "") + vcpkg_list(APPEND EXTRA_OPTIONS "-DDISABLE_GEOS_INLINE=ON") endif() vcpkg_cmake_configure( @@ -29,36 +27,23 @@ vcpkg_cmake_configure( -DBUILD_GEOSOP=OFF -DBUILD_TESTING=OFF -DBUILD_BENCHMARKS=OFF - ${_CMAKE_EXTRA_OPTIONS} - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d # Legacy decision, hard coded in depending ports + ${EXTRA_OPTIONS} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GEOS) vcpkg_fixup_pkgconfig() -function(geos_add_debug_postfix config_file) - file(READ "${config_file}" contents) - string(REGEX REPLACE "(-lgeos(_c)?)d?([^-_d])" "\\1d\\3" fixed_contents "${contents}") - file(WRITE "${config_file}" "${fixed_contents}") -endfunction() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config") - file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config" FILE_PERMISSIONS - OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - ) - endif() -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - geos_add_debug_postfix("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/geos.pc") - if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config") + file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config" FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + if(NOT VCPKG_BUILD_TYPE) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config") - geos_add_debug_postfix("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config") file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config" FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE @@ -72,8 +57,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -# Handle copyright -configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/geos/copyright" COPYONLY) - vcpkg_copy_pdbs() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json index 3a55c644241807..826736d01b5b4c 100644 --- a/ports/geos/vcpkg.json +++ b/ports/geos/vcpkg.json @@ -1,8 +1,9 @@ { "name": "geos", - "version": "3.10.0", + "version": "3.10.2", "description": "Geometry Engine Open Source", - "homepage": "https://www.osgeo.org/projects/geos/", + "homepage": "https://libgeos.org/", + "license": "LGPL-2.1-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 2e7dec630795e8..3c8f4b967bdb36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2457,7 +2457,7 @@ "port-version": 2 }, "geos": { - "baseline": "3.10.0", + "baseline": "3.10.2", "port-version": 0 }, "geotrans": { diff --git a/versions/g-/geos.json b/versions/g-/geos.json index 42cd134f5c40d6..0d975027a8672a 100644 --- a/versions/g-/geos.json +++ b/versions/g-/geos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa45b04832db59c6f6c4e92cf0f67b21afe41a48", + "version": "3.10.2", + "port-version": 0 + }, { "git-tree": "852bf7181cbec88161abfe3cf4db2887f80ab2d4", "version": "3.10.0", From 7891c9d910c666fab6426a3a2c303c8991d52e31 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 26 Apr 2022 02:22:27 +0200 Subject: [PATCH 107/383] [hash-library] Add new port (#24383) * Add hash-library 8 * Update CI baseline * Add patch for macOS * Update CI baseline * Allow shared builds on Linux/macOS * Update CI baseline * Address code review feedback * Update CI baseline Co-authored-by: chausner --- ports/hash-library/001-fix-macos.patch | 98 ++++++++++++++++++++++++++ ports/hash-library/CMakeLists.txt | 45 ++++++++++++ ports/hash-library/portfile.cmake | 26 +++++++ ports/hash-library/vcpkg.json | 17 +++++ versions/baseline.json | 4 ++ versions/h-/hash-library.json | 9 +++ 6 files changed, 199 insertions(+) create mode 100644 ports/hash-library/001-fix-macos.patch create mode 100644 ports/hash-library/CMakeLists.txt create mode 100644 ports/hash-library/portfile.cmake create mode 100644 ports/hash-library/vcpkg.json create mode 100644 versions/h-/hash-library.json diff --git a/ports/hash-library/001-fix-macos.patch b/ports/hash-library/001-fix-macos.patch new file mode 100644 index 00000000000000..60658e31651f7c --- /dev/null +++ b/ports/hash-library/001-fix-macos.patch @@ -0,0 +1,98 @@ +Fixes includes of endian.h on MacOS, see https://github.com/stbrumme/hash-library/pull/4. + +diff --git a/crc32.cpp b/crc32.cpp +--- a/crc32.cpp ++++ b/crc32.cpp +@@ -7,8 +7,10 @@ + #include "crc32.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/keccak.cpp b/keccak.cpp +--- a/keccak.cpp ++++ b/keccak.cpp +@@ -7,8 +7,10 @@ + #include "keccak.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/md5.cpp b/md5.cpp +--- a/md5.cpp ++++ b/md5.cpp +@@ -6,8 +6,10 @@ + + #include "md5.h" + +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/sha1.cpp b/sha1.cpp +--- a/sha1.cpp ++++ b/sha1.cpp +@@ -7,8 +7,10 @@ + #include "sha1.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/sha256.cpp b/sha256.cpp +--- a/sha256.cpp ++++ b/sha256.cpp +@@ -7,8 +7,10 @@ + #include "sha256.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/sha3.cpp b/sha3.cpp +--- a/sha3.cpp ++++ b/sha3.cpp +@@ -7,8 +7,10 @@ + #include "sha3.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + #include diff --git a/ports/hash-library/CMakeLists.txt b/ports/hash-library/CMakeLists.txt new file mode 100644 index 00000000000000..e6a22af2cfe6f2 --- /dev/null +++ b/ports/hash-library/CMakeLists.txt @@ -0,0 +1,45 @@ +cmake_minimum_required(VERSION 3.5.1) +project(hash-library CXX) + +set(HEADERS + crc32.h + hash.h + hmac.h + keccak.h + md5.h + sha1.h + sha256.h + sha3.h +) + +set(SRCS + crc32.cpp + keccak.cpp + md5.cpp + sha1.cpp + sha256.cpp + sha3.cpp +) + +add_library(hash-library ${SRCS}) + +target_include_directories(hash-library PUBLIC $ $) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include) +endif() + +install( + TARGETS hash-library + EXPORT unofficial-hash-library-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + EXPORT unofficial-hash-library-targets + FILE unofficial-hash-library-targets.cmake + NAMESPACE unofficial:: + DESTINATION share/unofficial-hash-library +) diff --git a/ports/hash-library/portfile.cmake b/ports/hash-library/portfile.cmake new file mode 100644 index 00000000000000..6d6ced51884be6 --- /dev/null +++ b/ports/hash-library/portfile.cmake @@ -0,0 +1,26 @@ +if(WIN32) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stbrumme/hash-library + REF hash_library_v8 + SHA512 1c428710c0c3e4d5d1114d757a5d9145ed12c7e2fbbfa51635f43a349ddb5634bdf49e8d8fdbc7576e90b319989fb85efec433bb43ddb551c2cf29a8e80ba78b + HEAD_REF master + PATCHES + 001-fix-macos.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}" CONFIG_PATH "share/unofficial-${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/hash-library/vcpkg.json b/ports/hash-library/vcpkg.json new file mode 100644 index 00000000000000..3f1cefaeb4fa63 --- /dev/null +++ b/ports/hash-library/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "hash-library", + "version": "8", + "description": "Portable C++ hashing library", + "homepage": "https://create.stephan-brumme.com/hash-library/", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 3c8f4b967bdb36..ffe5686e6cb82f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2724,6 +2724,10 @@ "baseline": "3.2.0", "port-version": 3 }, + "hash-library": { + "baseline": "8", + "port-version": 0 + }, "hayai": { "baseline": "2019-08-10", "port-version": 1 diff --git a/versions/h-/hash-library.json b/versions/h-/hash-library.json new file mode 100644 index 00000000000000..f791be9fa1ea6f --- /dev/null +++ b/versions/h-/hash-library.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c7e4fae9255d5bdacac11e7a7dc550df777b8b37", + "version": "8", + "port-version": 0 + } + ] +} From 5bea9618cee02002edadac40c54b0adfa3d6d5c3 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 26 Apr 2022 02:22:49 +0200 Subject: [PATCH 108/383] [cli11] Update to 2.2.0 (#24384) * Update cli11 to 2.2.0 * Update CI baseline Co-authored-by: chausner --- ports/cli11/portfile.cmake | 4 ++-- ports/cli11/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/c-/cli11.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index 5adfb86314db74..1e34f3e0c41051 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v2.1.2 - SHA512 3b21d015e046666d2e3df2b7cf1a6247c2daa26bf583e714dc1f0a94518785bf90993cd8530f88078b4daac02530dc517db0d5ad452d2a91521b3007f270ea55 + REF v2.2.0 + SHA512 ee8994c99dd8119e612be0339252b863d6db9d85a10c15a6e60e56c6f387bbefaf479679bc85aed2cb6539aeb82b3e7543673a5b97eb04b61793b6946582241d HEAD_REF main ) diff --git a/ports/cli11/vcpkg.json b/ports/cli11/vcpkg.json index cb780687a6f980..339a2931ae56bd 100644 --- a/ports/cli11/vcpkg.json +++ b/ports/cli11/vcpkg.json @@ -1,9 +1,9 @@ { "name": "cli11", - "version": "2.1.2", - "port-version": 1, + "version": "2.2.0", "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.", "homepage": "https://github.com/CLIUtils/CLI11", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index ffe5686e6cb82f..5af413b378dc92 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1413,8 +1413,8 @@ "port-version": 0 }, "cli11": { - "baseline": "2.1.2", - "port-version": 1 + "baseline": "2.2.0", + "port-version": 0 }, "clickhouse-cpp": { "baseline": "1.5.0", diff --git a/versions/c-/cli11.json b/versions/c-/cli11.json index 37e4f6597d5a10..43e9aaac1a001c 100644 --- a/versions/c-/cli11.json +++ b/versions/c-/cli11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25d9ba9e7e80ff980fef1b9bf369d51f5b1cfc59", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "a2fa0d3108042d872a50565d15c79d5611bdf0b6", "version": "2.1.2", From 8afec807687d81eb34f57656c2b877300517b229 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 26 Apr 2022 02:23:16 +0200 Subject: [PATCH 109/383] [bext-sml] Update to 1.1.5 (#24386) * Update bext-sml to 1.1.5 * Update CI baseline Co-authored-by: chausner --- ports/bext-sml/portfile.cmake | 4 ++-- ports/bext-sml/vcpkg.json | 5 +++-- versions/b-/bext-sml.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/bext-sml/portfile.cmake b/ports/bext-sml/portfile.cmake index 75d8f36aa98f37..3701e1616f1cd3 100644 --- a/ports/bext-sml/portfile.cmake +++ b/ports/bext-sml/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boost-ext/sml - REF v1.1.4 - SHA512 0ded162e5d9d7cc9d8769fd9131d7a5cfc98187c8e9d98393eda9e0804c282e510707de38fe7229d2fe16aea70c9a8e300f14e992fff3ddedd0fa1b6a66ab1ba + REF v1.1.5 + SHA512 6babee6da2db93912afa2eb932591674a73f43609b7c2b0523e84ba682c09f6d4f67d1c7f6ea48f73f1f09de8df2eaf2ae30b3399c1602189ea08d42689758d7 HEAD_REF master ) diff --git a/ports/bext-sml/vcpkg.json b/ports/bext-sml/vcpkg.json index 774e04321a704f..5b04bc3fc66e9c 100644 --- a/ports/bext-sml/vcpkg.json +++ b/ports/bext-sml/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bext-sml", - "version": "1.1.4", + "version": "1.1.5", "description": "Your scalable C++14 one header only State Machine Library with no dependencies", - "homepage": "https://github.com/boost-ext/sml" + "homepage": "https://github.com/boost-ext/sml", + "license": "BSL-1.0" } diff --git a/versions/b-/bext-sml.json b/versions/b-/bext-sml.json index 56b065fc341dda..0f6fd7284671e9 100644 --- a/versions/b-/bext-sml.json +++ b/versions/b-/bext-sml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "607e0e94d37ca023fd393c42e8acb43881ea8025", + "version": "1.1.5", + "port-version": 0 + }, { "git-tree": "5e5941cb1ecd7988a9f52c1ace73823a4a20743c", "version": "1.1.4", diff --git a/versions/baseline.json b/versions/baseline.json index 5af413b378dc92..e6f02f371ce147 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -437,7 +437,7 @@ "port-version": 1 }, "bext-sml": { - "baseline": "1.1.4", + "baseline": "1.1.5", "port-version": 0 }, "bext-ut": { From 00e6aa726b3f306cf6d3486ac170b96b5eea4e0e Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 26 Apr 2022 02:23:39 +0200 Subject: [PATCH 110/383] [ctre] Update to 3.6.0 (#24388) * Update ctre to 3.6.0 * Update CI baseline Co-authored-by: chausner --- ports/ctre/portfile.cmake | 4 ++-- ports/ctre/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/ctre.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/ctre/portfile.cmake b/ports/ctre/portfile.cmake index 112ad13d5c8126..b1f209399be120 100644 --- a/ports/ctre/portfile.cmake +++ b/ports/ctre/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hanickadot/compile-time-regular-expressions - REF v3.4.1 - SHA512 a7b44df9c30fb46373e34d8b98fe3ef3fd0486d33ba4d7bbf58a29eef05b22b8c903bf79ae539008a564f46e0bdee3e7700819d8d072c00537f8d175af59be3e + REF v3.6 + SHA512 ad39da95cafa0198a14362492c083541dfe9beafae9adfdfc5ec5adc9bba7395553abd9799b414493c962c3dd25a79af8c7cc9b7af35392049e2ab9f8b679362 HEAD_REF main ) diff --git a/ports/ctre/vcpkg.json b/ports/ctre/vcpkg.json index 724d2c9b167fa5..490a91f21915ff 100644 --- a/ports/ctre/vcpkg.json +++ b/ports/ctre/vcpkg.json @@ -1,8 +1,9 @@ { "name": "ctre", - "version-semver": "3.4.1", + "version-semver": "3.6.0", "description": "A Compile time PCRE (almost) compatible regular expression matcher", "homepage": "https://github.com/hanickadot/compile-time-regular-expressions", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index e6f02f371ce147..a7a7a5feb19380 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1717,7 +1717,7 @@ "port-version": 2 }, "ctre": { - "baseline": "3.4.1", + "baseline": "3.6.0", "port-version": 0 }, "cub": { diff --git a/versions/c-/ctre.json b/versions/c-/ctre.json index a5f5f91604aee6..185d72384d12f1 100644 --- a/versions/c-/ctre.json +++ b/versions/c-/ctre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b8b42356b574541c92ad5509ced7b325361f8b8", + "version-semver": "3.6.0", + "port-version": 0 + }, { "git-tree": "fd57f6d1ec68aaa67e90f3382cce5668c5ecff5a", "version-semver": "3.4.1", From 2baa492fa939cdd28559db4da41b681e6d0f2c27 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 26 Apr 2022 02:24:20 +0200 Subject: [PATCH 111/383] [effolkronium-random] Update to 1.4.1 (#24389) * Update effolkronium-random to 1.4.1 * Update CI baseline Co-authored-by: chausner --- ports/effolkronium-random/portfile.cmake | 4 ++-- ports/effolkronium-random/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/e-/effolkronium-random.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/effolkronium-random/portfile.cmake b/ports/effolkronium-random/portfile.cmake index 0afcc104360ecc..3acd390fb36ab7 100644 --- a/ports/effolkronium-random/portfile.cmake +++ b/ports/effolkronium-random/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO effolkronium/random - REF v1.4.0 - SHA512 B3DDEC048BBFB48877FD12295D4E0492E25976E1C4FE66F13E9E6E611DAAF654BD8D4AE75EA75125CB5AB420B82472C1CC1AB0BED3AEF632911B0934B45B23AF + REF v1.4.1 + SHA512 215fd34ea3a99c955a1fcd70d6c317e3829b3c562c737d22be1371213b3e14346b2f61fc76afbbcc55e26b4fdf630fa428b8bc34104170cbfc4afebcf24d160b HEAD_REF master ) diff --git a/ports/effolkronium-random/vcpkg.json b/ports/effolkronium-random/vcpkg.json index 2e7502540c7466..9c4be3d55b80a0 100644 --- a/ports/effolkronium-random/vcpkg.json +++ b/ports/effolkronium-random/vcpkg.json @@ -1,9 +1,9 @@ { "name": "effolkronium-random", - "version": "1.4.0", - "port-version": 1, + "version": "1.4.1", "description": "Random with a modern C++ API", "homepage": "https://github.com/effolkronium/random", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index a7a7a5feb19380..bc2096849360c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2033,8 +2033,8 @@ "port-version": 2 }, "effolkronium-random": { - "baseline": "1.4.0", - "port-version": 1 + "baseline": "1.4.1", + "port-version": 0 }, "efsw": { "baseline": "2020-06-08", diff --git a/versions/e-/effolkronium-random.json b/versions/e-/effolkronium-random.json index c2d4671aea46e4..fd709ffc27309e 100644 --- a/versions/e-/effolkronium-random.json +++ b/versions/e-/effolkronium-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ffd6600668e6304e7e60f9ef447855efc89a0a0", + "version": "1.4.1", + "port-version": 0 + }, { "git-tree": "0083b3439b06f6c6e2b5fbd48260cd5b54692bad", "version": "1.4.0", From 9d642bd84fc2a6e5d69e5f6845de03a8c6b123fd Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 26 Apr 2022 02:25:05 +0200 Subject: [PATCH 112/383] [iir1] Update to 1.9.1 (#24390) * Update iir1 to 1.9.1 * Update CI baseline * Only either build as shared or static * Update CI baseline Co-authored-by: chausner --- ports/iir1/fix-shared-static.patch | 42 ++++++++++++++++++++++++++++++ ports/iir1/portfile.cmake | 8 ++++-- ports/iir1/vcpkg.json | 3 +-- versions/baseline.json | 4 +-- versions/i-/iir1.json | 5 ++++ 5 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 ports/iir1/fix-shared-static.patch diff --git a/ports/iir1/fix-shared-static.patch b/ports/iir1/fix-shared-static.patch new file mode 100644 index 00000000000000..cfa29a122eab8a --- /dev/null +++ b/ports/iir1/fix-shared-static.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,9 +12,11 @@ cmake_policy(SET CMP0048 NEW) # set VERSION in project() + cmake_policy(SET CMP0042 NEW) # enable MACOSX_RPATH by default + + include(GNUInstallDirs) ++if(BUILD_TESTING) + add_subdirectory(test) + add_subdirectory(demo) + enable_testing () ++endif() + + if (MSVC) + add_compile_options(/W4) +@@ -47,6 +49,8 @@ set(LIBINCLUDE + iir/State.h + iir/Types.h) + ++if(BUILD_SHARED_LIBS) ++ + add_library(iir SHARED ${LIBSRC}) + add_library(iir::iir ALIAS iir) + +@@ -73,6 +77,8 @@ install(TARGETS iir EXPORT iir-targets + + configure_file(iir.pc.in iir.pc @ONLY) + ++else(BUILD_SHARED_LIBS) ++ + add_library(iir_static STATIC ${LIBSRC}) + add_library(iir::iir_static ALIAS iir_static) + +@@ -97,6 +103,8 @@ install(TARGETS iir_static EXPORT iir-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iir) + ++endif(BUILD_SHARED_LIBS) ++ + install(EXPORT iir-targets + DESTINATION lib/cmake/iir + NAMESPACE iir:: diff --git a/ports/iir1/portfile.cmake b/ports/iir1/portfile.cmake index 41dbf465fafeaf..0a4d87c2b65a15 100644 --- a/ports/iir1/portfile.cmake +++ b/ports/iir1/portfile.cmake @@ -1,13 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO berndporr/iir1 - REF 1.9.0 - SHA512 9dced1610fbbfd7194874e984f969880dc76df3562df575c07d022b9ac96c67334b542acea395531423dfb5b8d692b14abdaff0235f048ab6ca7221bfc57fdba + REF 1.9.1 + SHA512 115692fb82637d21c2cbff974d931ef12a5c7fd8502560e2b807ceed69b1a6a4e05898aff37b089ccda7c4aa32e97e71f7e6007998ec52f6122da33eb222112e HEAD_REF master + PATCHES + fix-shared-static.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/iir1/vcpkg.json b/ports/iir1/vcpkg.json index 92b672b1ead642..781d68b2d0a19d 100644 --- a/ports/iir1/vcpkg.json +++ b/ports/iir1/vcpkg.json @@ -1,7 +1,6 @@ { "name": "iir1", - "version": "1.9.0", - "port-version": 1, + "version": "1.9.1", "description": "Realtime C++ filter library", "homepage": "https://github.com/berndporr/iir1", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index bc2096849360c8..eb76cfe40c3ee2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2901,8 +2901,8 @@ "port-version": 1 }, "iir1": { - "baseline": "1.9.0", - "port-version": 1 + "baseline": "1.9.1", + "port-version": 0 }, "ijg-libjpeg": { "baseline": "9d", diff --git a/versions/i-/iir1.json b/versions/i-/iir1.json index 9bd18e4ea184e8..3d176ff4dc4929 100644 --- a/versions/i-/iir1.json +++ b/versions/i-/iir1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b684559e0b19d393deae83fdf6e2182937942a76", + "version": "1.9.1", + "port-version": 0 + }, { "git-tree": "393a498a50400c062dafdefbbbdbd3d1c3daef4a", "version": "1.9.0", From f368d0dfaabbdac7b87467c0b83abdab359f4001 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 26 Apr 2022 02:25:42 +0200 Subject: [PATCH 113/383] [yyjson] Update to 0.4.0 (#24392) * Update yyjson to 0.4.0 * Update CI baseline Co-authored-by: chausner --- ports/yyjson/portfile.cmake | 17 +++++++++++++---- ports/yyjson/vcpkg.json | 24 ++++++++++++++++++++++-- versions/baseline.json | 2 +- versions/y-/yyjson.json | 5 +++++ 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/ports/yyjson/portfile.cmake b/ports/yyjson/portfile.cmake index a4c8ffa07fe3e2..f2ffc85a1b248c 100644 --- a/ports/yyjson/portfile.cmake +++ b/ports/yyjson/portfile.cmake @@ -1,14 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ibireme/yyjson - REF 1f7dc19c7664dc1aed74045e3b6f316ccd271442 # 0.3.0 - SHA512 fa44dc86d2e7d4a1a178d01085d707b266c2bc32a5bf372a68b74d149b099d346f72dea5865fc1ba37a0c1525d3ac90a38df404d9008bca4577825a603524a91 + REF 0.4.0 + SHA512 0d5824158f7491926e6d2a1fd1a1e637fdb2ce5a6bd1ec88301231dd567345295751c1e8f12f8a1ffc7179970081cf50b97301691a47ae5d418331f0d41479ce HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + reader YYJSON_DISABLE_READER + writer YYJSON_DISABLE_WRITER + fast-fp-conv YYJSON_DISABLE_FAST_FP_CONV + non-standard YYJSON_DISABLE_NON_STANDARD +) + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DYYJSON_BUILD_TESTS=OFF -DYYJSON_BUILD_MISC=OFF ) @@ -21,4 +30,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/yyjson/vcpkg.json b/ports/yyjson/vcpkg.json index cd5cc93f100bb6..021e711ace1126 100644 --- a/ports/yyjson/vcpkg.json +++ b/ports/yyjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yyjson", - "version": "0.3.0", + "version": "0.4.0", "description": "A high performance JSON library written in ANSI C", "homepage": "https://github.com/ibireme/yyjson", "license": "MIT", @@ -13,5 +13,25 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "fast-fp-conv", + "non-standard", + "reader", + "writer" + ], + "features": { + "fast-fp-conv": { + "description": "Build with custom floating-point number conversion" + }, + "non-standard": { + "description": "Build with support for non-standard JSON" + }, + "reader": { + "description": "Build with JSON reader" + }, + "writer": { + "description": "Build with JSON writer" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index eb76cfe40c3ee2..ea3001bf296d4c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7661,7 +7661,7 @@ "port-version": 0 }, "yyjson": { - "baseline": "0.3.0", + "baseline": "0.4.0", "port-version": 0 }, "z3": { diff --git a/versions/y-/yyjson.json b/versions/y-/yyjson.json index cba93435dddc65..d244ce01444522 100644 --- a/versions/y-/yyjson.json +++ b/versions/y-/yyjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d4f6a2936ab89c986bb1c3cafd5e3ca796ce7fa", + "version": "0.4.0", + "port-version": 0 + }, { "git-tree": "ced4d99c46f8c50e8c8df046af0fe54cce4a0dbb", "version": "0.3.0", From b360be766609eb22a2c25a1912a6ee016883060a Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 26 Apr 2022 02:26:05 +0200 Subject: [PATCH 114/383] [toml11] Update to 3.7.1 (#24393) * Update toml11 to 3.7.1 * Update CI baseline Co-authored-by: chausner --- ports/toml11/portfile.cmake | 6 +++--- ports/toml11/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/t-/toml11.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/toml11/portfile.cmake b/ports/toml11/portfile.cmake index 3e5729bc78b62a..fe37147cc6a803 100644 --- a/ports/toml11/portfile.cmake +++ b/ports/toml11/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ToruNiina/toml11 - REF v3.7.0 - SHA512 093833ea4354ab91f54c0a346e51d38e297b8c347241f679c023e65fe580edca7852d934a0a0d371524426f61e58ee3a9638061b1230cd72be7ff55fcf12370c + REF v3.7.1 + SHA512 a4710972ab9b1ff836b2191243d628e0c4672fbfe95ede50c49796aaa75bb05d3ac71164102651d5c7342a4ac88781dfe417957b8b8ce373989f627231966550 HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dtoml11_BUILD_TEST=OFF ) diff --git a/ports/toml11/vcpkg.json b/ports/toml11/vcpkg.json index de82e84e0dd77f..b94992dd93268c 100644 --- a/ports/toml11/vcpkg.json +++ b/ports/toml11/vcpkg.json @@ -1,8 +1,9 @@ { "name": "toml11", - "version": "3.7.0", + "version": "3.7.1", "description": "A C++11 header-only toml parser/encoder depending only on C++ standard library.", "homepage": "https://github.com/ToruNiina/toml11", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index ea3001bf296d4c..5841a62038aa1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7077,7 +7077,7 @@ "port-version": 6 }, "toml11": { - "baseline": "3.7.0", + "baseline": "3.7.1", "port-version": 0 }, "tomlplusplus": { diff --git a/versions/t-/toml11.json b/versions/t-/toml11.json index 6012bfd5188c70..5a4ae69e546842 100644 --- a/versions/t-/toml11.json +++ b/versions/t-/toml11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "978b00b8d4801b25272df9c650958ce7112e3f45", + "version": "3.7.1", + "port-version": 0 + }, { "git-tree": "ab8e69aef0551e2e862e74ec70b5c2dd58aac36b", "version": "3.7.0", From 94c728df6b4c1c186e2ba58952f48ac744f4ef3b Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 26 Apr 2022 08:28:30 +0800 Subject: [PATCH 115/383] update ijg-libjpeg to 9e (#24395) --- ports/ijg-libjpeg/CMakeLists.txt | 6 ++++-- ports/ijg-libjpeg/portfile.cmake | 27 +++++++++++++-------------- ports/ijg-libjpeg/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 2 +- versions/i-/ijg-libjpeg.json | 5 +++++ 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/ports/ijg-libjpeg/CMakeLists.txt b/ports/ijg-libjpeg/CMakeLists.txt index e1a9dcf5cac521..b65477d9c4089b 100644 --- a/ports/ijg-libjpeg/CMakeLists.txt +++ b/ports/ijg-libjpeg/CMakeLists.txt @@ -12,9 +12,9 @@ option(BUILD_EXECUTABLES OFF) include(CheckIncludeFile) check_include_file(stddef.h HAVE_STDDEF_H) check_include_file(stdlib.h HAVE_STDLIB_H) -configure_file(jconfig.txt ${CMAKE_CURRENT_SOURCE_DIR}/jconfig.h) +configure_file(jconfig.txt ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h) -list(APPEND PUBLIC_HEADERS jpeglib.h jerror.h jmorecfg.h jconfig.h) +list(APPEND PUBLIC_HEADERS jpeglib.h jerror.h jmorecfg.h ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h) add_library(jpeg ${PUBLIC_HEADERS} jinclude.h jpegint.h jversion.h @@ -35,6 +35,8 @@ if(WIN32) ) endif() +target_include_directories(jpeg PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}) + install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include ) diff --git a/ports/ijg-libjpeg/portfile.cmake b/ports/ijg-libjpeg/portfile.cmake index 5c0055440e4aff..f9771764e6db37 100644 --- a/ports/ijg-libjpeg/portfile.cmake +++ b/ports/ijg-libjpeg/portfile.cmake @@ -10,9 +10,9 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_download_distfile(ARCHIVE - URLS "http://www.ijg.org/files/jpegsr9d.zip" - FILENAME "jpegsr9d.zip" - SHA512 441a783c945fd549693dbe3932d8d35e1ea00d8464870646760ed84a636facb4d7afe0ca3ab988e7281a71e41c2e96be618b8c6a898f116517e639720bba82a3 + URLS "http://www.ijg.org/files/jpegsr9e.zip" + FILENAME "jpegsr9e.zip" + SHA512 db7a2fb44e5cc20d61956c46334948af034c07cdcc0d6e41d9bd4f6611c0fbed8943d0a05029ba1bfb9d993f4acd0df5e95d0bc1cfb5a889b86a55b6b75fdf64 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH @@ -21,31 +21,30 @@ vcpkg_extract_source_archive_ex( # Replace some #define in jconfig.txt to #cmakedefine so the CMakeLists.txt can run `configure_file` command. # See https://github.com/LuaDist/libjpeg -vcpkg_replace_string(${SOURCE_PATH}/jconfig.txt +vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt" "#define HAVE_STDDEF_H" "#cmakedefine HAVE_STDDEF_H" ) -vcpkg_replace_string(${SOURCE_PATH}/jconfig.txt +vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt" "#define HAVE_STDLIB_H" "#cmakedefine HAVE_STDLIB_H" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXECUTABLES=OFF # supports [tools] feature to enable this option? ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # There is no LICENSE file, but README containes some legal text. -file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/ijg-libjpeg/vcpkg.json b/ports/ijg-libjpeg/vcpkg.json index cf39b27f2359fd..7c4d96429ce796 100644 --- a/ports/ijg-libjpeg/vcpkg.json +++ b/ports/ijg-libjpeg/vcpkg.json @@ -1,7 +1,18 @@ { "name": "ijg-libjpeg", - "version-string": "9d", + "version-string": "9e", "description": "Independent JPEG Group's JPEG software", "homepage": "http://www.ijg.org/", - "supports": "!emscripten & !wasm32" + "license": null, + "supports": "!emscripten & !wasm32", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5841a62038aa1d..183e3bb17f8f3d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2905,7 +2905,7 @@ "port-version": 0 }, "ijg-libjpeg": { - "baseline": "9d", + "baseline": "9e", "port-version": 0 }, "ilmbase": { diff --git a/versions/i-/ijg-libjpeg.json b/versions/i-/ijg-libjpeg.json index d6ce80d4420ac3..ab35bd7326afc5 100644 --- a/versions/i-/ijg-libjpeg.json +++ b/versions/i-/ijg-libjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb37d14790c59df2657d83e21009faa54643f19d", + "version-string": "9e", + "port-version": 0 + }, { "git-tree": "320dc4cbe69f8dea86bce50c1445f51f780de1a3", "version-string": "9d", From 9f643818c120f13fcbbb024b92ff74a6688a45e3 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 26 Apr 2022 11:09:27 -0700 Subject: [PATCH 116/383] [libvpx] update to 1.11.0 (#24372) * [libvpx] update to 1.11.0 * update version * update license * update version --- ports/libvpx/portfile.cmake | 4 ++-- ports/libvpx/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/libvpx.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 10ce04878d14f4..ac17dbbfa2f896 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(LIBVPX_VERSION 1.10.0) +set(LIBVPX_VERSION 1.11.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libvpx REF v${LIBVPX_VERSION} - SHA512 f88c588145b5164e98531b75215e119056cd806a9dbe6599bb9dab35c0af0ecd4b3daabee7d795e412a58aeb543d5c7dc0107457c4bd8f4d434e966e8e22a32d + SHA512 7aa5d30afa956dccda60917fd82f6f9992944ca893437c8cd53a04d1b7a94e0210431954aa136594dc400340123cc166dcc855753e493c8d929667f4c42b65a5 HEAD_REF master PATCHES 0002-Fix-nasm-debug-format-flag.patch diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index c002bdddff5235..321571a287b6cf 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libvpx", - "version-semver": "1.10.0", - "port-version": 2, + "version": "1.11.0", "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx", + "license": "BSD-3-Clause", "features": { "highbitdepth": { "description": "use VP9 high bit depth (10/12) profiles" diff --git a/versions/baseline.json b/versions/baseline.json index 183e3bb17f8f3d..0e2b7e764e2124 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4157,8 +4157,8 @@ "port-version": 2 }, "libvpx": { - "baseline": "1.10.0", - "port-version": 2 + "baseline": "1.11.0", + "port-version": 0 }, "libwandio": { "baseline": "4.2.1", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index 68e6537962276b..03cd212ec3ed26 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ec8aec9ecbcb2e3b5a0af7cea8045359d9aec94", + "version": "1.11.0", + "port-version": 0 + }, { "git-tree": "79a7e2cf4e6df063990dc59d1aa221150eb0ce0e", "version-semver": "1.10.0", From 22e4b9e235782b626ac28b826ed394784db0194c Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 27 Apr 2022 09:48:48 +0800 Subject: [PATCH 117/383] [libdatachannel] update to 0.17.1 (#24294) * [libdatachannel] update to 0.17.1 * update version * Revert patch format * update version * disenble test * update version * add option * update version --- ports/libdatachannel/0001-fix-for-vcpkg.patch | 24 ++++--------------- ports/libdatachannel/portfile.cmake | 5 ++-- ports/libdatachannel/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/libdatachannel.json | 5 ++++ 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/ports/libdatachannel/0001-fix-for-vcpkg.patch b/ports/libdatachannel/0001-fix-for-vcpkg.patch index 9c8e45f2f161c3..944f4339c70bb7 100644 --- a/ports/libdatachannel/0001-fix-for-vcpkg.patch +++ b/ports/libdatachannel/0001-fix-for-vcpkg.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c0e59d1..1d71e38 100644 +index 8907872..31d8836 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,6 @@ endif() + list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) -set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static if(WIN32) add_definitions(-DWIN32_LEAN_AND_MEAN) -@@ -197,12 +196,13 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +@@ -201,12 +200,13 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads REQUIRED) @@ -26,7 +26,7 @@ index c0e59d1..1d71e38 100644 option(sctp_build_programs 0) option(sctp_build_shared_lib 0) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) -@@ -214,8 +214,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") +@@ -218,8 +218,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) endif() add_library(Usrsctp::Usrsctp ALIAS usrsctp) @@ -37,7 +37,7 @@ index c0e59d1..1d71e38 100644 ${LIBDATACHANNEL_SOURCES} ${LIBDATACHANNEL_HEADERS} ${LIBDATACHANNEL_IMPL_SOURCES} -@@ -239,16 +240,18 @@ target_include_directories(datachannel PUBLIC +@@ -243,16 +244,18 @@ target_include_directories(datachannel PUBLIC $) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) @@ -58,18 +58,4 @@ index c0e59d1..1d71e38 100644 if(WIN32) target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 -@@ -351,11 +354,11 @@ else() - target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) - target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) - else() -- add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) -+ find_package(LibJuice CONFIG REQUIRED) - target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=0) - target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=0) -- target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic) -- target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic) -+ target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) -+ target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) - endif() - endif() diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index b41e17cc50d0f9..97eb6211881372 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF 127f157fc00abeb6fe5a57ce56a7c4e092721203 #v0.16.4 - SHA512 ef7d1f652af031c13260a4c436c949eb566d40d15dcde5b56ab782e9e9d7b5e287f4a6a61bc4eb3fcdbb835c102637b0368f3c43af6f9fa9c87cd99d15bde454 + REF d9a9a4dcfb7445ed4f305c9aba889a162a4bad30 #v0.17.1 + SHA512 1b53f52e24ee4e01b2bd1d65c7d738e621f168b7718c1fe16e514c34e7bccc3d195c193a7363f31c6b651c7c6757260dce4b197111375800d2f6bdf0d5b06100 HEAD_REF master PATCHES ${PATCHES} @@ -27,6 +27,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DUSE_SYSTEM_SRTP=ON + -DUSE_SYSTEM_JUICE=ON -DNO_EXAMPLES=ON -DNO_TESTS=ON ) diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 3f67b93a43188b..2cff3e4c5f6e33 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libdatachannel", - "version-semver": "0.16.4", - "port-version": 1, + "version-semver": "0.17.1", "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", + "license": "LGPL-2.1-only", "dependencies": [ "libjuice", "openssl", diff --git a/versions/baseline.json b/versions/baseline.json index 0e2b7e764e2124..54851eb577b990 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3481,8 +3481,8 @@ "port-version": 0 }, "libdatachannel": { - "baseline": "0.16.4", - "port-version": 1 + "baseline": "0.17.1", + "port-version": 0 }, "libdatrie": { "baseline": "0.2.13", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 17279c4e6fd022..cf467c701c12e4 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9692159a4275af713e1525a9c81447fdd614869a", + "version-semver": "0.17.1", + "port-version": 0 + }, { "git-tree": "61f3e1e569991d144cb32b0f21c2b1e3baab78a2", "version-semver": "0.16.4", From 9785d90511a961fc806f08172b0029f80ed1306b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 27 Apr 2022 04:23:08 +0200 Subject: [PATCH 118/383] [quill] Update to 1.7.2 (#24419) * [quill] Update to 1.7.2 * [quill] Update version files --- ports/quill/portfile.cmake | 4 ++-- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 3c718d12fa04f7..350238e9f535cd 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill - REF v1.7.1 - SHA512 93f8bd4b28f7568562b71abdfba89ca7f43133e6ebf6f80a46f2af81a88ec621420432c6e90a3dbd85944cecca57ec94e5bd25d896b0ffe9888f19ae4534f2f7 + REF v1.7.2 + SHA512 ea9671cab8a4cf641c413933bd7fb4f3b1f823ca1b17260b3217b13aff22513b4939ff722d74beada1730d47dca70858835733418593ed2df8abf5c1dea0b202 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 83425ec22cbd04..cd09019590cf91 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "1.7.1", + "version": "1.7.2", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 54851eb577b990..7f6129c8566c05 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6029,7 +6029,7 @@ "port-version": 7 }, "quill": { - "baseline": "1.7.1", + "baseline": "1.7.2", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index d606b03a604e28..1952d82010d96f 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d663be1266a5e973411f7bf422d3b901609098e8", + "version": "1.7.2", + "port-version": 0 + }, { "git-tree": "bfe7d0bbdf62856534c0d3783135b2bca1fea312", "version": "1.7.1", From 6cb4f0cc879dc83eb1194f5647e89ba30ccad30a Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 26 Apr 2022 19:23:30 -0700 Subject: [PATCH 119/383] [cppgraphqlgen] Update to v4.2.0 (#24412) * [cppgraphqlgen] Update to v4.2.0 * Run vcpkg x-add-version --all --- ports/cppgraphqlgen/portfile.cmake | 4 ++-- ports/cppgraphqlgen/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cppgraphqlgen.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index e9fbd00335f9da..66a0b0190f65e9 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cppgraphqlgen - REF v4.1.1 - SHA512 20987f03719558cec2fac8aee5a94e59c5e833a318361aef802f39bc369af141fef0c7f2d3bb35324d44d289843564c2f7e890419f871bfd8e5d7d5de53b363e + REF v4.2.0 + SHA512 81dd9d81c7f05470b2bfd106e75b54aa79ae15085b43daab68b4ce4784c5b1885e5eb342e4c29c3131e79d566627b7cf46901311c51c18334b440f4744c44142 HEAD_REF main ) diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json index 6bed1ba31124be..d19e8d7f19f9ae 100644 --- a/ports/cppgraphqlgen/vcpkg.json +++ b/ports/cppgraphqlgen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppgraphqlgen", - "version-semver": "4.1.1", + "version-semver": "4.2.0", "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7f6129c8566c05..e21e94e903c192 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1605,7 +1605,7 @@ "port-version": 1 }, "cppgraphqlgen": { - "baseline": "4.1.1", + "baseline": "4.2.0", "port-version": 0 }, "cppitertools": { diff --git a/versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json index fff6678603f6fe..42beb76497077c 100644 --- a/versions/c-/cppgraphqlgen.json +++ b/versions/c-/cppgraphqlgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8d2246a2df1d89e380901d0027220ca7a91531d", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "95b14163e5e6caf3ae1795167c8ea9503c7a8153", "version-semver": "4.1.1", From 1f00c0f42f1241abdb09799224b7b855af6c0861 Mon Sep 17 00:00:00 2001 From: jimmyhu <5549662+Jimmy-Hu@users.noreply.github.com> Date: Wed, 27 Apr 2022 10:23:52 +0800 Subject: [PATCH 120/383] [jansson] Update to 2.14 (#24411) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [jansson] Update to 2.14 [jansson] Update to 2.14 * [jansson] Update portfile.cmake [jansson] Update portfile.cmake * Update jansson.json Update jansson.json * Update jansson.json Update jansson.json * Update baseline.json Update baseline.json * Update ports/jansson/vcpkg.json Co-authored-by: Billy O'Neal * Update versions/j-/jansson.json * Update versions/j-/jansson.json * Update ports/jansson/vcpkg.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update versions/j-/jansson.json * Update versions/baseline.json Co-authored-by: Billy O'Neal Co-authored-by: JackĀ·BoosĀ·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- ports/jansson/portfile.cmake | 4 ++-- ports/jansson/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/j-/jansson.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake index 7d9679ffa0f4a6..80e6a8bb18e3af 100644 --- a/ports/jansson/portfile.cmake +++ b/ports/jansson/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO akheron/jansson - REF e9ebfa7e77a6bee77df44e096b100e7131044059 # v2.13.1 - SHA512 88a59c1cf5150699def17c86192ca9bacdfe6669319f770c3fbf14fa8edc48b4bb015a4a634a09db40fba9054320ac7c133c4d156f813af540a636f7825f0610 + REF 684e18c927e89615c2d501737e90018f4930d6c5 # v2.14 + SHA512 e2cac3567bc860d10d9aa386ce370876cb21ff083a970abeb48112b6586b91cd101694a98cb05a06795fb04498e6bc2df3615fedb86635f5a998b68e5670e5b3 HEAD_REF master ) diff --git a/ports/jansson/vcpkg.json b/ports/jansson/vcpkg.json index defd7c351629ae..244dffa2e60df1 100644 --- a/ports/jansson/vcpkg.json +++ b/ports/jansson/vcpkg.json @@ -1,7 +1,6 @@ { "name": "jansson", - "version-string": "2.13.1", - "port-version": 2, + "version": "2.14", "description": "Jansson is a C library for encoding, decoding and manipulating JSON data", "homepage": "https://github.com/akheron/jansson" } diff --git a/versions/baseline.json b/versions/baseline.json index e21e94e903c192..9bd84904787ed5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3013,8 +3013,8 @@ "port-version": 1 }, "jansson": { - "baseline": "2.13.1", - "port-version": 2 + "baseline": "2.14", + "port-version": 0 }, "jasper": { "baseline": "2.0.33", diff --git a/versions/j-/jansson.json b/versions/j-/jansson.json index 6ee4877460ec93..0d4d12b399c9b4 100644 --- a/versions/j-/jansson.json +++ b/versions/j-/jansson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a5c55feab368e4bfb40be993b9ea5a39fc82f51", + "version": "2.14", + "port-version": 0 + }, { "git-tree": "f63fad0d7e1e2a98826543c3b1f671c34b104a72", "version-string": "2.13.1", From 07b9eeecd2695a2d09d458ad8ab9bf6a1caec603 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Tue, 26 Apr 2022 22:24:59 -0400 Subject: [PATCH 121/383] [z3] Update to 4.8.16 (#24407) * [z3] Update to 4.8.16 * Use Python3 instead of Python2 Python2 is EOL and the build script works with Python3, so we should prefer Python3 * Update version --- ports/z3/fix-32-bit-build.patch | 132 --------------------------- ports/z3/portfile.cmake | 11 +-- ports/z3/remove-flag-overrides.patch | 2 +- ports/z3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/z3.json | 5 + 6 files changed, 13 insertions(+), 141 deletions(-) delete mode 100644 ports/z3/fix-32-bit-build.patch diff --git a/ports/z3/fix-32-bit-build.patch b/ports/z3/fix-32-bit-build.patch deleted file mode 100644 index 56b9f4c77688e8..00000000000000 --- a/ports/z3/fix-32-bit-build.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 3828130791bf8e60038b46b0d6602cb7e43fb344 Mon Sep 17 00:00:00 2001 -From: Nikolaj Bjorner -Date: Thu, 24 Mar 2022 14:05:05 -1000 -Subject: [PATCH] fix #5922 use 0u to help type inference - -Signed-off-by: Nikolaj Bjorner ---- - src/api/c++/z3++.h | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/src/api/c++/z3++.h b/src/api/c++/z3++.h -index b00a33ad71..4d60de4338 100644 ---- a/src/api/c++/z3++.h -+++ b/src/api/c++/z3++.h -@@ -2333,7 +2333,7 @@ namespace z3 { - - inline expr pble(expr_vector const& es, int const* coeffs, int bound) { - assert(es.size() > 0); -- context& ctx = es[0].ctx(); -+ context& ctx = es[0u].ctx(); - array _es(es); - Z3_ast r = Z3_mk_pble(ctx, _es.size(), _es.ptr(), coeffs, bound); - ctx.check_error(); -@@ -2341,7 +2341,7 @@ namespace z3 { - } - inline expr pbge(expr_vector const& es, int const* coeffs, int bound) { - assert(es.size() > 0); -- context& ctx = es[0].ctx(); -+ context& ctx = es[0u].ctx(); - array _es(es); - Z3_ast r = Z3_mk_pbge(ctx, _es.size(), _es.ptr(), coeffs, bound); - ctx.check_error(); -@@ -2349,7 +2349,7 @@ namespace z3 { - } - inline expr pbeq(expr_vector const& es, int const* coeffs, int bound) { - assert(es.size() > 0); -- context& ctx = es[0].ctx(); -+ context& ctx = es[0u].ctx(); - array _es(es); - Z3_ast r = Z3_mk_pbeq(ctx, _es.size(), _es.ptr(), coeffs, bound); - ctx.check_error(); -@@ -2357,7 +2357,7 @@ namespace z3 { - } - inline expr atmost(expr_vector const& es, unsigned bound) { - assert(es.size() > 0); -- context& ctx = es[0].ctx(); -+ context& ctx = es[0u].ctx(); - array _es(es); - Z3_ast r = Z3_mk_atmost(ctx, _es.size(), _es.ptr(), bound); - ctx.check_error(); -@@ -2365,7 +2365,7 @@ namespace z3 { - } - inline expr atleast(expr_vector const& es, unsigned bound) { - assert(es.size() > 0); -- context& ctx = es[0].ctx(); -+ context& ctx = es[0u].ctx(); - array _es(es); - Z3_ast r = Z3_mk_atleast(ctx, _es.size(), _es.ptr(), bound); - ctx.check_error(); -@@ -2373,7 +2373,7 @@ namespace z3 { - } - inline expr sum(expr_vector const& args) { - assert(args.size() > 0); -- context& ctx = args[0].ctx(); -+ context& ctx = args[0u].ctx(); - array _args(args); - Z3_ast r = Z3_mk_add(ctx, _args.size(), _args.ptr()); - ctx.check_error(); -@@ -2382,7 +2382,7 @@ namespace z3 { - - inline expr distinct(expr_vector const& args) { - assert(args.size() > 0); -- context& ctx = args[0].ctx(); -+ context& ctx = args[0u].ctx(); - array _args(args); - Z3_ast r = Z3_mk_distinct(ctx, _args.size(), _args.ptr()); - ctx.check_error(); -@@ -2411,14 +2411,14 @@ namespace z3 { - Z3_ast r; - assert(args.size() > 0); - if (args.size() == 1) { -- return args[0]; -+ return args[0u]; - } -- context& ctx = args[0].ctx(); -+ context& ctx = args[0u].ctx(); - array _args(args); -- if (Z3_is_seq_sort(ctx, args[0].get_sort())) { -+ if (Z3_is_seq_sort(ctx, args[0u].get_sort())) { - r = Z3_mk_seq_concat(ctx, _args.size(), _args.ptr()); - } -- else if (Z3_is_re_sort(ctx, args[0].get_sort())) { -+ else if (Z3_is_re_sort(ctx, args[0u].get_sort())) { - r = Z3_mk_re_concat(ctx, _args.size(), _args.ptr()); - } - else { -@@ -2448,7 +2448,7 @@ namespace z3 { - inline expr mk_xor(expr_vector const& args) { - if (args.empty()) - return args.ctx().bool_val(false); -- expr r = args[0]; -+ expr r = args[0u]; - for (unsigned i = 1; i < args.size(); ++i) - r = r ^ args[i]; - return r; -@@ -2771,7 +2771,7 @@ namespace z3 { - assert(!m_end && !m_empty); - m_cube = m_solver.cube(m_vars, m_cutoff); - m_cutoff = 0xFFFFFFFF; -- if (m_cube.size() == 1 && m_cube[0].is_false()) { -+ if (m_cube.size() == 1 && m_cube[0u].is_false()) { - m_cube = z3::expr_vector(m_solver.ctx()); - m_end = true; - } -@@ -3005,7 +3005,7 @@ namespace z3 { - } - array buffer(n); - for (unsigned i = 0; i < n; ++i) buffer[i] = tactics[i]; -- return tactic(tactics[0].ctx(), Z3_tactic_par_or(tactics[0].ctx(), n, buffer.ptr())); -+ return tactic(tactics[0u].ctx(), Z3_tactic_par_or(tactics[0u].ctx(), n, buffer.ptr())); - } - - inline tactic par_and_then(tactic const & t1, tactic const & t2) { -@@ -3804,7 +3804,7 @@ namespace z3 { - } - inline expr re_intersect(expr_vector const& args) { - assert(args.size() > 0); -- context& ctx = args[0].ctx(); -+ context& ctx = args[0u].ctx(); - array _args(args); - Z3_ast r = Z3_mk_re_intersect(ctx, _args.size(), _args.ptr()); - ctx.check_error(); diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index 7156b7186c04f8..0e8dc4b0ba1d4f 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -1,17 +1,16 @@ -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -vcpkg_add_to_path("${PYTHON2_DIR}") +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.8.15 - SHA512 7b08dec5b035a38edc90c4c491f508fd9ed227357de94400169db53d4c59382bd6a81ae6615771023a06534a3aa92668844f0ebfcc2a3b5ef4bba957426a0c6c + REF z3-4.8.16 + SHA512 385f6e1ee075b9eadb5aad338657a81f518eef382b99ce623448a630b79f5d414ebccfd1bb5e959626f0b82ef54a5f20326814ae988b5688d51578de6fb69615 HEAD_REF master PATCHES fix-install-path.patch remove-flag-overrides.patch - fix-32-bit-build.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/z3/remove-flag-overrides.patch b/ports/z3/remove-flag-overrides.patch index df6a4a16ef80d9..ddba89dd606a72 100644 --- a/ports/z3/remove-flag-overrides.patch +++ b/ports/z3/remove-flag-overrides.patch @@ -7,6 +7,6 @@ index 477410ba8..fcca03917 100644 cmake_minimum_required(VERSION 3.4) -set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") - project(Z3 VERSION 4.8.15.0 LANGUAGES CXX) + project(Z3 VERSION 4.8.16.0 LANGUAGES CXX) ################################################################################ diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index 50ec3e9ea7d8c5..f5f59bfbd18940 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "z3", - "version": "4.8.15", + "version": "4.8.16", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 9bd84904787ed5..d1817f82b5cc80 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7665,7 +7665,7 @@ "port-version": 0 }, "z3": { - "baseline": "4.8.15", + "baseline": "4.8.16", "port-version": 0 }, "z85": { diff --git a/versions/z-/z3.json b/versions/z-/z3.json index 26bf54ad69b9a1..ae108bc45470c6 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1217f07ef4a8f918f5b61a01057a4ee70f92422", + "version": "4.8.16", + "port-version": 0 + }, { "git-tree": "ca14e43533889ce4abf89af387b73d015e133c4a", "version": "4.8.15", From ee0bf4729a1eb4edc9bb0845f89c010d98c71296 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 27 Apr 2022 10:26:07 +0800 Subject: [PATCH 122/383] [libflac] Update to 1.3.4 (#24399) * [libflac] Update to 1.3.4 * Fix usage issue * Modify format Co-authored-by: Cheney-Wang --- ports/libflac/portfile.cmake | 33 ++++++++++++++------------------- ports/libflac/vcpkg.json | 14 +++++++++++--- versions/baseline.json | 4 ++-- versions/l-/libflac.json | 5 +++++ 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake index cb88d85250721f..9af82a6d36dc76 100644 --- a/ports/libflac/portfile.cmake +++ b/ports/libflac/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/flac - REF ce6dd6b5732e319ef60716d9cc9af6a836a4011a - SHA512 d0d3b5451f8d74aa0a0832fbe95cca55597ce9654765a95adaac98ecd0da9e803b98551a40a3fb3fd5b86bc5f40cd1a791127c03da5322e7f01e7fa761171a21 + REF 1151c93e992bb8c7c6394e04aa880d711c531c7f #1.3.4 + SHA512 ebf8de3dbd8fc2153af2f4a05ecc04817570233c30e0ec1fbdbc99f810860801b951248ca6404152cba4038f5839985f4076bcee477c00fd23bd583a45b89b17 HEAD_REF master PATCHES uwp-library-console.patch @@ -29,12 +29,12 @@ if("asm" IN_LIST FEATURES) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - asm WITH_ASM + FEATURES + asm WITH_ASM ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DBUILD_PROGRAMS=OFF -DBUILD_EXAMPLES=OFF @@ -42,12 +42,10 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF -DWITH_STACK_PROTECTOR=${WITH_STACK_PROTECTOR}) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME FLAC CONFIG_PATH share/FLAC/cmake) -vcpkg_fixup_cmake_targets( - CONFIG_PATH share/FLAC/cmake - TARGET_PATH share/FLAC -) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -72,18 +70,15 @@ else() "#if 1" ) endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/flac.pc" "Version:" "Version: 1.3.3") + if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/flac.pc" " -lm" "") -endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/flac++.pc" "Version:" "Version: 1.3.3") -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc" "Version:" "Version: 1.3.3") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac++.pc" "Version:" "Version: 1.3.3") - if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc" " -lm" "") + + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc" " -lm" "") endif() endif() + vcpkg_fixup_pkgconfig() # This license (BSD) is relevant only for library - if someone would want to install diff --git a/ports/libflac/vcpkg.json b/ports/libflac/vcpkg.json index f2fc15189181db..7ca4b9dcc4b51e 100644 --- a/ports/libflac/vcpkg.json +++ b/ports/libflac/vcpkg.json @@ -1,11 +1,19 @@ { "name": "libflac", - "version": "1.3.3", - "port-version": 7, + "version": "1.3.4", "description": "Library for manipulating FLAC files", "homepage": "https://xiph.org/flac/", + "license": "GFDL-1.2-or-later", "dependencies": [ - "libogg" + "libogg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "asm": { diff --git a/versions/baseline.json b/versions/baseline.json index d1817f82b5cc80..f7561d3e1cf78e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3553,8 +3553,8 @@ "port-version": 1 }, "libflac": { - "baseline": "1.3.3", - "port-version": 7 + "baseline": "1.3.4", + "port-version": 0 }, "libfort": { "baseline": "0.4.2", diff --git a/versions/l-/libflac.json b/versions/l-/libflac.json index 8dd6b40518a9ca..46b06a0c63ae20 100644 --- a/versions/l-/libflac.json +++ b/versions/l-/libflac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3dff2074f8f7a8ac9d8e9c5e78d8cae8538f3ef", + "version": "1.3.4", + "port-version": 0 + }, { "git-tree": "040c261fb123656fc61f659e887a6db0fabc275e", "version": "1.3.3", From bdd93cb0fc088a6d7b11b8b9f2fb9313266fdbdd Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 27 Apr 2022 04:26:39 +0200 Subject: [PATCH 123/383] [fplus] Update to 0.2.18 (#24387) * Update fplus to 0.2.18 * Update CI baseline * Add license Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Remove unused option * Update CI baseline * Switch to "version" * Update CI baseline Co-authored-by: chausner Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- ports/fplus/portfile.cmake | 18 ++++++++---------- ports/fplus/vcpkg.json | 11 +++++++++-- versions/baseline.json | 2 +- versions/f-/fplus.json | 5 +++++ 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ports/fplus/portfile.cmake b/ports/fplus/portfile.cmake index 5969cd318c5ad1..efe04fcdb8e23b 100644 --- a/ports/fplus/portfile.cmake +++ b/ports/fplus/portfile.cmake @@ -1,22 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Dobiasd/FunctionalPlus - REF v0.2.14-p0 - SHA512 f6232140fc343521bc484c7fa1a9d4942fbfc078be1cefa7b34c33632ec23d55827d13319f7b7a5535c5eedeb3161e15f84ecb80aa110685dbfc2c932c57284b + REF v0.2.18-p0 + SHA512 119aaef75020ef06818bf5d33db8bce272e89d69699df9be636bc6fdf06b584e1842440896a431ea2a75b88ce01472f3a9886b8dd781f5e5533315e9ad6860ac HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DFPLUS_BUILD_EXAMPLES=OFF -DFunctionalPlus_INSTALL_CMAKEDIR=share/FunctionalPlus ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fplus/vcpkg.json b/ports/fplus/vcpkg.json index 0e4c7ad713ab45..bdf521b1029bbf 100644 --- a/ports/fplus/vcpkg.json +++ b/ports/fplus/vcpkg.json @@ -1,6 +1,13 @@ { "name": "fplus", - "version-semver": "0.2.14-p0", + "version": "0.2.18-p0", "description": "Functional Programming Library for C++. Write concise and readable C++ code", - "homepage": "https://github.com/Dobiasd/FunctionalPlus" + "homepage": "https://github.com/Dobiasd/FunctionalPlus", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index f7561d3e1cf78e..cbc3e403d844be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2305,7 +2305,7 @@ "port-version": 0 }, "fplus": { - "baseline": "0.2.14-p0", + "baseline": "0.2.18-p0", "port-version": 0 }, "freealut": { diff --git a/versions/f-/fplus.json b/versions/f-/fplus.json index fa44222356ebfe..13b59b4569a54a 100644 --- a/versions/f-/fplus.json +++ b/versions/f-/fplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e982e423baaf3d7728a2122368494d1c57c8e55e", + "version": "0.2.18-p0", + "port-version": 0 + }, { "git-tree": "d76810dad7926ef832d9f75966f99a763ed40cfb", "version-semver": "0.2.14-p0", From fb02a785618a1fbaced32b206171e09fd57d4622 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 27 Apr 2022 10:27:26 +0800 Subject: [PATCH 124/383] [poco] Update Version to 1.11.2 (#24425) * [poco] Update Version to 1.11.2 * update version --- ports/poco/arm64_pcre.patch | 15 +-------------- ports/poco/portfile.cmake | 4 ++-- ports/poco/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/poco.json | 5 +++++ 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/ports/poco/arm64_pcre.patch b/ports/poco/arm64_pcre.patch index 75151dc34f2d39..b47561ca7b31da 100644 --- a/ports/poco/arm64_pcre.patch +++ b/ports/poco/arm64_pcre.patch @@ -1,16 +1,3 @@ -diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h -index 9a945f3..f5a9a7f 100644 ---- a/Foundation/include/Poco/Platform.h -+++ b/Foundation/include/Poco/Platform.h -@@ -191,7 +191,7 @@ - #else - #define POCO_ARCH_LITTLE_ENDIAN 1 - #endif --#elif defined(__arm64__) || defined(__arm64) -+#elif defined(__arm64__) || defined(__arm64) || defined(_M_ARM64) - #define POCO_ARCH POCO_ARCH_ARM64 - #if defined(__ARMEB__) - #define POCO_ARCH_BIG_ENDIAN 1 diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp index 1f51296..c67b71b 100644 --- a/Foundation/src/EventLogChannel.cpp @@ -24,7 +11,7 @@ index 1f51296..c67b71b 100644 #include "Poco/EventLogChannel.h" #include "Poco/Message.h" diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index 4328344..5eeafcd 100644 +index 0a222c7..0843315 100644 --- a/Foundation/src/utils.h +++ b/Foundation/src/utils.h @@ -91,7 +91,7 @@ int main(int argc, char** argv) { diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index e4ceb12b413188..c6c9c0f524f2a2 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pocoproject/poco - REF de61f0049175a941cc83c2615c3bdc5e947b89f9 # poco-1.11.1-release - SHA512 0290eeeca8a85286efe8f583224062ea97668c2730f8f7db4e075ce75e997b0a0c969159d4034c27fbb2e8d4b9c6504888d8ffa001193f7eb0e450bca2d5d7a2 + REF 9d1c428c861f2e5ccf09149bbe8d2149720c5896 # poco-1.11.2-release + SHA512 b812bb194783c94e2a048daf6659e0f0fa5e9040ebd49342a5d39636cee600754d0465f8b28725d76dcb2681d1b64dfd8b08ac9c85b95b4ac8edf9b53d68feb1 HEAD_REF master PATCHES # Fix embedded copy of pcre in static linking mode diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json index 98519295d98926..d4a8c97aad0085 100644 --- a/ports/poco/vcpkg.json +++ b/ports/poco/vcpkg.json @@ -1,6 +1,6 @@ { "name": "poco", - "version": "1.11.1", + "version": "1.11.2", "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", "homepage": "https://github.com/pocoproject/poco", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index cbc3e403d844be..e22afae0d379e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5477,7 +5477,7 @@ "port-version": 3 }, "poco": { - "baseline": "1.11.1", + "baseline": "1.11.2", "port-version": 0 }, "podofo": { diff --git a/versions/p-/poco.json b/versions/p-/poco.json index 9a6677049e7013..e6d2e5f9051bdf 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de13e6b66833cb816a0f85528697c7ee63be89ae", + "version": "1.11.2", + "port-version": 0 + }, { "git-tree": "ae7e310067c34beca24a055b9b25e24fe1b42190", "version": "1.11.1", From 474f73649cb88015249b7095682289b2d21a2952 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 27 Apr 2022 12:02:26 -0700 Subject: [PATCH 125/383] [czmq] Delete "headers" that should not be installed (#24434) See: https://github.com/zeromq/czmq/issues/2197 Related: https://github.com/microsoft/vcpkg/pull/24433 --- ports/czmq/portfile.cmake | 6 ++++++ ports/czmq/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/czmq.json | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ports/czmq/portfile.cmake b/ports/czmq/portfile.cmake index a24d0be9a6de83..5ed28189d0741d 100644 --- a/ports/czmq/portfile.cmake +++ b/ports/czmq/portfile.cmake @@ -70,6 +70,12 @@ vcpkg_clean_executables_in_bin(FILE_NAMES zmakecert) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +# Remove headers with "common" names that conflict with other packages which aren't intended to be installed +# See https://github.com/zeromq/czmq/issues/2197 +foreach(FILE readme.txt sha1.h sha1.inc_c slre.h slre.inc_c zgossip_engine.inc zgossip_msg.h zhash_primes.inc zsock_option.inc) + file(REMOVE "${CURRENT_PACKAGES_DIR}/include/${FILE}") +endforeach() + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/czmq_library.h "if defined CZMQ_STATIC" diff --git a/ports/czmq/vcpkg.json b/ports/czmq/vcpkg.json index 326c881d6bf6ae..09b2d59d793360 100644 --- a/ports/czmq/vcpkg.json +++ b/ports/czmq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "czmq", "version-semver": "4.2.1", + "port-version": 1, "description": "High-level C binding for ZeroMQ", "homepage": "https://github.com/zeromq/czmq", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index e22afae0d379e4..fac5257d38b2cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1762,7 +1762,7 @@ }, "czmq": { "baseline": "4.2.1", - "port-version": 0 + "port-version": 1 }, "d3d12-memory-allocator": { "baseline": "2021-05-05", diff --git a/versions/c-/czmq.json b/versions/c-/czmq.json index 45cace94635e22..982b8f19ee7cda 100644 --- a/versions/c-/czmq.json +++ b/versions/c-/czmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd4ccb9b894541d10e393139468aaac97419b0f2", + "version-semver": "4.2.1", + "port-version": 1 + }, { "git-tree": "e05dc72cf3b616b1fd6629ea3dc20d08ed8d8055", "version-semver": "4.2.1", From e9d2b4c40e3a3ac4c6264dd685d59df8d082ace1 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 27 Apr 2022 21:58:45 +0200 Subject: [PATCH 126/383] [vcpkg ci] Check for deprecated license identifiers (#23039) --- .github/workflows/untrustedPR.yml | 23 ++++++++++++++++------- ports/kfr/vcpkg.json | 2 +- ports/zug/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/k-/kfr.json | 5 +++++ versions/z-/zug.json | 5 +++++ 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index dc47a1964c8c2f..c094d894889994 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -39,7 +39,9 @@ jobs: git config user.name github-actions@github.com git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake - git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license + git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' > .github-pr.changed-manifest-files + cat .github-pr.changed-manifest-files | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license + cat .github-pr.changed-manifest-files | while read filename; do match=$(grep -oiP '"license": ".*\K(AGPL-1\.0|AGPL-3\.0|BSD-2-Clause-FreeBSD|BSD-2-Clause-NetBSD|bzip2-1\.0\.5|eCos-2\.0|GFDL-1\.1|GFDL-1\.2|GFDL-1\.3|GPL-1\.0|GPL-1\.0\+|GPL-2\.0|GPL-2\.0\+|GPL-2\.0-with-autoconf-exception|GPL-2\.0-with-bison-exception|GPL-2\.0-with-classpath-exception|GPL-2\.0-with-font-exception|GPL-2\.0-with-GCC-exception|GPL-3\.0|GPL-3\.0\+|GPL-3\.0-with-autoconf-exception|GPL-3\.0-with-GCC-exception|LGPL-2\.0|LGPL-2\.0\+|LGPL-2\.1|LGPL-2\.1\+|LGPL-3\.0|LGPL-3\.0\+|Nunit|StandardML-NJ|wxWindows)(?=[ "])' "$filename" || true); if [ ! -z "$match" ]; then echo " - \`$filename\` (\`$match\`)" ; fi ; done > .github-pr.deprecated-license ./vcpkg format-manifest --all --convert-control git diff > .github-pr.format-manifest git add -u @@ -63,6 +65,7 @@ jobs: const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim() const cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).trim() const missing_license = (await fs.readFile('.github-pr.missing-license', 'utf8')).trim() + const deprecated_license = (await fs.readFile('.github-pr.deprecated-license', 'utf8')).trim() let approve = true; var output = '' @@ -112,13 +115,19 @@ jobs: output += `The following files are affected:\n${cmake}\n` output += "\n\n" } - if (missing_license !== "") { - output += 'You have modified or added at least one vcpkg.json where a "license" field is missing.\n' + if (missing_license !== "" || deprecated_license !== "") { + output += 'You have modified or added at least one vcpkg.json where you should check the `license` field.\n' output += "
\n\n" - - output += 'If you feel able to do so, please consider adding a "license" field to the following files:\n' - output += missing_license - output += "\n\nValid values for the license field can be found in the [documentation](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/manifest-files.md#license)\n" + if (missing_license !== "") { + output += 'If you feel able to do so, please consider adding a "license" field to the following files:\n' + output += missing_license + output += "\n\nValid values for the license field can be found in the [documentation](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/manifest-files.md#license)\n\n" + } + if (deprecated_license !== "") { + output += 'If you feel able to do so, please consider replacing the deprecated license identifiers in the following files:\n' + output += deprecated_license + output += "\n\nDeprecated and non deprecated license identifiers can be found [here](https://spdx.github.io/spdx-spec/SPDX-license-list/#a3-deprecated-licenses)\n" + } output += "
\n\n" } diff --git a/ports/kfr/vcpkg.json b/ports/kfr/vcpkg.json index 9137445292221e..c60a6a11e32278 100644 --- a/ports/kfr/vcpkg.json +++ b/ports/kfr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kfr", "version-semver": "4.2.1", - "port-version": 1, + "port-version": 2, "description": "Fast, modern C++ DSP framework.", "homepage": "https://www.kfr.dev/", "license": "GPL-2.0", diff --git a/ports/zug/vcpkg.json b/ports/zug/vcpkg.json index ac59f865eb87f5..87bee1b28790c6 100644 --- a/ports/zug/vcpkg.json +++ b/ports/zug/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zug", "version-date": "2021-04-23", + "port-version": 1, "description": "Transducers for C++", "homepage": "https://sinusoid.es/zug/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fac5257d38b2cf..875e8305d101e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3266,7 +3266,7 @@ }, "kfr": { "baseline": "4.2.1", - "port-version": 1 + "port-version": 2 }, "kinectsdk1": { "baseline": "1.8", @@ -7726,7 +7726,7 @@ }, "zug": { "baseline": "2021-04-23", - "port-version": 0 + "port-version": 1 }, "zydis": { "baseline": "3.2.1", diff --git a/versions/k-/kfr.json b/versions/k-/kfr.json index 863c2a4f91f0af..061ac339eb9343 100644 --- a/versions/k-/kfr.json +++ b/versions/k-/kfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7465d297a8018bccb142249ed62bf26481608837", + "version-semver": "4.2.1", + "port-version": 2 + }, { "git-tree": "76c0a2397fec739067cac1a9970c113ed47341b1", "version-semver": "4.2.1", diff --git a/versions/z-/zug.json b/versions/z-/zug.json index 687ab2d8f77370..6518dff54f4385 100644 --- a/versions/z-/zug.json +++ b/versions/z-/zug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebb162e61d6a161de1d01184b20389079eb3fdc6", + "version-date": "2021-04-23", + "port-version": 1 + }, { "git-tree": "2213b3d809f8a99994484b626896f6cf6e3858c3", "version-date": "2021-04-23", From 05c93c5c5a21c38c02e32f19e745b52cce0bd602 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 28 Apr 2022 03:12:48 +0200 Subject: [PATCH 127/383] [Fix uwp toolchain|world rebuild] make ninja work for uwp (#22831) --- .../boost-modular-build-helper/CMakeLists.txt | 3 - ports/boost-modular-build-helper/vcpkg.json | 1 + ports/cpprestsdk/portfile.cmake | 20 +++--- ports/cpprestsdk/vcpkg.json | 11 +++- ports/igraph/vcpkg.json | 3 +- ports/libcerf/portfile.cmake | 16 +++-- ports/libcerf/vcpkg.json | 12 +++- ports/liblbfgs/portfile.cmake | 13 ++-- ports/liblbfgs/vcpkg.json | 12 +++- ports/orc/portfile.cmake | 32 +++++----- ports/orc/vcpkg.json | 12 +++- ports/physfs/portfile.cmake | 9 ++- ports/physfs/vcpkg.json | 2 +- ports/physx/portfile.cmake | 2 + ports/physx/vcpkg.json | 4 +- ports/sdl2/portfile.cmake | 5 ++ ports/sdl2/vcpkg.json | 2 +- .../vcpkg-cmake/cmake_get_vars/CMakeLists.txt | 5 ++ ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 3 - scripts/ci.baseline.txt | 52 ++-------------- scripts/cmake/vcpkg_build_make.cmake | 0 scripts/cmake/vcpkg_configure_cmake.cmake | 3 - scripts/cmake/vcpkg_configure_make.cmake | 16 +++-- scripts/get_cmake_vars/CMakeLists.txt | 7 ++- scripts/toolchains/uwp.cmake | 61 +++++++++++++++++++ versions/b-/boost-modular-build-helper.json | 5 ++ versions/baseline.json | 20 +++--- versions/c-/cpprestsdk.json | 5 ++ versions/i-/igraph.json | 5 ++ versions/l-/libcerf.json | 5 ++ versions/l-/liblbfgs.json | 5 ++ versions/o-/orc.json | 5 ++ versions/p-/physfs.json | 5 ++ versions/p-/physx.json | 5 ++ versions/s-/sdl2.json | 5 ++ versions/v-/vcpkg-cmake.json | 5 ++ 37 files changed, 250 insertions(+), 128 deletions(-) mode change 100755 => 100644 scripts/cmake/vcpkg_build_make.cmake create mode 100644 scripts/toolchains/uwp.cmake diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 368c601748784c..c395a4dfc2731b 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -96,10 +96,7 @@ if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") list(TRANSFORM libpath_args PREPEND "/AI\"") list(TRANSFORM libpath_args APPEND "\"") list(JOIN libpath_args " " libpath_arg) - - string(APPEND CXXFLAGS " /ZW") string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00") - string(APPEND CFLAGS " -Zl") list(APPEND B2_OPTIONS windows-api=store) list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) endif() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 3d70fd245557dd..0c142cebc73aa4 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.79.0", + "port-version": 1, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index 4682018089808b..666cb1c0b89a6c 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -23,9 +23,13 @@ vcpkg_check_features( websockets CPPREST_EXCLUDE_WEBSOCKETS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/Release - PREFER_NINJA +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/Release" + ${configure_opts} OPTIONS ${OPTIONS} ${FEATURE_OPTIONS} @@ -38,16 +42,16 @@ vcpkg_configure_cmake( -DCPPREST_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/share" "${CURRENT_PACKAGES_DIR}/lib/share") if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h" "#ifdef _NO_ASYNCRTIMP" "#if 1") endif() -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpprestsdk/vcpkg.json b/ports/cpprestsdk/vcpkg.json index d33e61ed9345aa..3a4610ef7a2c3e 100644 --- a/ports/cpprestsdk/vcpkg.json +++ b/ports/cpprestsdk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpprestsdk", - "version-string": "2.10.18", + "version": "2.10.18", + "port-version": 1, "description": [ "C++11 JSON, REST, and OAuth library", "The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services." @@ -42,6 +43,14 @@ { "name": "openssl", "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index 2f0f5fe90b9fbb..22d4f589d8e774 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,10 +1,11 @@ { "name": "igraph", "version": "0.9.8", - "port-version": 1, + "port-version": 2, "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "license": "GPL-2.0-or-later", + "supports": "!uwp", "dependencies": [ "blas", "lapack", diff --git a/ports/libcerf/portfile.cmake b/ports/libcerf/portfile.cmake index 1054bf5c8c73d8..aada71bd497d98 100644 --- a/ports/libcerf/portfile.cmake +++ b/ports/libcerf/portfile.cmake @@ -16,18 +16,22 @@ vcpkg_extract_source_archive_ex( PATCHES 001-fix-static-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS -DCERF_CPP=ON -DLIB_MAN=OFF -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcerf RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libcerf" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/libcerf/vcpkg.json b/ports/libcerf/vcpkg.json index 3d134faac927e6..2788bc96d2ab9b 100644 --- a/ports/libcerf/vcpkg.json +++ b/ports/libcerf/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libcerf", - "version-string": "1.13", - "port-version": 2, + "version": "1.13", + "port-version": 3, "description": "A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.", - "homepage": "https://jugit.fz-juelich.de/mlz/libcerf" + "homepage": "https://jugit.fz-juelich.de/mlz/libcerf", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/liblbfgs/portfile.cmake b/ports/liblbfgs/portfile.cmake index 5e7e34e55bdf91..a793a23d9a1746 100644 --- a/ports/liblbfgs/portfile.cmake +++ b/ports/liblbfgs/portfile.cmake @@ -8,15 +8,14 @@ vcpkg_from_github( message(STATUS "source path is : ${SOURCE_PATH}") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFIX_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblbfgs RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/liblbfgs" RENAME copyright) \ No newline at end of file diff --git a/ports/liblbfgs/vcpkg.json b/ports/liblbfgs/vcpkg.json index d648f802752b18..8525cd58842582 100644 --- a/ports/liblbfgs/vcpkg.json +++ b/ports/liblbfgs/vcpkg.json @@ -1,7 +1,13 @@ { "name": "liblbfgs", - "version-string": "1.10", - "port-version": 1, + "version": "1.10", + "port-version": 2, "description": "libLBFGS: a library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)", - "homepage": "http://www.chokkan.org/software/liblbfgs/" + "homepage": "http://www.chokkan.org/software/liblbfgs/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index 722b6a10a5f0b5..ee22997e7721a4 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -16,11 +16,7 @@ file(REMOVE "${SOURCE_PATH}/cmake_modules/FindProtobuf.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindSnappy.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZLIB.cmake") -if(CMAKE_HOST_WIN32) - set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc.exe) -else() - set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc) -endif() +set(PROTOBUF_EXECUTABLE "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}") if(VCPKG_TARGET_IS_WINDOWS) set(BUILD_TOOLS OFF) @@ -28,9 +24,13 @@ else() set(BUILD_TOOLS ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS -DBUILD_TOOLS=${BUILD_TOOLS} -DBUILD_CPP_TESTS=OFF @@ -42,23 +42,23 @@ vcpkg_configure_cmake( -DENABLE_TEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/orc-*) if(TOOLS) - file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/orc) + file(COPY ${TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/orc") file(REMOVE ${TOOLS}) endif() -file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/*) +file(GLOB BINS "${CURRENT_PACKAGES_DIR}/bin/*") if(NOT BINS) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index 7f87b3c6236d10..d442716c41223f 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -1,14 +1,22 @@ { "name": "orc", - "version-string": "1.6.4", - "port-version": 2, + "version": "1.6.4", + "port-version": 3, "description": "The smallest, fastest columnar storage for Hadoop workloads.", "homepage": "https://orc.apache.org/", "dependencies": [ "gtest", "lz4", "protobuf", + { + "name": "protobuf", + "host": true + }, "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib", "zstd" ] diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index 879a2b0e0f14a7..b47465de2924d0 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" REF ${PHYSFS_VERSION} PATCHES "001-fix-lzmasdk-arm64-windows.patch" @@ -20,8 +20,13 @@ vcpkg_extract_source_archive_ex( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PHYSFS_SHARED) +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS -DPHYSFS_BUILD_STATIC=${PHYSFS_STATIC} -DPHYSFS_BUILD_SHARED=${PHYSFS_SHARED} diff --git a/ports/physfs/vcpkg.json b/ports/physfs/vcpkg.json index b740565cafc632..649fa9384935ad 100644 --- a/ports/physfs/vcpkg.json +++ b/ports/physfs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "physfs", "version-semver": "3.0.2", - "port-version": 6, + "port-version": 7, "description": "a library to provide abstract access to various archives", "homepage": "https://icculus.org/physfs/", "dependencies": [ diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake index f4250da917f144..2d963f7913e7fd 100644 --- a/ports/physx/portfile.cmake +++ b/ports/physx/portfile.cmake @@ -40,6 +40,7 @@ set(OPTIONS_DEBUG if(VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=uwp") + set(configure_options WINDOWS_USE_MSBUILD) elseif(VCPKG_TARGET_IS_WINDOWS) list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=windows") elseif(VCPKG_TARGET_IS_OSX) @@ -76,6 +77,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public" + ${configure_options} DISABLE_PARALLEL_CONFIGURE OPTIONS ${OPTIONS} OPTIONS_DEBUG ${OPTIONS_DEBUG} diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index 2c5ea8f26c668c..4d7cfa741c3a55 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "physx", - "version-semver": "4.1.2", - "port-version": 2, + "version": "4.1.2", + "port-version": 3, "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs", "homepage": "https://github.com/NVIDIAGameWorks/PhysX", "license": null, diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 11fe9cb9b4610a..a69dcdaaace424 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -29,8 +29,13 @@ if ("x11" IN_LIST FEATURES) message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") endif() +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS ${FEATURE_OPTIONS} -DSDL_STATIC=${SDL_STATIC} -DSDL_SHARED=${SDL_SHARED} diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 613f4626edcc62..95f045e65b20a1 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2", "version": "2.0.20", - "port-version": 2, + "port-version": 3, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "dependencies": [ diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt index 29951f5ad20e64..51f6357c7c71af 100644 --- a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt +++ b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt @@ -147,6 +147,11 @@ foreach(flag CXX C SHARED_LINKER EXE_LINKER STATIC_LINKER RC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. # This is imperfect because it fails on directories with trailing spaces, but those are exceedingly rare string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_FLAGS "${${flag}_FLAGS}") + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if("${flag}" STREQUAL "CXX") + string(APPEND ${flag}_FLAGS " -ZW:nostdlib") + endif() + endif() endif() string(REPLACE "\\" "\\\\" ${flag}_FLAGS "${${flag}_FLAGS}") string(REPLACE "\"" "\\\"" ${flag}_FLAGS "${${flag}_FLAGS}") diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 842abb832ac39b..db0c74d719c46a 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-04-12", + "version-date": "2022-04-21", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index ed312a05d53a73..02d3fb095c6ee6 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -154,9 +154,6 @@ function(vcpkg_cmake_configure) # Prebuilt ninja binaries are only provided for x64 hosts set(ninja_can_be_used OFF) set(ninja_host OFF) - elseif(VCPKG_TARGET_IS_UWP) - # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility - set(ninja_can_be_used OFF) endif() set(generator "Ninja") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2ab6bde42a2ad2..f4ae0f062de5a4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -57,8 +57,6 @@ blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail blosc:arm64-windows=fail -blosc:arm-uwp=fail -blosc:x64-uwp=fail bond:arm-uwp=fail bond:x64-osx=fail bond:x64-uwp=fail @@ -93,8 +91,6 @@ catch-classic:x64-windows = skip catch-classic:x64-windows-static = skip catch-classic:x64-windows-static-md=skip catch-classic:x86-windows = skip -ccd:arm-uwp=fail -ccd:x64-uwp=fail cctag:x64-windows-static-md=fail cello:arm-uwp=fail cello:x64-uwp=fail @@ -122,8 +118,6 @@ chartdir:x86-windows=skip chartdir:x64-windows=skip chartdir:x64-windows-static-md=skip chartdir:x64-osx=skip -chmlib:arm-uwp=fail -chmlib:x64-uwp=fail # chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI # broken on Windows because it does not yet support VS2022 @@ -218,10 +212,10 @@ discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail - # requires g++11 discordcoreapi:x64-linux=fail - +dlib:arm-uwp=fail +dlib:x64-uwp=fail dmlc:arm-uwp=fail dmlc:x64-uwp=fail dpdk:arm-uwp=fail @@ -257,8 +251,6 @@ embree2:x64-windows-static-md=skip # embree2 conflicts with embree3 embree2:x64-linux=skip embree2:x64-osx=skip -enet:arm-uwp=fail -enet:x64-uwp=fail epsilon:arm-uwp=fail epsilon:x64-uwp=fail epsilon:x64-windows-static=fail @@ -267,10 +259,6 @@ fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail fastrtps:x64-windows-static-md=fail -fdlibm:arm-uwp=fail -fdlibm:x64-uwp=fail -fftw3:arm-uwp=fail -fftw3:x64-uwp=fail # fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because # fluidlite has no dependencies and thus is less likely to be broken by another package. fluidlite:arm-uwp=skip @@ -282,8 +270,6 @@ fluidlite:x64-windows-static=skip fluidlite:x64-windows-static-md=skip fluidlite:x64-windows=skip fluidlite:x86-windows=skip -fmem:arm-uwp=fail -fmem:x64-uwp=fail fmi4cpp:arm-uwp=fail fmi4cpp:x64-uwp=fail fmilib:arm64-windows=fail @@ -366,12 +352,6 @@ gperftools:x64-uwp=fail gperftools:arm-uwp=fail graphicsmagick:arm-uwp=fail graphicsmagick:x64-uwp=fail -graphite2:arm-uwp=fail -graphite2:x64-uwp=fail -graphqlparser:arm-uwp=fail -graphqlparser:x64-uwp=fail -gsl:arm-uwp=fail -gsl:x64-uwp=fail gstreamer:x64-osx=fail gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail @@ -388,8 +368,6 @@ healpix:x64-uwp=fail healpix:arm64-windows=fail healpix:arm-uwp=fail healpix:x64-osx=fail -hiredis:arm-uwp=fail -hiredis:x64-uwp=fail hpx:x64-windows-static=fail hpx:arm64-windows=fail hunspell:x64-windows-static-md=fail @@ -435,8 +413,6 @@ isal:x64-windows=fail isal:x64-windows-static=fail isal:x64-windows-static-md=fail isal:x86-windows=fail -jbig2dec:arm-uwp=fail -jbig2dec:x64-uwp=fail jemalloc:arm64-windows=fail jemalloc:arm-uwp=fail jemalloc:x64-linux=fail @@ -509,8 +485,6 @@ libgpg-error:x64-uwp=fail libhdfs3:x64-linux=fail libhdfs3:x64-osx=fail libhydrogen:arm64-windows=fail -libics:arm-uwp=fail -libics:x64-uwp=fail libigl:arm64-windows=fail libigl:arm-uwp=fail libigl:x64-uwp=fail @@ -522,8 +496,6 @@ liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail liblo:x64-uwp=fail -libmad:arm-uwp=fail -libmad:x64-uwp=fail libmagic:x64-uwp=fail libmagic:arm64-windows=fail libmagic:arm-uwp=fail @@ -612,8 +584,6 @@ libsrt:x64-uwp=fail libssh:arm64-windows=fail libssh:arm-uwp=fail libssh:x64-uwp=fail -libstk:arm-uwp=fail -libstk:x64-uwp=fail libtcod:arm-uwp=fail libtcod:x64-uwp=fail libtins:arm-uwp=fail @@ -681,8 +651,6 @@ luajit:x86-windows = skip luafilesystem:arm-uwp=fail luafilesystem:x64-uwp=fail luasec:x64-windows-static=fail -luasocket:arm-uwp=fail -luasocket:x64-uwp=fail lzfse:arm-uwp=fail magnum:arm64-windows=skip marble:x64-windows-static=fail @@ -715,8 +683,6 @@ mfl:x64-osx=skip milerius-sfml-imgui:x64-windows-static=fail minifb:arm-uwp=fail minifb:x64-uwp=fail -minisat-master-keying:arm-uwp=fail -minisat-master-keying:x64-uwp=fail miniupnpc:arm-uwp=fail miniupnpc:x64-uwp=fail minizip:arm-uwp=fail @@ -752,6 +718,8 @@ mmx:x64-uwp=skip mmx:arm64-windows=skip # Flaky strange linker error mongo-c-driver:x64-osx=skip +mongo-c-driver:arm-uwp=fail +mongo-c-driver:x64-uwp=fail mongoose:arm-uwp=fail mongoose:x64-uwp=fail monkeys-audio:arm64-windows=fail @@ -937,8 +905,6 @@ optional-bare:x64-windows-static-md=skip optional-bare:x86-windows = skip opusfile:arm-uwp=fail opusfile:x64-uwp=fail -orocos-kdl:arm-uwp=fail -orocos-kdl:x64-uwp=fail paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail pango:x64-windows-static=fail @@ -965,8 +931,6 @@ pmdk:x64-osx=fail pmdk:x64-uwp=fail pmdk:x64-windows-static=fail pmdk:x86-windows=fail -pngwriter:arm-uwp=fail -pngwriter:x64-uwp=fail popsift:x64-windows-static-md=fail portable-snippets:arm-uwp=fail pqp:arm-uwp=fail @@ -974,8 +938,6 @@ pqp:x64-uwp=fail # Not yet ready for these platforms. qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail -qhull:x64-uwp=fail -qhull:arm-uwp=fail qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail @@ -1018,8 +980,6 @@ qwt:x64-osx=fail qwt-qt6:x64-osx=fail qwtw:x64-windows=fail rabit:x64-osx=fail -ragel:arm-uwp=fail -ragel:x64-uwp=fail range-v3-vs2015:arm64-windows = skip range-v3-vs2015:arm-uwp = skip range-v3-vs2015:x64-linux = skip @@ -1136,8 +1096,6 @@ septag-sx:arm64-windows=fail septag-sx:arm-uwp=fail septag-sx:x64-uwp=fail sfml:arm64-windows=fail -shapelib:arm-uwp=fail -shapelib:x64-uwp=fail shiva:x64-windows-static=fail shiva:x64-windows-static-md=fail shiva-sfml:x64-linux=fail @@ -1322,8 +1280,6 @@ xerces-c:arm-uwp=fail xerces-c:x64-uwp=fail xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail -yajl:arm-uwp=fail -yajl:x64-uwp=fail yara:arm-uwp=fail yara:x64-uwp=fail z3:arm-uwp=fail diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake old mode 100755 new mode 100644 diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 7f139a4b989719..e0d751d99d6854 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -219,9 +219,6 @@ function(vcpkg_configure_cmake) # Prebuilt ninja binaries are only provided for x64 hosts set(ninja_can_be_used OFF) set(ninja_host OFF) - elseif(VCPKG_TARGET_IS_UWP) - # Ninja and MSBuild have many differences when targeting UWP, so use MSBuild to maximize existing compatibility - set(ninja_can_be_used OFF) endif() endif() diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 3e9c4378767926..a1097b11665889 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -240,6 +240,7 @@ function(vcpkg_configure_make) z_vcpkg_get_cmake_vars(cmake_vars_file) debug_message("Including cmake vars from: ${cmake_vars_file}") include("${cmake_vars_file}") + if(DEFINED VCPKG_MAKE_BUILD_TRIPLET) set(arg_BUILD_TRIPLET ${VCPKG_MAKE_BUILD_TRIPLET}) # Triplet overwrite for crosscompiling endif() @@ -559,12 +560,15 @@ function(vcpkg_configure_make) # IMPORTANT: The only way to pass linker flags through libtool AND the compile wrapper # is to use the CL and LINK environment variables !!! # (This is due to libtool and compiler wrapper using the same set of options to pass those variables around) - string(REPLACE "\\" "/" VCToolsInstallDir "$ENV{VCToolsInstallDir}") + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" VCToolsInstallDir) + set(_replacement -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE}") # Can somebody please check if CMake's compiler flags for UWP are correct? - set(ENV{_CL_} "$ENV{_CL_} /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB_ -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"") - string(APPEND VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE " -ZW:nostdlib") - string(APPEND VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG " -ZW:nostdlib") - set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES} /MANIFEST /DYNAMICBASE /WINMD:NO /APPCONTAINER") + set(ENV{_CL_} "$ENV{_CL_} -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"") + set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") endif() endif() @@ -723,7 +727,7 @@ function(vcpkg_configure_make) set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}") endif() else() - set(link_required_dirs) + set(link_required_dirs "") if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib") endif() diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index 23b7d64e7fada0..ec6ea55390739e 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -92,12 +92,16 @@ endforeach() macro(_vcpkg_adjust_flags flag_var) if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. string(REGEX REPLACE "(^| )/" "\\1-" ${flag_var} "${${flag_var}}") + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if("${flag_var}" STREQUAL "CMAKE_CXX_FLAGS") + string(APPEND ${flag_var} " -ZW:nostdlib") + endif() + endif() endif() if(CMAKE_SYSTEM_NAME MATCHES "Darwin") if("${flag_var}" IN_LIST VCPKG_LANG_FLAGS) # macOS - append arch and isysroot if cross-compiling if(NOT "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}") - foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) string(APPEND ${flag_var} " -arch ${arch}") endforeach() @@ -113,6 +117,7 @@ endmacro() foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK) string(STRIP "${${flag}}" ${flag}) # Strip leading and trailing whitespaces _vcpkg_adjust_flags(${flag}) + string(REPLACE [[\\]] [[\]] ${flag} "${${flag}}") string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag} \" ${${flag}}\")\n") foreach(config IN LISTS VCPKG_CONFIGS) string(STRIP "${${flag}_${config}}" ${flag}_${config}) diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake new file mode 100644 index 00000000000000..49511dcd8b6a5c --- /dev/null +++ b/scripts/toolchains/uwp.cmake @@ -0,0 +1,61 @@ +if(NOT _VCPKG_WINDOWS_TOOLCHAIN) +set(_VCPKG_WINDOWS_TOOLCHAIN 1) +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>$<$:DLL>" CACHE STRING "") + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(VCPKG_CRT_LINK_FLAG_PREFIX "/MD") + elseif(VCPKG_CRT_LINKAGE STREQUAL "static") + set(VCPKG_CRT_LINK_FLAG_PREFIX "/MT") + else() + message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"") + endif() + + set(_vcpkg_charset "/utf-8") + if (NOT VCPKG_SET_CHARSET_FLAG OR VCPKG_PLATFORM_TOOLSET MATCHES "v120") + # VS 2013 does not support /utf-8 + set(_vcpkg_charset "") + endif() + + set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs; + set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") + #/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD + set(_vcpkg_winmd_flag "") + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) + set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}") + # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars + #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps + + set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") + set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") + set(CMAKE_RC_FLAGS "-c65001 ${_vcpkg_cpp_flags}" CACHE STRING "") + + unset(_vcpkg_charset) + unset(_vcpkg_cpp_flags) + unset(_vcpkg_common_flags) + unset(_vcpkg_winmd_flag) + + set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /RTC1 ${VCPKG_CRT_LINK_FLAG_PREFIX}d ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /RTC1 ${VCPKG_CRT_LINK_FLAG_PREFIX}d ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") + + set(CMAKE_CXX_FLAGS_RELEASE "/Gy /O2 /Oi /DNDEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") # VS adds /GL + set(CMAKE_C_FLAGS_RELEASE "/Gy /O2 /Oi /DNDEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") + + string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") # VS adds /LTCG + + if(CMAKE_GENERATOR MATCHES "Ninja") + set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection + endif() + string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + # VS adds /DEBUG:FULL /TLBID:1. WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES + string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") + string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") +endif() +endif() diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 572f4a66c6024b..2502362696f90b 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcb306fc661bfab322c75b55472e402387396099", + "version": "1.79.0", + "port-version": 1 + }, { "git-tree": "03b0eb80e437663830851f7891d02125694b4ee0", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index 875e8305d101e1..c2c8dda9941542 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.79.0", - "port-version": 0 + "port-version": 1 }, "boost-move": { "baseline": "1.79.0", @@ -1622,7 +1622,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 0 + "port-version": 1 }, "cpptoml": { "baseline": "v0.1.1", @@ -2898,7 +2898,7 @@ }, "igraph": { "baseline": "0.9.8", - "port-version": 1 + "port-version": 2 }, "iir1": { "baseline": "1.9.1", @@ -3446,7 +3446,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 2 + "port-version": 3 }, "libconfig": { "baseline": "1.7.3", @@ -3710,7 +3710,7 @@ }, "liblbfgs": { "baseline": "1.10", - "port-version": 1 + "port-version": 2 }, "liblemon": { "baseline": "2019-06-13", @@ -5226,7 +5226,7 @@ }, "orc": { "baseline": "1.6.4", - "port-version": 2 + "port-version": 3 }, "orocos-kdl": { "baseline": "1.4", @@ -5386,11 +5386,11 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 6 + "port-version": 7 }, "physx": { "baseline": "4.1.2", - "port-version": 2 + "port-version": 3 }, "picojson": { "baseline": "1.3.0", @@ -6378,7 +6378,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 2 + "port-version": 3 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -7305,7 +7305,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-12", + "baseline": "2022-04-21", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/c-/cpprestsdk.json b/versions/c-/cpprestsdk.json index 5372196d40b07d..4855a3314a3878 100644 --- a/versions/c-/cpprestsdk.json +++ b/versions/c-/cpprestsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b37c56224faff461184f427b95f10dc320d74d50", + "version": "2.10.18", + "port-version": 1 + }, { "git-tree": "a4c5e50b9a83b6f9142256d1142b371da93db065", "version-string": "2.10.18", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index c500e043d03ea1..3534d70151bfce 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "562fb321b0c46134d9b876fe95a3796fd4404b24", + "version": "0.9.8", + "port-version": 2 + }, { "git-tree": "635707a7146747b8b5a35ba35d5e94669e499d3b", "version": "0.9.8", diff --git a/versions/l-/libcerf.json b/versions/l-/libcerf.json index 7a35564988a5ec..471bb29f3df990 100644 --- a/versions/l-/libcerf.json +++ b/versions/l-/libcerf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1aed61567fd3da5dc36a9a5290262b389ab79fa5", + "version": "1.13", + "port-version": 3 + }, { "git-tree": "e4bb4a4b841e96215ccc856fa1b8acc56270a1e4", "version-string": "1.13", diff --git a/versions/l-/liblbfgs.json b/versions/l-/liblbfgs.json index e3c7174bb55b40..d562fe8f06f8ea 100644 --- a/versions/l-/liblbfgs.json +++ b/versions/l-/liblbfgs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf2ac29eb7e040dc4eefe6d623d5caa3b592de0", + "version": "1.10", + "port-version": 2 + }, { "git-tree": "f9251e490103e48e6ba9a01c6c61468381f0c8f1", "version-string": "1.10", diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 23e58df0a4be31..841853463a003c 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "543e83b37120267db3f81b5fdb3d349717b20135", + "version": "1.6.4", + "port-version": 3 + }, { "git-tree": "8cd78baa4d8b7df9077f76b8f5d600aac6e09716", "version-string": "1.6.4", diff --git a/versions/p-/physfs.json b/versions/p-/physfs.json index 7e719741c5465f..7961b91513989b 100644 --- a/versions/p-/physfs.json +++ b/versions/p-/physfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0acbb8771db07ce3e4641f015189fb48e732bdd5", + "version-semver": "3.0.2", + "port-version": 7 + }, { "git-tree": "17d9ad3560e379cc51921a51982f4d31d106f1ed", "version-semver": "3.0.2", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 22bd529f6220c1..89e0155e0af75a 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "304769b6a45107c9a8abf12fad9b9d82bac22c3b", + "version": "4.1.2", + "port-version": 3 + }, { "git-tree": "8e20a94664b966271a5e7684e73b2efab2461ba8", "version-semver": "4.1.2", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index e5e456632f8c56..bbabe4f468583a 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24fc8b7ae34a3a363c76820d4ca50f715648a0b2", + "version": "2.0.20", + "port-version": 3 + }, { "git-tree": "abf71c19917402dddef261e80d55c8ec04e9bf54", "version": "2.0.20", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index fd801a9bc4d763..6643af5d0fffd9 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8273918a04a5822ad7cc21ea5249402f2e999a7a", + "version-date": "2022-04-21", + "port-version": 0 + }, { "git-tree": "ef4a9463f802c1cd6f8b31e560529aeaee0faff4", "version-date": "2022-04-12", From c203e35d433f7109ad4ae113e079629e756b49a0 Mon Sep 17 00:00:00 2001 From: ChrisSchulte <41117938+ChrisSchulte@users.noreply.github.com> Date: Thu, 28 Apr 2022 03:55:39 +0200 Subject: [PATCH 128/383] [simage] update version to 1.8.2 (#24125) * Update simage port for version 1.8.2 * Correction of Fatal message in patch file. * Update version database * Added license entry. * Update version database * Corrected port version number * Corrected vcpkg port versioning. * Corrected hash. --- ports/simage/portfile.cmake | 6 ++--- ports/simage/requies-all-dependencies.patch | 29 +++++++++++++-------- ports/simage/vcpkg.json | 4 +-- versions/baseline.json | 4 +-- versions/s-/simage.json | 5 ++++ 5 files changed, 30 insertions(+), 18 deletions(-) diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake index 8e451405557284..ff1611082cdacb 100644 --- a/ports/simage/portfile.cmake +++ b/ports/simage/portfile.cmake @@ -1,10 +1,10 @@ -set(SIMAGE_VERSION 1.8.1) +set(SIMAGE_VERSION 1.8.2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Coin3D/simage - REF 72bdc2fddb171ab08325ced9c4e04b27bbd2da6c #v1.8.1 - SHA512 8e0d4b246318e9a08d9a17e0550fae4e3902e5d14ff9d7e43569624d1ceb9308c1cbc2401cedc4bff4da8b136fc57fc6b11c6800f1db15914b13186b0d5dc8f1 + REF 3940692136e02b9e62b3061cf72f053827b5494e #v1.8.2 + SHA512 9a39738e32004bdd3e2882fe96778c773758b6d74398a62ba1c5ab09836c0637f89b8a46e8485b9d4196f33864f31f75511f441cfc24d7536659fa610ddf1875 HEAD_REF master PATCHES requies-all-dependencies.patch ) diff --git a/ports/simage/requies-all-dependencies.patch b/ports/simage/requies-all-dependencies.patch index ef0536a960c65e..a0765f8a9f0286 100644 --- a/ports/simage/requies-all-dependencies.patch +++ b/ports/simage/requies-all-dependencies.patch @@ -1,21 +1,28 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d869715..073a73f 100644 +index ef92706..fee22e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -117,10 +117,10 @@ endif() - # On Windows GDI+ supports GIF, JPEG, EXIF, PNG, and TIFF. - # see https://docs.microsoft.com/en-us/windows/desktop/gdiplus/-gdiplus-types-of-bitmaps-about - if(SIMAGE_USE_GDIPLUS) -- find_package(GdiPlus) -+ find_package(GdiPlus REQUIRED) +@@ -129,6 +129,9 @@ if(SIMAGE_USE_GDIPLUS) + } + " GDIPLUS_FOUND) + unset(CMAKE_REQUIRED_LIBRARIES) ++ if(NOT GDIPLUS_FOUND) ++ message(FATAL_ERROR "GDI+ is required on Windows.") ++ endif() endif() if(SIMAGE_USE_AVIENC) -- find_package(Vfw) -+ find_package(Vfw REQUIRED) + set(CMAKE_REQUIRED_LIBRARIES vfw32) +@@ -142,6 +145,9 @@ if(SIMAGE_USE_AVIENC) + } + " VFW_FOUND) + unset(CMAKE_REQUIRED_LIBRARIES) ++ if(NOT VFW_FOUND) ++ message(FATAL_ERROR "Video for Windows is required on Windows.") ++ endif() endif() # On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA. -@@ -267,7 +267,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT) +@@ -286,7 +292,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT) find_package(Ogg REQUIRED) find_package(Vorbis REQUIRED) if(OGG_FOUND) @@ -24,7 +31,7 @@ index d869715..073a73f 100644 endif() endif() -@@ -287,8 +287,8 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD +@@ -306,8 +312,8 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD if(SIMAGE_TIFF_SUPPORT) find_package(TIFF REQUIRED) if(TIFF_FOUND) diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json index 784879b1a815c7..c02cb098bcf821 100644 --- a/ports/simage/vcpkg.json +++ b/ports/simage/vcpkg.json @@ -1,9 +1,9 @@ { "name": "simage", - "version-semver": "1.8.1", - "port-version": 4, + "version-semver": "1.8.2", "description": "Image file format library abstraction layer", "homepage": "https://github.com/coin3d/simage", + "license": null, "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index c2c8dda9941542..f53d02771272c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6489,8 +6489,8 @@ "port-version": 4 }, "simage": { - "baseline": "1.8.1", - "port-version": 4 + "baseline": "1.8.2", + "port-version": 0 }, "simbody": { "baseline": "2022-01-04", diff --git a/versions/s-/simage.json b/versions/s-/simage.json index 6f298cfd70e1a8..76fc0327589a8d 100644 --- a/versions/s-/simage.json +++ b/versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a3815e60349ce152d08a7f02abab301e3b6bceb", + "version-semver": "1.8.2", + "port-version": 0 + }, { "git-tree": "6c2ccc36f5c1ebb27f820fe4f6e89df014e4bafa", "version-semver": "1.8.1", From 7bb00fe8b52cea6cca77d163c301233cdea8efc8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 28 Apr 2022 03:59:20 +0200 Subject: [PATCH 129/383] [c-ares] Fix usage (#24385) * Minor changes * Guard creation of imported lib * Add usage * Update versions --- ports/c-ares/guard-imported-lib.patch | 21 +++++++++++++++++++++ ports/c-ares/portfile.cmake | 7 ++++--- ports/c-ares/usage | 4 ++++ ports/c-ares/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/c-ares.json | 5 +++++ 6 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 ports/c-ares/guard-imported-lib.patch create mode 100644 ports/c-ares/usage diff --git a/ports/c-ares/guard-imported-lib.patch b/ports/c-ares/guard-imported-lib.patch new file mode 100644 index 00000000000000..8cb0de4dd69df1 --- /dev/null +++ b/ports/c-ares/guard-imported-lib.patch @@ -0,0 +1,21 @@ +diff --git a/c-ares-config.cmake.in b/c-ares-config.cmake.in +index 464837b..b3c2bc4 100644 +--- a/c-ares-config.cmake.in ++++ b/c-ares-config.cmake.in +@@ -8,12 +8,16 @@ include("${CMAKE_CURRENT_LIST_DIR}/c-ares-targets.cmake") + set(c-ares_LIBRARY c-ares::cares) + + if(@CARES_SHARED@) ++ if(NOT TARGET c-ares::cares_shared) + add_library(c-ares::cares_shared INTERFACE IMPORTED) + set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") ++ endif() + set(c-ares_SHARED_LIBRARY c-ares::cares_shared) + elseif(@CARES_STATIC@) ++ if(NOT TARGET c-ares::cares_static) + add_library(c-ares::cares_static INTERFACE IMPORTED) + set_target_properties(c-ares::cares_static PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") ++ endif() + endif() + + if(@CARES_STATIC@) diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index f21cd6c586d59e..9e8f9d85255ea1 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF main PATCHES avoid-docs.patch + guard-imported-lib.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -28,17 +29,17 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/c-ares) vcpkg_fixup_pkgconfig() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/include/ares.h" "#ifdef CARES_STATICLIB" "#if 1" ) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") # Empty folders endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/c-ares/usage b/ports/c-ares/usage new file mode 100644 index 00000000000000..f560e8d641653a --- /dev/null +++ b/ports/c-ares/usage @@ -0,0 +1,4 @@ +The package c-ares provides CMake targets: + + find_package(c-ares CONFIG REQUIRED) + target_link_libraries(main PRIVATE c-ares::cares) diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json index b8f9a87468bb17..488c5645ae3b20 100644 --- a/ports/c-ares/vcpkg.json +++ b/ports/c-ares/vcpkg.json @@ -1,9 +1,10 @@ { "name": "c-ares", "version-semver": "1.18.1", + "port-version": 1, "description": "A C library for asynchronous DNS requests", "homepage": "https://github.com/c-ares/c-ares", - "license": "MIT", + "license": "MIT-CMU", "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index f53d02771272c3..73eaf6ff1d22dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1202,7 +1202,7 @@ }, "c-ares": { "baseline": "1.18.1", - "port-version": 0 + "port-version": 1 }, "c-dbg-macro": { "baseline": "2020-02-29", diff --git a/versions/c-/c-ares.json b/versions/c-/c-ares.json index 85b6c17c075de9..e6098a33b1d4b2 100644 --- a/versions/c-/c-ares.json +++ b/versions/c-/c-ares.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15542c1c419b7874a8d3229cdf6366361e376a57", + "version-semver": "1.18.1", + "port-version": 1 + }, { "git-tree": "60b32d4ff262f2603153b8496e39f7b0aba39f99", "version-semver": "1.18.1", From a7de685ed1850760dfb26cc5494645ea85bc50a2 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 27 Apr 2022 18:59:45 -0700 Subject: [PATCH 130/383] [zookeeper] Update to version 3.5.6 (#24424) * [zookeeper] Update to version 3.5.6 * x-add-version * format portfile.cmake * update version Co-authored-by: Lily Wang --- ports/zookeeper/portfile.cmake | 29 ++++++++++++++--------------- ports/zookeeper/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 4 ++-- versions/z-/zookeeper.json | 5 +++++ 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/ports/zookeeper/portfile.cmake b/ports/zookeeper/portfile.cmake index 1dfcfb376b2fcf..ff67f075062423 100644 --- a/ports/zookeeper/portfile.cmake +++ b/ports/zookeeper/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "https://archive.apache.org/dist/zookeeper/zookeeper-3.5.5/apache-zookeeper-3.5.5.tar.gz" - FILENAME "zookeeper-3.5.5.tar.gz" - SHA512 4e22df899a83ca3cc15f6d94daadb1a8631fb4108e67b4f56d1f4fcf95f10f89c8ff1fb8a7c84799a3856d8803a8db1e1f2f3fe1b7dc0d6cedf485ef90fd212d + URLS "https://archive.apache.org/dist/zookeeper/zookeeper-3.5.6/apache-zookeeper-3.5.6.tar.gz" + FILENAME "zookeeper-3.5.6.tar.gz" + SHA512 7f45817cbbc42aec5a7817fa2ae99656128e666dc58ace23d86bcfc5ca0dc49e418d1a7d1f082ad80ccb916f9f1b490167d16f836886af1a56fbcf720ad3b9d0 ) vcpkg_extract_source_archive_ex( @@ -14,26 +14,25 @@ vcpkg_extract_source_archive_ex( win32.patch ) -set(WANT_SYNCAPI OFF) -if("sync" IN_LIST FEATURES) - set(WANT_SYNCAPI ON) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sync WANT_SYNCAPI +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/zookeeper-client/zookeeper-client-c +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/zookeeper-client/zookeeper-client-c" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DWANT_CPPUNIT=OFF - -DWANT_SYNCAPI=${WANT_SYNCAPI} + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/zookeeper-client/zookeeper-client-c/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zookeeper RENAME copyright) +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets() +file(INSTALL "${SOURCE_PATH}/zookeeper-client/zookeeper-client-c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/zookeeper/vcpkg.json b/ports/zookeeper/vcpkg.json index 20e655e5aa6ca1..eee539a28d92e1 100644 --- a/ports/zookeeper/vcpkg.json +++ b/ports/zookeeper/vcpkg.json @@ -1,8 +1,19 @@ { "name": "zookeeper", - "version-string": "3.5.5", - "port-version": 2, + "version": "3.5.6", "description": "ZooKeeper C bindings", + "homepage": "https://github.com/apache/zookeeper", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "sync" ], diff --git a/versions/baseline.json b/versions/baseline.json index 73eaf6ff1d22dc..0e61f699727a49 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7697,8 +7697,8 @@ "port-version": 0 }, "zookeeper": { - "baseline": "3.5.5", - "port-version": 2 + "baseline": "3.5.6", + "port-version": 0 }, "zopfli": { "baseline": "1.0.3", diff --git a/versions/z-/zookeeper.json b/versions/z-/zookeeper.json index ab8b9e6789acdd..61432ca7df53c7 100644 --- a/versions/z-/zookeeper.json +++ b/versions/z-/zookeeper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ad08d6a8c4d4f812c50c02872d046c84dd4ccbc", + "version": "3.5.6", + "port-version": 0 + }, { "git-tree": "44fbecb403595fea598756cf946b00e0a2f21dad", "version-string": "3.5.5", From a106de33bbee694e3be6243718aa2a549a692832 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 28 Apr 2022 04:00:17 +0200 Subject: [PATCH 131/383] [asio-grpc] Update to 1.6.0 (#24438) --- ports/asio-grpc/portfile.cmake | 4 ++-- ports/asio-grpc/vcpkg.json | 2 +- versions/a-/asio-grpc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index d20401ff85efde..5119aee15c49ee 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc - REF v1.5.1 - SHA512 528a790a7414db1b03b20d4d82d510a08cba9fc3c99501955c60c28ce4d768202a4339241b9e99f0199deb379345dc75934f991bad735eda0b32eb6cb3cef587 + REF v1.6.0 + SHA512 4ea06c09c869cb1752714f969366d794b67048b42bff0790543d3305ce656238a4dadd06dfff1c2229add8a0ff730f30c70d944681979e3e983d4ec1d3ce3208 HEAD_REF master ) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index 2e29237459b240..55790c0ca1124c 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio-grpc", - "version": "1.5.1", + "version": "1.6.0", "description": "Asynchronous gRPC with Asio/unified executors", "homepage": "https://github.com/Tradias/asio-grpc", "license": "Apache-2.0", diff --git a/versions/a-/asio-grpc.json b/versions/a-/asio-grpc.json index 86b491f9a3ddad..3c91e63e37d25a 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6decc4befbc311b08e2229bf58da567d8a86561c", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "56b29ba569fb72539675ca51ecf3c83fcf8eb0ba", "version": "1.5.1", diff --git a/versions/baseline.json b/versions/baseline.json index 0e61f699727a49..c2cc893f919c15 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -181,7 +181,7 @@ "port-version": 0 }, "asio-grpc": { - "baseline": "1.5.1", + "baseline": "1.6.0", "port-version": 0 }, "asiosdk": { From 53b90be27f88d0da5ccd91c7bd3aaed790d2289b Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 29 Apr 2022 06:31:38 +0800 Subject: [PATCH 132/383] [symengine] update to 0.9.0 (#23483) * [symengine] update to 0.9.0 * update version * Add license * update version --- ports/symengine/fix-build.patch | 13 ------------- ports/symengine/portfile.cmake | 6 ++---- ports/symengine/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/s-/symengine.json | 5 +++++ 5 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 ports/symengine/fix-build.patch diff --git a/ports/symengine/fix-build.patch b/ports/symengine/fix-build.patch deleted file mode 100644 index 5087428e60f7f7..00000000000000 --- a/ports/symengine/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/symengine/mp_boost.cpp b/symengine/mp_boost.cpp -index db20930c4..f3997707e 100644 ---- a/symengine/mp_boost.cpp -+++ b/symengine/mp_boost.cpp -@@ -279,7 +279,7 @@ unsigned long mp_scan1(const integer_class &i) - if (i == 0) { - return ULONG_MAX; - } -- return find_lsb(i, int_<0>()); -+ return find_lsb(i, {}); - } - - // define simple 2x2 matrix with exponentiation by repeated squaring diff --git a/ports/symengine/portfile.cmake b/ports/symengine/portfile.cmake index f9e140498f4689..dc0329930041fe 100644 --- a/ports/symengine/portfile.cmake +++ b/ports/symengine/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO symengine/symengine - REF v0.7.0 - SHA512 fd3198bc4a05ca2b9b8a58039cc21af65b44457f295362a1a9b8dbf9c6e3df5186c0c84b289bc9fe85d9efd5ac1a683f6b7ba9a661fb6d913d6ceefb14ee2348 + REF 7b1880824c2cce98787ae29a317682ba6c294484 #v0.9.0 + SHA512 745b2616b88032ff047a28e46b703bc1912d109524f8aa411a5b7a650a6d89d3f16dc92812381e95b13bc5cf61218d2ff3db9d3809443264340eae180968cbcf HEAD_REF master - PATCHES - fix-build.patch ) vcpkg_check_features( diff --git a/ports/symengine/vcpkg.json b/ports/symengine/vcpkg.json index 3efe22af9aa070..8257978180f68f 100644 --- a/ports/symengine/vcpkg.json +++ b/ports/symengine/vcpkg.json @@ -1,9 +1,9 @@ { "name": "symengine", - "version": "0.7.0", - "port-version": 2, + "version": "0.9.0", "description": "SymEngine is a fast symbolic manipulation library", "homepage": "https://github.com/symengine/symengine", + "license": "BSD-3-Clause", "dependencies": [ "boost-math", "boost-random", diff --git a/versions/baseline.json b/versions/baseline.json index c2cc893f919c15..ba1df1b5761dbd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6821,8 +6821,8 @@ "port-version": 5 }, "symengine": { - "baseline": "0.7.0", - "port-version": 2 + "baseline": "0.9.0", + "port-version": 0 }, "systemc": { "baseline": "2.3.3", diff --git a/versions/s-/symengine.json b/versions/s-/symengine.json index 5006516fc4c395..3ac8fdb5461a8f 100644 --- a/versions/s-/symengine.json +++ b/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd28d6549b4c7db81ef2ee9e91a4e41b0c739191", + "version": "0.9.0", + "port-version": 0 + }, { "git-tree": "b0ac6670bebc9a0903adaae9b35f9f444c4e8806", "version": "0.7.0", From 0d71120fc2babf2e357321b871c7d3e6aa195cc7 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Thu, 28 Apr 2022 15:32:04 -0700 Subject: [PATCH 133/383] [harfbuzz] Update to 4.2.0 (#24144) * updated harfbuzz from 3.2.0 to 4.2.0 * updated version * Update ports/harfbuzz/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * updated version * Removed paths from library definitions in *.pc files in case of windows static build\nRemoved patches * version-semver -> version * Delete no longer applied patches. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- .../0001-circumvent-samefile-error.patch | 42 ------------------ ports/harfbuzz/0002-fix-uwp-build.patch | 15 ------- ports/harfbuzz/fix-macos-build.diff | 43 ------------------- ports/harfbuzz/fix-mingw-build.patch | 17 -------- ports/harfbuzz/portfile.cmake | 28 +++++++----- ports/harfbuzz/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/h-/harfbuzz.json | 5 +++ 8 files changed, 25 insertions(+), 132 deletions(-) delete mode 100755 ports/harfbuzz/0001-circumvent-samefile-error.patch delete mode 100644 ports/harfbuzz/0002-fix-uwp-build.patch delete mode 100644 ports/harfbuzz/fix-macos-build.diff delete mode 100644 ports/harfbuzz/fix-mingw-build.patch diff --git a/ports/harfbuzz/0001-circumvent-samefile-error.patch b/ports/harfbuzz/0001-circumvent-samefile-error.patch deleted file mode 100755 index 40aaac0b4d2d68..00000000000000 --- a/ports/harfbuzz/0001-circumvent-samefile-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/gen-harfbuzzcc.py b/src/gen-harfbuzzcc.py -index b25bcc7..f3bc87a 100644 ---- a/src/gen-harfbuzzcc.py -+++ b/src/gen-harfbuzzcc.py -@@ -15,4 +15,8 @@ with open (OUTPUT, "wb") as f: - f.write ("".join ('#include "{}"\n'.format (os.path.basename (x)) for x in sources if x.endswith (".cc")).encode ()) - - # copy it also to src/ --shutil.copyfile (OUTPUT, os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT))) -+src = OUTPUT -+dst = os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT)) -+# Avoid SameFileError -+if not os.path.samefile(src, dst): -+ shutil.copyfile (src, dst) -diff --git a/src/gen-hb-version.py b/src/gen-hb-version.py -index 879811f..c376721 100644 ---- a/src/gen-hb-version.py -+++ b/src/gen-hb-version.py -@@ -33,4 +33,8 @@ with open (INPUT, "r", encoding='utf-8') as template: - .encode ()) - - # copy it also to src/ --shutil.copyfile (OUTPUT, os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT))) -+src = OUTPUT -+dst = os.path.join(CURRENT_SOURCE_DIR, os.path.basename (OUTPUT)) -+# Avoid SameFileError if src and dst is the same -+if not os.path.samefile(src, dst): -+ shutil.copyfile (src, dst) -diff --git a/src/gen-ragel-artifacts.py b/src/gen-ragel-artifacts.py -index d22e03a..2b1e819 100644 ---- a/src/gen-ragel-artifacts.py -+++ b/src/gen-ragel-artifacts.py -@@ -22,4 +22,8 @@ hh = rl.replace ('.rl', '.hh') - subprocess.Popen (ragel.split() + ['-e', '-F1', '-o', hh, rl], cwd=outdir).wait () - - # copy it also to src/ --shutil.copyfile (os.path.join (outdir, hh), os.path.join (CURRENT_SOURCE_DIR, hh)) -+src = os.path.join (outdir, hh) -+dst = os.path.join (CURRENT_SOURCE_DIR, hh) -+# Avoid SameFileError -+if not os.path.samefile(src, dst): -+ shutil.copyfile (src, dst) diff --git a/ports/harfbuzz/0002-fix-uwp-build.patch b/ports/harfbuzz/0002-fix-uwp-build.patch deleted file mode 100644 index beb5ce750e405a..00000000000000 --- a/ports/harfbuzz/0002-fix-uwp-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/hb-ft.cc b/src/hb-ft.cc -index 1900f30..add9917 100644 ---- a/src/hb-ft.cc -+++ b/src/hb-ft.cc -@@ -31,6 +31,10 @@ - - #include "hb-ft.h" - -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) -+#define generic GenericFromFreeTypeLibrary -+#endif -+ - #include "hb-font.hh" - #include "hb-machinery.hh" - #include "hb-cache.hh" diff --git a/ports/harfbuzz/fix-macos-build.diff b/ports/harfbuzz/fix-macos-build.diff deleted file mode 100644 index 3d0f8b5ceb0768..00000000000000 --- a/ports/harfbuzz/fix-macos-build.diff +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc -index 5f383064c4..6ccc1b0a2b 100644 ---- a/src/hb-coretext.cc -+++ b/src/hb-coretext.cc -@@ -897,7 +897,7 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, - DEBUG_MSG (CORETEXT, nullptr, "Num runs: %d", num_runs); - - buffer->len = 0; -- uint32_t status_and = ~0, status_or = 0; -+ uint32_t status_or = 0; - CGFloat advances_so_far = 0; - /* For right-to-left runs, CoreText returns the glyphs positioned such that - * any trailing whitespace is to the left of (0,0). Adjust coordinate system -@@ -918,7 +918,6 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, - CTRunRef run = static_cast(CFArrayGetValueAtIndex (glyph_runs, i)); - CTRunStatus run_status = CTRunGetStatus (run); - status_or |= run_status; -- status_and &= run_status; - DEBUG_MSG (CORETEXT, run, "CTRunStatus: %x", run_status); - CGFloat run_advance = CTRunGetTypographicBounds (run, range_all, nullptr, nullptr, nullptr); - if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction)) -@@ -1140,21 +1139,6 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, - buffer->len += num_glyphs; - } - -- /* Mac OS 10.6 doesn't have kCTTypesetterOptionForcedEmbeddingLevel, -- * or if it does, it doesn't respect it. So we get runs with wrong -- * directions. As such, disable the assert... It wouldn't crash, but -- * cursoring will be off... -- * -- * https://crbug.com/419769 -- */ -- if (false) -- { -- /* Make sure all runs had the expected direction. */ -- HB_UNUSED bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); -- assert (bool (status_and & kCTRunStatusRightToLeft) == backward); -- assert (bool (status_or & kCTRunStatusRightToLeft) == backward); -- } -- - buffer->clear_positions (); - - unsigned int count = buffer->len; diff --git a/ports/harfbuzz/fix-mingw-build.patch b/ports/harfbuzz/fix-mingw-build.patch deleted file mode 100644 index 25fa3662238d63..00000000000000 --- a/ports/harfbuzz/fix-mingw-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/meson.build b/meson.build -index 41344b3a33..8fb68f296a 100644 ---- a/meson.build -+++ b/meson.build -@@ -57,6 +57,12 @@ if host_machine.cpu_family() == 'arm' and cpp.alignment('struct { char c; }') != - endif - endif - -+if host_machine.system() == 'windows' -+ add_project_arguments(cpp.get_supported_arguments([ -+ '-Wa,-mbig-obj' -+ ]), language : 'cpp') -+endif -+ - check_headers = [ - ['unistd.h'], - ['sys/mman.h'], diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index a597b5f1f3c7f4..426150b7c999db 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,18 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 3.2.0 - SHA512 5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18 + REF 4.2.0 + SHA512 2aff1e6a41d6186b71f2915296c46c0b2ffc67371e1f05c13a62c237ff7a84d7d78d414d7a395e1616a2861c83c4792ef5936a492713780564b994d18e2d3e38 HEAD_REF master - PATCHES - # This patch is a workaround that is needed until the following issues are resolved upstream: - # - https://github.com/mesonbuild/meson/issues/8375 - # - https://github.com/harfbuzz/harfbuzz/issues/2870 - # Details: https://github.com/microsoft/vcpkg/issues/16262 - 0001-circumvent-samefile-error.patch - 0002-fix-uwp-build.patch - fix-macos-build.diff # fixes https://github.com/harfbuzz/harfbuzz/issues/3484 - fix-mingw-build.patch # https://github.com/harfbuzz/harfbuzz/pull/3385 ) if("icu" IN_LIST FEATURES) @@ -65,6 +56,21 @@ vcpkg_install_meson() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(GLOB PC_FILES + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc") + + foreach(PC_FILE IN LISTS PC_FILES) + file(READ "${PC_FILE}" PC_FILE_CONTENT) + string(REGEX REPLACE + "\\$\\{prefix\}\\/lib\\/([a-zA-Z0-9\-]*)\\.lib" + "-l\\1" PC_FILE_CONTENT + "${PC_FILE_CONTENT}") + file(WRITE "${PC_FILE}" ${PC_FILE_CONTENT}) + endforeach() +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") configure_file("${CMAKE_CURRENT_LIST_DIR}/harfbuzzConfig.cmake.in" diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 701d00f86fdff6..9d86ed458a98dc 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,6 @@ { "name": "harfbuzz", - "version-semver": "3.2.0", - "port-version": 3, + "version": "4.2.0", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index ba1df1b5761dbd..13ce44f1cf2a5c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2721,8 +2721,8 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "3.2.0", - "port-version": 3 + "baseline": "4.2.0", + "port-version": 0 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index f6416d8e1d889a..32ecc780ae1f40 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02ad2865be7815604bb2c0e6cbc368f3d23d93d6", + "version": "4.2.0", + "port-version": 0 + }, { "git-tree": "1c4a2589742ad6156667771b0cf38ecb46e8c797", "version-semver": "3.2.0", From d1904c8625998205e7da69a275e68a3b3e092689 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 28 Apr 2022 22:53:44 +0000 Subject: [PATCH 134/383] [gdk-pixbuf] update to 2.42.8 (#24427) * [gdk-pixbuf] Update to 2.42.8 (microsoft#24426) * [gdk-pixbuf] Regenerate patch (microsoft#24426) * [gdk-pixbuf] Use enabled/disabled for features (microsoft#24426) * [gdk-pixbuf] Add glib-compile-resources to the used binary list (microsoft#24426) * [gdk-pixbuf] Remove obsolete patch (microsoft#24426) * [gdk-pixbuf] regenerate version registries (microsoft#24426) --- ports/gdk-pixbuf/fix_build.patch | 67 ------------------- .../gdk-pixbuf/fix_build_error_windows.patch | 6 +- ports/gdk-pixbuf/portfile.cmake | 17 ++--- ports/gdk-pixbuf/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/g-/gdk-pixbuf.json | 5 ++ 6 files changed, 19 insertions(+), 83 deletions(-) delete mode 100644 ports/gdk-pixbuf/fix_build.patch diff --git a/ports/gdk-pixbuf/fix_build.patch b/ports/gdk-pixbuf/fix_build.patch deleted file mode 100644 index 2afdd9c86c4741..00000000000000 --- a/ports/gdk-pixbuf/fix_build.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/build-aux/post-install.bat b/build-aux/post-install.bat -index 6994d49e1..b4789dd62 100644 ---- a/build-aux/post-install.bat -+++ b/build-aux/post-install.bat -@@ -7,8 +7,8 @@ set binary_version=%3 - set libdir_windows=%libdir:/=\% - - if not "%DESTDIR%" == "" goto warn_msg --if not exist %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\ mkdir %libdir_windows%\gdk-pixbuf-2.0\%binary_version% --%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache -+if not exist %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\ mkdir %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version% -+%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\loaders.cache - - goto end - -@@ -18,7 +18,7 @@ echo *** Warning: loaders.cache not built - echo *** - echo *** You should generate this file manually on the host system - echo *** using: --echo *** gdk-pixbuf-query-loaders ^> %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache -+echo *** gdk-pixbuf-query-loaders ^> %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\loaders.cache - echo *** - - :end -diff --git a/build-aux/post-install.sh b/build-aux/post-install.sh -index 661bceeef..0b1a46527 100644 ---- a/build-aux/post-install.sh -+++ b/build-aux/post-install.sh -@@ -5,14 +5,14 @@ libdir="$2" - binary_version="$3" - - if [ -z "$DESTDIR" ]; then -- mkdir -p "$libdir/gdk-pixbuf-2.0/$binary_version" -- $bindir/gdk-pixbuf-query-loaders > "$libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache" -+ mkdir -p "$libdir/../gdk-pixbuf-2.0/$binary_version" -+ $bindir/gdk-pixbuf-query-loaders > "$libdir/../gdk-pixbuf-2.0/$binary_version/loaders.cache" - else - echo "***" - echo "*** Warning: loaders.cache not built" - echo "***" - echo "*** You should generate this file manually on the host system" - echo "*** using:" -- echo "*** gdk-pixbuf-query-loaders > $libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache" -+ echo "*** gdk-pixbuf-query-loaders > $libdir/../gdk-pixbuf-2.0/$binary_version/loaders.cache" - echo "***" - fi -diff --git a/meson.build b/meson.build -index c38607029..4b5df91ae 100644 ---- a/meson.build -+++ b/meson.build -@@ -308,12 +310,12 @@ endif - # Don't check and build the jpeg loader if native_windows_loaders is true - if get_option('jpeg') and not native_windows_loaders - if cc.has_header('jpeglib.h') -- jpeg_dep = cc.find_library('jpeg', required: false) -- if cc.get_id() == 'msvc' and not jpeg_dep.found() -+ jpeg_dep = dependency('libjpeg', required: false) -+ #if cc.get_id() == 'msvc' and not jpeg_dep.found() - # The IJG JPEG library builds the .lib file as libjpeg.lib in its MSVC build system, - # so look for it as well when jpeg.lib cannot be found -- jpeg_dep = cc.find_library('libjpeg', required: false) -- endif -+ # jpeg_dep = cc.find_library('libjpeg', required: false) -+ #endif - if jpeg_dep.found() and cc.has_function('jpeg_destroy_decompress', dependencies: jpeg_dep) - enabled_loaders += 'jpeg' - loaders_deps += jpeg_dep diff --git a/ports/gdk-pixbuf/fix_build_error_windows.patch b/ports/gdk-pixbuf/fix_build_error_windows.patch index b6f6332dac9189..b213ac865fd79a 100644 --- a/ports/gdk-pixbuf/fix_build_error_windows.patch +++ b/ports/gdk-pixbuf/fix_build_error_windows.patch @@ -1,8 +1,6 @@ -diff --git a/meson.build b/meson.build -index b39c55d..4b050c7 100644 --- a/meson.build +++ b/meson.build -@@ -89,8 +89,14 @@ if cc.has_function('round', dependencies: mathlib_dep) +@@ -90,8 +90,14 @@ gdk_pixbuf_conf.set('HAVE_ROUND', 1) endif @@ -18,4 +16,4 @@ index b39c55d..4b050c7 100644 + endif endif - if cc.has_function('bind_textdomain_codeset', prefix: '#include ') + intl_dep = cc.find_library('intl', required: false) diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index bf16064f89e9ea..9451c30ecfccc6 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -1,17 +1,16 @@ set(GDK_PIXBUF_VERSION 2.42) -set(GDK_PIXBUF_PATCH 2) +set(GDK_PIXBUF_PATCH 8) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz" FILENAME "gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz" - SHA512 f341d032ea410efed7a35f8ca6a7389bf988f663dae16e774d114d6f11611e9e182c835e90d752b71c258c905cc5c4c785ea697feed5e6921a2a676c9deaa5f2 + SHA512 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - fix_build.patch fix_build_error_windows.patch ) if(VCPKG_TARGET_IS_WINDOWS) @@ -23,18 +22,20 @@ vcpkg_configure_meson( -Dman=false # Whether to generate man pages (requires xlstproc) -Dgtk_doc=false # Whether to generate the API reference (requires GTK-Doc) -Ddocs=false - -Dpng=true # Enable PNG loader (requires libpng) - -Dtiff=true # Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used - -Djpeg=true # Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used + -Dpng=enabled # Enable PNG loader (requires libpng) + -Dtiff=enabled # Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used + -Djpeg=enabled # Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used -Dintrospection=disabled # Whether to generate the API introspection data (requires GObject-Introspection) -Drelocatable=true # Whether to enable application bundle relocation support -Dinstalled_tests=false -Dgio_sniffing=false # Perform file type detection using GIO (Unused on MacOS and Windows) -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located; # Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf - ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources' + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + ADDITIONAL_CROSS_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources' + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ) vcpkg_install_meson(ADD_BIN_TO_PATH) diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index 45a085d52babd5..a8c88501df1f86 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdk-pixbuf", - "version": "2.42.2", - "port-version": 2, + "version": "2.42.8", "description": "Image loading library.", "homepage": "https://developer.gnome.org/gdk-pixbuf/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 13ce44f1cf2a5c..b143316629792a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2437,8 +2437,8 @@ "port-version": 1 }, "gdk-pixbuf": { - "baseline": "2.42.2", - "port-version": 2 + "baseline": "2.42.8", + "port-version": 0 }, "gemmlowp": { "baseline": "2021-09-28", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index d431dc9220e33c..1551e55a4630c9 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad94c8b8ea1bd1f66085e17b9763b22080d6bf6b", + "version": "2.42.8", + "port-version": 0 + }, { "git-tree": "c6274b79c119e29062eaaa6ad99271fe868f0288", "version": "2.42.2", From 66818c9f1daab224e614d5bf1be0aacb4a5d4e64 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 28 Apr 2022 15:54:08 -0700 Subject: [PATCH 135/383] Put hash-library files in a subdirectory to avoid: (#24433) ``` Starting package 895/1846: hash-library:x86-windows Building package hash-library[core]:x86-windows... -- Note: hash-library only supports static library linkage. Building static library. -- Downloading https://github.com/stbrumme/hash-library/archive/hash_library_v8.tar.gz -> stbrumme-hash-library-hash_library_v8.tar.gz... -- Extracting source D:/downloads/stbrumme-hash-library-hash_library_v8.tar.gz -- Applying patch 001-fix-macos.patch -- Using source at D:/buildtrees/hash-library/src/library_v8-6124f7a6ce.clean -- Found external ninja('1.10.2'). -- Configuring x86-windows -- Building x86-windows-dbg -- Building x86-windows-rel -- Installing: D:/packages/hash-library_x86-windows/share/hash-library/copyright -- Performing post-build validation -- Performing post-build validation done Uploaded binaries to 1 HTTP remotes. Installing package hash-library[core]:x86-windows... The following files are already installed in D:/installed/x86-windows and are in conflict with hash-library:x86-windows Installed by czmq:x86-windows include/sha1.h Elapsed time for package hash-library:x86-windows: 3.227 s ``` --- ports/hash-library/CMakeLists.txt | 4 ++-- ports/hash-library/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/h-/hash-library.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/hash-library/CMakeLists.txt b/ports/hash-library/CMakeLists.txt index e6a22af2cfe6f2..dbc1d8ea73d2cf 100644 --- a/ports/hash-library/CMakeLists.txt +++ b/ports/hash-library/CMakeLists.txt @@ -23,10 +23,10 @@ set(SRCS add_library(hash-library ${SRCS}) -target_include_directories(hash-library PUBLIC $ $) +target_include_directories(hash-library PUBLIC $ $) if(NOT DISABLE_INSTALL_HEADERS) - install(FILES ${HEADERS} DESTINATION include) + install(FILES ${HEADERS} DESTINATION include/hash-library) endif() install( diff --git a/ports/hash-library/vcpkg.json b/ports/hash-library/vcpkg.json index 3f1cefaeb4fa63..0f3ad3dc7ceffe 100644 --- a/ports/hash-library/vcpkg.json +++ b/ports/hash-library/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hash-library", "version": "8", + "port-version": 1, "description": "Portable C++ hashing library", "homepage": "https://create.stephan-brumme.com/hash-library/", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index b143316629792a..8ac0d2abfbc318 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2726,7 +2726,7 @@ }, "hash-library": { "baseline": "8", - "port-version": 0 + "port-version": 1 }, "hayai": { "baseline": "2019-08-10", diff --git a/versions/h-/hash-library.json b/versions/h-/hash-library.json index f791be9fa1ea6f..49ef797b934559 100644 --- a/versions/h-/hash-library.json +++ b/versions/h-/hash-library.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fad55dc152114a3f71c5eafd33a3facd7e3a2286", + "version": "8", + "port-version": 1 + }, { "git-tree": "c7e4fae9255d5bdacac11e7a7dc550df777b8b37", "version": "8", From 26ad3c7b3edbe08e33eaa87af498fd3acc349815 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 28 Apr 2022 23:00:38 +0000 Subject: [PATCH 136/383] [fribidi] Update to 1.0.12 (microsoft#24443) (#24444) --- ports/fribidi/portfile.cmake | 4 ++-- ports/fribidi/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/fribidi.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index 712d031049b6d5..b112c046c32d09 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fribidi/fribidi - REF v1.0.11 - SHA512 9ddb0dbfb28ee4f1d9dd5d46fe1fff75c5446bfdacaabf8647847c36ef72eec823f6e6d6d1369d67c292d680004f7113c9e69114a8fae1d73ab11a58c66a8b8a + REF v1.0.12 + SHA512 a3a63e1dde1cffb097376df0b34522700cff600da61bdafd6f4f50db6937383b9f73a82081cb1a7f2e1946ba07fea13e2880a4250b1508850bffa500046a7fa5 HEAD_REF master PATCHES meson-crosscompile.patch ) diff --git a/ports/fribidi/vcpkg.json b/ports/fribidi/vcpkg.json index 40ec254c5d8ce6..0b28f86bcf0623 100644 --- a/ports/fribidi/vcpkg.json +++ b/ports/fribidi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fribidi", - "version": "1.0.11", - "port-version": 3, + "version": "1.0.12", "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)", "supports": "!uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8ac0d2abfbc318..3a4e753525856e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2345,8 +2345,8 @@ "port-version": 0 }, "fribidi": { - "baseline": "1.0.11", - "port-version": 3 + "baseline": "1.0.12", + "port-version": 0 }, "frozen": { "baseline": "2021-04-22", diff --git a/versions/f-/fribidi.json b/versions/f-/fribidi.json index b291a97776ef4d..c164cdf54af529 100644 --- a/versions/f-/fribidi.json +++ b/versions/f-/fribidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43f84b32dcc2e675fac20a42c0cf0c7f801c1fbc", + "version": "1.0.12", + "port-version": 0 + }, { "git-tree": "038a02d8e9a403f61bd3d45ce0f6f626a67d72f3", "version": "1.0.11", From 5af7af31d14d479b3861b30631bd26ada28f9071 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 29 Apr 2022 01:01:47 +0200 Subject: [PATCH 137/383] [check] Use modern cmake helpers and disable tests (#24451) * [check] Disable tests * version --- ports/check/portfile.cmake | 28 +++++++++++++++++----------- ports/check/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 2 +- versions/c-/check.json | 5 +++++ 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/ports/check/portfile.cmake b/ports/check/portfile.cmake index 0553e098195a02..1d0920ddb07f37 100644 --- a/ports/check/portfile.cmake +++ b/ports/check/portfile.cmake @@ -1,30 +1,36 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcheck/check - REF 11970a7e112dfe243a2e68773f014687df2900e8 # 0.15.2 + REF 11970a7e112dfe243a2e68773f014687df2900e8 # 0.15.2 SHA512 210c9617fa1c1ce16bef983b0e6cb587b1774c3f7ce27a53ca7799642dc7a14be8de567d69dc0e57845684c6f7991d772c73654f63c8755afda3b37a35c7156e HEAD_REF master PATCHES fix-lib-path.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCHECK_ENABLE_TESTS=OFF + -DBUILD_TESTING=OFF + -DCHECK_ENABLE_GCOV=OFF + -DENABLE_MEMORY_LEAKING_TESTS=OFF + -DCHECK_ENABLE_TIMEOUT_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/check) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/check) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # cleanup -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/check/vcpkg.json b/ports/check/vcpkg.json index eb021bead0734b..bf10a4838c5256 100644 --- a/ports/check/vcpkg.json +++ b/ports/check/vcpkg.json @@ -1,7 +1,18 @@ { "name": "check", - "version-string": "0.15.2", - "port-version": 2, + "version": "0.15.2", + "port-version": 3, "description": "A unit testing framework for C", - "homepage": "https://github.com/libcheck/check" + "homepage": "https://github.com/libcheck/check", + "license": "LGPL-2.1", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 3a4e753525856e..34190f099d9e19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1350,7 +1350,7 @@ }, "check": { "baseline": "0.15.2", - "port-version": 2 + "port-version": 3 }, "chipmunk": { "baseline": "7.0.3", diff --git a/versions/c-/check.json b/versions/c-/check.json index c8884ded5ddf3e..2bdf457569a265 100644 --- a/versions/c-/check.json +++ b/versions/c-/check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9804577939493b7f7934d98adc953624e0020c4", + "version": "0.15.2", + "port-version": 3 + }, { "git-tree": "f88273666d201fd843e12ba5d98d4ed8a10bd576", "version-string": "0.15.2", From f8ed143052ea530b705e1aa664025fa9b861656e Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 29 Apr 2022 01:02:41 +0200 Subject: [PATCH 138/383] [aixlog] Disable examples (#24452) * [aixlog] Disable examples * Likely not semver * version --- ports/aixlog/portfile.cmake | 4 +++- ports/aixlog/vcpkg.json | 5 ++++- versions/a-/aixlog.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ports/aixlog/portfile.cmake b/ports/aixlog/portfile.cmake index 5249e4d23d1f2c..2092d84ca126cf 100644 --- a/ports/aixlog/portfile.cmake +++ b/ports/aixlog/portfile.cmake @@ -3,10 +3,12 @@ vcpkg_from_github( REPO badaix/aixlog REF fd4a341740ee840092963de852584ec8ff811c4f # v1.5.0 SHA512 10ab07dcb1e67064c0d69ddcf9289d79d914c70fe6922f32179f9ac38d5c682a4ebe08b686d8160c699a6b966bc7aa2fd7d0268664570a10ce146850e78b292d - ) +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLE=OFF ) vcpkg_cmake_install() diff --git a/ports/aixlog/vcpkg.json b/ports/aixlog/vcpkg.json index 978c86f3f67927..6670f4d9b3211e 100644 --- a/ports/aixlog/vcpkg.json +++ b/ports/aixlog/vcpkg.json @@ -1,7 +1,10 @@ { "name": "aixlog", - "version-semver": "1.5.0", + "version": "1.5.0", + "port-version": 1, "description": "Header-only C++ logging library", + "homepage": "https://github.com/badaix/aixlog", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/a-/aixlog.json b/versions/a-/aixlog.json index 203715084bde84..6fa24783c720fa 100644 --- a/versions/a-/aixlog.json +++ b/versions/a-/aixlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd7db7eb82342728ee7a0e93ce1d446d834232c2", + "version": "1.5.0", + "port-version": 1 + }, { "git-tree": "ca812db174980bd0007da672c5ec4dd52134bf73", "version-semver": "1.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index 34190f099d9e19..a5550981334a88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -34,7 +34,7 @@ }, "aixlog": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "akali": { "baseline": "1.42", From b5b1bdb20a5e8c6ef44b7e1d52f019365b5648af Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 29 Apr 2022 01:10:18 +0200 Subject: [PATCH 139/383] [libcbor] Update to 0.9.0 (#24453) * [libcbor] Update to 0.9.0 * version * Fix cmake config * version * remove cmake config * version --- ports/libcbor/portfile.cmake | 23 ++++++++++++----------- ports/libcbor/vcpkg.json | 12 +++++++++--- versions/baseline.json | 4 ++-- versions/l-/libcbor.json | 5 +++++ 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/ports/libcbor/portfile.cmake b/ports/libcbor/portfile.cmake index 252a7086827b09..dfdd89a840a183 100644 --- a/ports/libcbor/portfile.cmake +++ b/ports/libcbor/portfile.cmake @@ -1,29 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PJK/libcbor - REF v0.8.0 - SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc + REF v0.9.0 + SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DWITH_TESTS=OFF -DWITH_EXAMPLES=OFF -DVCPKG_VERBOSE=ON - ) + -DSANITIZE=OFF + -DCBOR_CUSTOM_ALLOC=ON +) -vcpkg_build_cmake() -vcpkg_install_cmake() +vcpkg_cmake_build() +vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() # Add Cmake Packagefile -file(COPY ${CMAKE_CURRENT_LIST_DIR}/LibCborConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/LibCborConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libcbor/vcpkg.json b/ports/libcbor/vcpkg.json index 90c54499d8e1cc..25d7c8c5ea8b29 100644 --- a/ports/libcbor/vcpkg.json +++ b/ports/libcbor/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libcbor", - "version": "0.8.0", - "port-version": 1, + "version": "0.9.0", "description": "libcbor is a C library for parsing and generating CBOR, the general-purpose schema-less binary data format", - "homepage": "https://github.com/PJK/libcbor" + "homepage": "https://github.com/PJK/libcbor", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a5550981334a88..6b44d2eee209f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3437,8 +3437,8 @@ "port-version": 2 }, "libcbor": { - "baseline": "0.8.0", - "port-version": 1 + "baseline": "0.9.0", + "port-version": 0 }, "libcds": { "baseline": "2.3.3", diff --git a/versions/l-/libcbor.json b/versions/l-/libcbor.json index 105e60aae4cbe5..eb5113b769dfc9 100644 --- a/versions/l-/libcbor.json +++ b/versions/l-/libcbor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e881ce93b52a9b16f4c03e4bed79c661def7631", + "version": "0.9.0", + "port-version": 0 + }, { "git-tree": "02d970a2dac8b0abb941a5b445f7e14afc9c1e49", "version": "0.8.0", From e3839ed58e61ea052774b1f8d59a1fd491fc89a3 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 28 Apr 2022 16:12:25 -0700 Subject: [PATCH 140/383] Add vcpkg_tool_release_process documentation. (#24226) * Add vcpkg_tool_release_process documentation. * Add step to check over the bits before submitting to signing, and remove branch name assumptions. --- .../internal/vcpkg_tool_release_process.md | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 docs/maintainers/internal/vcpkg_tool_release_process.md diff --git a/docs/maintainers/internal/vcpkg_tool_release_process.md b/docs/maintainers/internal/vcpkg_tool_release_process.md new file mode 100644 index 00000000000000..5ed3ea2df7884d --- /dev/null +++ b/docs/maintainers/internal/vcpkg_tool_release_process.md @@ -0,0 +1,43 @@ +# vcpkg_tool_release_process + +This document describes the acceptance criteria / process we use when doing a vcpkg-tool update, +such as https://github.com/microsoft/vcpkg/pull/23757 + +1. Verify that all tests etc. are passing in the vcpkg-tool repo's `main` branch, and that the + contents therein are acceptable for release. (Steps after this will sign code there, so this + review is responsible gating what has access to code signing.) +2. On your machine, in a prompt changed to the vcpkg-tool repo, + `git fetch https://github.com/microsoft/vcpkg-tool main && git switch -d FETCH_HEAD` +3. Check that the changes there are in fact the changes that we want in that release. (Be aware, + you are responsible for what is about to be signed with a Microsoft code signing certificate by + proceeding) +4. `git push https://devdiv.visualstudio.com/DevDiv/_git/vcpkg FETCH_HEAD:main` +5. Monitor the resulting signed build at: + https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_build?definitionId=13610 + and/or manually submit one. (The push is supposed to automatically submit a build but that + has been somewhat unstable at the time of this writing.) +6. The signed build will automatically create a draft GitHub release at + https://github.com/microsoft/vcpkg-tool/releases . Erase the contents filled in there and press + the "auto generate release notes" button. Manually remove any entries created by the automated + localization tools which will start with `* LEGO: Pull request from juno/`. +7. Publish that draft release as "pre-release". +8. Smoke test the 'one liner' installer: (Where 2022-03-30 is replaced with the right release name) + * Powershell: + `iex (iwr https://github.com/microsoft/vcpkg-tool/releases/download/2022-03-30/vcpkg-init.ps1)` + * Batch: + `curl -L -o vcpkg-init.cmd https://github.com/microsoft/vcpkg-tool/releases/download/2022-03-30/vcpkg-init.ps1 && .\vcpkg-init.cmd` + * Bash: + `. <(curl https://github.com/microsoft/vcpkg-tool/releases/download/2022-03-30/vcpkg-init.sh -L)` +9. In the vcpkg repo, draft a PR which updates `bootstrap-vcpkg.sh` and `boostrap-vcpkg.ps1` + with the new release date, and update SHAs as appropriate in the .sh script. (For example, see + https://github.com/microsoft/vcpkg/pull/23757) +10. Submit a new full tree rebuild by https://dev.azure.com/vcpkg/public/_build?definitionId=29 + (microsoft.vcpkg.ci as of this writing) and queue a new build targeting branch + `refs/pull/ The PR number created in the previous step /head` (for example + `refs/pull/24131/head` + https://dev.azure.com/vcpkg/public/_build/results?buildId=70703&view=results) +11. (Probably the next day) Check over the failures and ensure any differences with the most recent + full rebuild using the previous tool version are understood. +12. Merge the tool update PR. +13. Change the github release in vcpkg-tool from "prerelease" to "release". (This automatically + updates the aka.ms links) From 6e52f3130db4b7a21f61fbc16eb9988e3286c6cf Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Fri, 29 Apr 2022 03:24:55 +0300 Subject: [PATCH 141/383] [CMakeRC] Add new port (#24454) * create port * . * Update cmakerc.json * Update portfile.cmake * Update vcpkg.json * Update cmakerc.json * Update portfile.cmake * Update cmakerc.json Co-authored-by: Billy Robert O'Neal III --- ports/cmakerc/portfile.cmake | 14 ++++++++++++++ ports/cmakerc/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/c-/cmakerc.json | 9 +++++++++ 4 files changed, 34 insertions(+) create mode 100644 ports/cmakerc/portfile.cmake create mode 100644 ports/cmakerc/vcpkg.json create mode 100644 versions/c-/cmakerc.json diff --git a/ports/cmakerc/portfile.cmake b/ports/cmakerc/portfile.cmake new file mode 100644 index 00000000000000..1a0d3ba5569388 --- /dev/null +++ b/ports/cmakerc/portfile.cmake @@ -0,0 +1,14 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vector-of-bool/cmrc + REF a64bea50c05594c8e7cf1f08e441bb9507742e2e + SHA512 134c358143bd43d38802c5b00b3f5cd6a0e4c7918659dd4cc6726a15048e11376e915889788d0dd6bbfe4c4057e18c9b5306c4e785ad16cb0f4cd1c5c4634f80 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/CMakeRC.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME cmakerc-config.cmake) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cmakerc/vcpkg.json b/ports/cmakerc/vcpkg.json new file mode 100644 index 00000000000000..39162213e52b5b --- /dev/null +++ b/ports/cmakerc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cmakerc", + "version-date": "2021-08-27", + "description": "A Resource Compiler in a Single CMake Script", + "homepage": "https://github.com/vector-of-bool/cmrc", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 6b44d2eee209f5..6a6b2588cd5f49 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1444,6 +1444,10 @@ "baseline": "1.0.0", "port-version": 0 }, + "cmakerc": { + "baseline": "2021-08-27", + "port-version": 0 + }, "cmark": { "baseline": "0.30.1", "port-version": 0 diff --git a/versions/c-/cmakerc.json b/versions/c-/cmakerc.json new file mode 100644 index 00000000000000..fc2a9fb618313b --- /dev/null +++ b/versions/c-/cmakerc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "740fd9bb83e79eba29ccd69546d2b3105d719d5d", + "version-date": "2021-08-27", + "port-version": 0 + } + ] +} From 585ff442dd855378eefcff972c75b35587b5235e Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 29 Apr 2022 05:50:41 +0200 Subject: [PATCH 142/383] [jansson] Fix UWP build (#24466) * [jansson] cleanup * version * Roll back version * version * Unsupported on UWP * version * patch * Remove supports * version --- ports/jansson/fix-linker-flags.patch | 13 ++++++++++ ports/jansson/portfile.cmake | 36 ++++++++++------------------ ports/jansson/vcpkg.json | 14 ++++++++++- versions/baseline.json | 2 +- versions/j-/jansson.json | 5 ++++ 5 files changed, 45 insertions(+), 25 deletions(-) create mode 100644 ports/jansson/fix-linker-flags.patch diff --git a/ports/jansson/fix-linker-flags.patch b/ports/jansson/fix-linker-flags.patch new file mode 100644 index 00000000000000..57d889005c72dc --- /dev/null +++ b/ports/jansson/fix-linker-flags.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39b9ad3..ed33e3c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -342,7 +342,7 @@ if(JANSSON_BUILD_SHARED_LIBS) + ) + list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") + if (VSCRIPT_WORKS) +- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") + endif() + endif() + diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake index 80e6a8bb18e3af..e6c17c148ae3e2 100644 --- a/ports/jansson/portfile.cmake +++ b/ports/jansson/portfile.cmake @@ -4,47 +4,37 @@ vcpkg_from_github( REF 684e18c927e89615c2d501737e90018f4930d6c5 # v2.14 SHA512 e2cac3567bc860d10d9aa386ce370876cb21ff083a970abeb48112b6586b91cd101694a98cb05a06795fb04498e6bc2df3615fedb86635f5a998b68e5670e5b3 HEAD_REF master + PATCHES + fix-linker-flags.patch ) -if(VCPKG_CRT_LINKAGE STREQUAL static) - set(JANSSON_STATIC_CRT ON) -else() - set(JANSSON_STATIC_CRT OFF) -endif() - - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(JANSSON_BUILD_SHARED_LIBS ON) -else() - set(JANSSON_BUILD_SHARED_LIBS OFF) -endif() +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" JANSSON_STATIC_CRT) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JANSSON_BUILD_SHARED_LIBS) # Jansson tries to random-seed its hash table with system-provided entropy. # This is not ported to UWP yet. -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_UWP) set(USE_WINDOWS_CRYPTOAPI OFF) else() set(USE_WINDOWS_CRYPTOAPI ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DJANSSON_STATIC_CRT=${JANSSON_STATIC_CRT} -DJANSSON_EXAMPLES=OFF -DJANSSON_WITHOUT_TESTS=ON + -DJANSSON_BUILD_DOCS=OFF -DJANSSON_BUILD_SHARED_LIBS=${JANSSON_BUILD_SHARED_LIBS} -DUSE_WINDOWS_CRYPTOAPI=${USE_WINDOWS_CRYPTOAPI} -DJANSSON_INSTALL_CMAKE_DIR:STRING=share/jansson ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - +vcpkg_cmake_install() vcpkg_copy_pdbs() - +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jansson/vcpkg.json b/ports/jansson/vcpkg.json index 244dffa2e60df1..cd99df02718c71 100644 --- a/ports/jansson/vcpkg.json +++ b/ports/jansson/vcpkg.json @@ -1,6 +1,18 @@ { "name": "jansson", "version": "2.14", + "port-version": 1, "description": "Jansson is a C library for encoding, decoding and manipulating JSON data", - "homepage": "https://github.com/akheron/jansson" + "homepage": "https://github.com/akheron/jansson", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6a6b2588cd5f49..38d7d3c34f9d26 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3018,7 +3018,7 @@ }, "jansson": { "baseline": "2.14", - "port-version": 0 + "port-version": 1 }, "jasper": { "baseline": "2.0.33", diff --git a/versions/j-/jansson.json b/versions/j-/jansson.json index 0d4d12b399c9b4..50a364af94dcba 100644 --- a/versions/j-/jansson.json +++ b/versions/j-/jansson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f284c9aba6b994cb6fe175b675976d34257b4c85", + "version": "2.14", + "port-version": 1 + }, { "git-tree": "1a5c55feab368e4bfb40be993b9ea5a39fc82f51", "version": "2.14", From 9ccd693f1b63aa451c1ca1d9deea2ce2020663e6 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Fri, 29 Apr 2022 11:40:30 -0700 Subject: [PATCH 143/383] [toolchain windows] set CMAKE_SYSTEM_PROCESSOR (#24100) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [toolchain windows] set CMAKE_SYSTEM_NAME and CMAKE_SYSTEM_PROCESSOR In specific, I did this for the cpuinfo PR - I realized the reason that cpuinfo doesn't support arm64 windows cross compilation is because we don't set CMAKE_SYSTEM_PROCESSOR. * correctly set CMAKE_CROSSCOMPILING * start fixin libraries * more changes: - gainput: remove line - glog: remove try_run when cross compiling - windows.cmake: set CMAKE_SYSTEM_VERSION * more patches - mapnik: set BOOST_REGEX_HAS_ICU to avoid check_cxx_source_runs - orc: set HAS_PRE_1970 and HAS_POST_2038 for same - seal: change out check_cxx_source_runs for check_cxx_source_compiles * more changes * fix x86-windows * fix qpid-proton, glog * build corrade-rc * fix x64-uwp ports * forgot to _actually_ always build corrade-rc .,. * Replay #22831 * Dedupe CMAKE_SYSTEM_NAME settings. * Add quotes for corrade_rc_param Co-authored-by: JackĀ·BoosĀ·Yu <47264268+JackBoosY@users.noreply.github.com> * Update version DB. Co-authored-by: nicole mazzuca Co-authored-by: Billy Robert O'Neal III Co-authored-by: JackĀ·BoosĀ·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/ampl-mp/fix-arm-build.patch | 6 + ports/ampl-mp/vcpkg.json | 4 +- ports/aom/portfile.cmake | 9 +- ports/aom/vcpkg.json | 2 +- ports/caf/fix_cxx17.patch | 8 ++ ports/caf/portfile.cmake | 1 + ports/caf/vcpkg.json | 1 + ports/corrade/build-corrade-rc-always.patch | 27 +++++ ports/corrade/portfile.cmake | 19 ++- ports/corrade/vcpkg.json | 12 +- ports/cpu-features/portfile.cmake | 4 +- ports/cpu-features/vcpkg.json | 2 +- ports/cpu-features/windows-x86-fix.patch | 17 +++ ports/fltk/portfile.cmake | 13 +- ports/fltk/vcpkg.json | 6 +- ports/gainput/fix-build.patch | 5 +- ports/gainput/vcpkg.json | 2 +- ports/glog/fix_crosscompile_symbolize.patch | 18 +++ ports/glog/fix_log_every_n.patch | 9 -- ports/glog/portfile.cmake | 1 + ports/glog/vcpkg.json | 4 +- ports/libcopp/fix-x86-windows.patch | 20 ++++ ports/libcopp/portfile.cmake | 1 + ports/libcopp/vcpkg.json | 2 +- ports/libhydrogen/portfile.cmake | 1 + ports/libhydrogen/remove-tests.patch | 30 +++++ ports/libhydrogen/vcpkg.json | 1 + ports/mapnik/portfile.cmake | 1 + ports/mapnik/vcpkg.json | 2 +- ports/openblas/fix-uwp-build.patch | 124 ++++++++++++++++++++ ports/openblas/vcpkg.json | 1 + ports/orc/portfile.cmake | 8 ++ ports/orc/vcpkg.json | 2 +- ports/pthreadpool/fix-uwp.patch | 3 +- ports/pthreadpool/vcpkg.json | 2 +- ports/seal/portfile.cmake | 6 + ports/seal/vcpkg.json | 2 +- ports/vc/dont-use-uninit-var.patch | 17 +++ ports/vc/portfile.cmake | 3 +- ports/vc/vcpkg.json | 2 +- scripts/toolchains/uwp.cmake | 42 ++++++- scripts/toolchains/windows.cmake | 32 +++++ versions/a-/ampl-mp.json | 5 + versions/a-/aom.json | 5 + versions/baseline.json | 32 ++--- versions/c-/caf.json | 5 + versions/c-/corrade.json | 5 + versions/c-/cpu-features.json | 5 + versions/f-/fltk.json | 5 + versions/g-/gainput.json | 5 + versions/g-/glog.json | 5 + versions/l-/libcopp.json | 5 + versions/l-/libhydrogen.json | 5 + versions/m-/mapnik.json | 5 + versions/o-/openblas.json | 5 + versions/o-/orc.json | 5 + versions/p-/pthreadpool.json | 5 + versions/s-/seal.json | 5 + versions/v-/vc.json | 5 + 59 files changed, 529 insertions(+), 55 deletions(-) create mode 100644 ports/caf/fix_cxx17.patch create mode 100644 ports/corrade/build-corrade-rc-always.patch create mode 100644 ports/cpu-features/windows-x86-fix.patch create mode 100644 ports/glog/fix_crosscompile_symbolize.patch create mode 100644 ports/libcopp/fix-x86-windows.patch create mode 100644 ports/libhydrogen/remove-tests.patch create mode 100644 ports/vc/dont-use-uninit-var.patch diff --git a/ports/ampl-mp/fix-arm-build.patch b/ports/ampl-mp/fix-arm-build.patch index 443cdc457c8f35..99b236ce736262 100644 --- a/ports/ampl-mp/fix-arm-build.patch +++ b/ports/ampl-mp/fix-arm-build.patch @@ -2,6 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 92089a3..d4c6762 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt +@@ -240,4 +240,4 @@ + set(MP_EXPR_INFO_FILE ${MP_SOURCE_DIR}/src/expr-info.cc) +-add_executable(gen-expr-info EXCLUDE_FROM_ALL ++add_executable(gen-expr-info + src/gen-expr-info.cc $) + if (MINGW) @@ -257,9 +257,15 @@ if (CMAKE_CROSSCOMPILING) COMMAND ${CMAKE_COMMAND} -E echo "warning: cannot re-generate ${MP_EXPR_INFO_FILE}") diff --git a/ports/ampl-mp/vcpkg.json b/ports/ampl-mp/vcpkg.json index bc017ae1556549..287cd3cb374201 100644 --- a/ports/ampl-mp/vcpkg.json +++ b/ports/ampl-mp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ampl-mp", - "version-string": "2020-11-11", - "port-version": 2, + "version-date": "2020-11-11", + "port-version": 3, "description": "An open-source library for mathematical programming", "homepage": "https://github.com/ampl/mp", "supports": "!uwp", diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake index 2daeebea5cfe4f..81152e05adc9c8 100644 --- a/ports/aom/portfile.cmake +++ b/ports/aom/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL "https://aomedia.googlesource.com/aom" REF 6bbe6ae701d65bdf36bb72053db9b71f9739a083 - TAG v3.2.0 + FETCH_REF v3.2.0 PATCHES aom-rename-static.diff # Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream @@ -20,9 +20,16 @@ vcpkg_from_git( aom-uninitialized-pointer.diff ) +set(aom_target_cpu "") +if(VCPKG_TARGET_IS_UWP) + # UWP + aom's assembler files result in weirdness and build failures + set(aom_target_cpu "-DAOM_TARGET_CPU=generic") +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS + ${aom_target_cpu} -DENABLE_DOCS=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTDATA=OFF diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index 76a736ad033b11..8ecb61261b2bc9 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aom", "version-semver": "3.2.0", - "port-version": 2, + "port-version": 3, "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", "supports": "!(windows & arm & !uwp)", diff --git a/ports/caf/fix_cxx17.patch b/ports/caf/fix_cxx17.patch new file mode 100644 index 00000000000000..18094c07ba9c11 --- /dev/null +++ b/ports/caf/fix_cxx17.patch @@ -0,0 +1,8 @@ +--- a/CMakeLists.txt ++++ a/CMakeLists.txt +@@ -115,3 +115,4 @@ ++target_compile_features(caf_internal INTERFACE cxx_std_17) + # TODO: simply set CXX_STANDARD when switching to CMake ā‰„ 3.9.6 +-if(NOT CMAKE_CROSSCOMPILING) ++if(0) + try_compile(caf_has_cxx_17 diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index a8afe9ffae05e1..c186a2272c4e30 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_dependency.patch + fix_cxx17.patch ) vcpkg_cmake_configure( diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json index a47199eace8a2b..5d89216c3c37ec 100644 --- a/ports/caf/vcpkg.json +++ b/ports/caf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "caf", "version": "0.18.6", + "port-version": 1, "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.", "homepage": "https://github.com/actor-framework/actor-framework", "license": "BSD-3-Clause", diff --git a/ports/corrade/build-corrade-rc-always.patch b/ports/corrade/build-corrade-rc-always.patch new file mode 100644 index 00000000000000..0e46a5250106e2 --- /dev/null +++ b/ports/corrade/build-corrade-rc-always.patch @@ -0,0 +1,27 @@ +--- a/src/Corrade/Utility/CMakeLists.txt ++++ b/src/Corrade/Utility/CMakeLists.txt +@@ -185,13 +185,12 @@ + # corrade-rc when generating WinRT targets by setting + # set_target_properties(corrade-rc PROPERTIES VS_WINRT_COMPONENT OFF) + # Then this would be if(NOT CMAKE_CROSSCOMPILING OR CORRADE_TARGET_WINDOWS_RT). + # However, it seems like this feature never materialized, as doing this will + # result in corrade-rc that's looking for vcruntime140_app.dll in order to be + # run. Last checked: Nov 2019. +-if(NOT CMAKE_CROSSCOMPILING) + # Sources for standalone corrade-rc + set(CorradeUtilityRc_SRCS + Arguments.cpp + Debug.cpp + Directory.cpp + Configuration.cpp +@@ -235,9 +234,10 @@ + if(CORRADE_TARGET_UNIX) + target_link_libraries(corrade-rc PRIVATE ${CMAKE_DL_LIBS}) + endif() + set_target_properties(corrade-rc PROPERTIES FOLDER "Corrade/Utility") + install(TARGETS corrade-rc DESTINATION ${CORRADE_BINARY_INSTALL_DIR}) + ++if(NOT CMAKE_CROSSCOMPILING) + # Corrade::rc target alias for superprojects + add_executable(Corrade::rc ALIAS corrade-rc) + endif() diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 2d6b4920daf2d9..8dd02a9a6f2348 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF v2020.06 SHA512 94cc8959b0ee43ecd8d13a25307e7829d53dc6601628d97c32288d1704e2c0835b755bffc06b2105e6aa5a612f119a60e83cb475860b51e6a35999215c100227 HEAD_REF master - PATCHES fix-vs2019.patch + PATCHES + fix-vs2019.patch + build-corrade-rc-always.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -24,13 +26,23 @@ endforeach() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) +set(corrade_rc_param "") +if(VCPKG_CROSSCOMPILING) + set(corrade_rc_param + "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + ) +endif() + vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS ${FEATURE_OPTIONS} + "${corrade_rc_param}" -DUTILITY_USE_ANSI_COLORS=ON -DBUILD_STATIC=${BUILD_STATIC} + MAYBE_UNUSED_VARIABLES + CORRADE_RC_EXECUTABLE ) vcpkg_install_cmake() @@ -39,9 +51,8 @@ vcpkg_install_cmake() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Install tools +# corrade-rc is not built when CMAKE_CROSSCOMPILING if("utility" IN_LIST FEATURES) - # Drop a copy of tools vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN) endif() @@ -67,4 +78,4 @@ file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json index d727769a188036..17c71da34a5baf 100644 --- a/ports/corrade/vcpkg.json +++ b/ports/corrade/vcpkg.json @@ -1,9 +1,19 @@ { "name": "corrade", "version-string": "2020.06", - "port-version": 3, + "port-version": 4, "description": "C++11/C++14 multiplatform utility library.", "homepage": "https://magnum.graphics/corrade/", + "dependencies": [ + { + "name": "corrade", + "host": true, + "default-features": false, + "features": [ + "utility" + ] + } + ], "default-features": [ "interconnect", "pluginmanager", diff --git a/ports/cpu-features/portfile.cmake b/ports/cpu-features/portfile.cmake index 4b4ca71d2c4374..0e431e353bb34d 100644 --- a/ports/cpu-features/portfile.cmake +++ b/ports/cpu-features/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF a8397ba4591237c17d18e4acc091f5f3ebe7391e # 0.6.0 SHA512 71a583e8190699d6df3dfa2857886089265cdfbcb916d9828a3611a1d6d23487464d6448b900b49637f015dd7d4e18bb206e0249af0932928f8ced13a081d42b HEAD_REF master - PATCHES make_list_cpu_features_optional.patch + PATCHES + make_list_cpu_features_optional.patch + windows-x86-fix.patch ) # If feature "tools" is not specified, disable building/exporting executable targets. diff --git a/ports/cpu-features/vcpkg.json b/ports/cpu-features/vcpkg.json index e44c320170d28c..0953cb962dfa5d 100644 --- a/ports/cpu-features/vcpkg.json +++ b/ports/cpu-features/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpu-features", "version": "0.6.0", - "port-version": 1, + "port-version": 2, "description": "A cross-platform C library to retrieve CPU features (such as available instructions) at runtime", "homepage": "https://github.com/google/cpu_features", "license": "Apache-2.0", diff --git a/ports/cpu-features/windows-x86-fix.patch b/ports/cpu-features/windows-x86-fix.patch new file mode 100644 index 00000000000000..4dc7bf7676dafc --- /dev/null +++ b/ports/cpu-features/windows-x86-fix.patch @@ -0,0 +1,17 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,13 +60,13 @@ + if(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") + set(PROCESSOR_IS_MIPS TRUE) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set(PROCESSOR_IS_ARM TRUE) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(PROCESSOR_IS_AARCH64 TRUE) +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)") ++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(AMD64|amd64)|(^i.86$)") + set(PROCESSOR_IS_X86 TRUE) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") + set(PROCESSOR_IS_POWER TRUE) + endif() + + macro(add_cpu_features_headers_and_sources HDRS_LIST_NAME SRCS_LIST_NAME) diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index c9244652973ac7..d43a8fcb549519 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -19,6 +19,11 @@ else() set(OPTION_USE_GL "-DOPTION_USE_GL=ON") endif() +set(fluid_path_param "") +if(VCPKG_CROSSCOMPILING) + set(fluid_path_param "-DFLUID_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/fltk/fluid${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -30,6 +35,7 @@ vcpkg_cmake_configure( -DOPTION_USE_SYSTEM_LIBJPEG=ON -DOPTION_BUILD_SHARED_LIBS=OFF -DFLTK_CONFIG_PATH=share/fltk + ${fluid_path_param} ${OPTION_USE_GL} ) @@ -39,7 +45,12 @@ vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -if(VCPKG_TARGET_IS_OSX) +# don't install fluid +if(VCPKG_CROSSCOMPILING) + if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools(TOOL_NAMES fltk-config AUTO_CLEAN) + endif() +elseif(VCPKG_TARGET_IS_OSX) vcpkg_copy_tools(TOOL_NAMES fluid.app fltk-config AUTO_CLEAN) elseif(VCPKG_TARGET_IS_WINDOWS) file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config") diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json index cdcd1134aa0f10..ada834120680d6 100644 --- a/ports/fltk/vcpkg.json +++ b/ports/fltk/vcpkg.json @@ -1,11 +1,15 @@ { "name": "fltk", "version": "1.3.8", - "port-version": 1, + "port-version": 2, "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.", "homepage": "https://www.fltk.org/", "supports": "!uwp", "dependencies": [ + { + "name": "fltk", + "host": true + }, "libjpeg-turbo", "libpng", { diff --git a/ports/gainput/fix-build.patch b/ports/gainput/fix-build.patch index 39fc9c777638af..912828713cfc0d 100644 --- a/ports/gainput/fix-build.patch +++ b/ports/gainput/fix-build.patch @@ -1,3 +1,6 @@ +set(XINPUT, "xinput") sets the variable "XINPUT," to "xinput", +so this variable is never used anyways + diff --git a/CMakeLists.txt b/CMakeLists.txt index a443b66..61ff7b8 100644 --- a/CMakeLists.txt @@ -12,7 +15,7 @@ index a443b66..61ff7b8 100644 else() set(XINPUT "Xinput9_1_0") - if ( ${CMAKE_SYSTEM_VERSION} LESS 6.1 ) -+ if ( ${CMAKE_SYSTEM_VERSION} VERSION_LESS 6.1 ) ++ if ( 0 ) set(XINPUT, "xinput") endif() endif() diff --git a/ports/gainput/vcpkg.json b/ports/gainput/vcpkg.json index 5b8a8680bd02ec..ca764891c5bf1e 100644 --- a/ports/gainput/vcpkg.json +++ b/ports/gainput/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gainput", "version": "1.0.0", - "port-version": 5, + "port-version": 6, "description": "Gainput is a multiplatform C++ input library, supporting mouse, keyboard and controllers", "homepage": "https://github.com/jkuhlmann/gainput", "license": "MIT", diff --git a/ports/glog/fix_crosscompile_symbolize.patch b/ports/glog/fix_crosscompile_symbolize.patch new file mode 100644 index 00000000000000..65f0fd26602b65 --- /dev/null +++ b/ports/glog/fix_crosscompile_symbolize.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -401,4 +401,7 @@ + if (WITH_SYMBOLIZE) + if (WIN32 OR CYGWIN) ++ if(CMAKE_CROSSCOMPILING) ++ set(HAVE_SYMBOLIZE 0) ++ else() + cmake_push_check_state (RESET) + set (CMAKE_REQUIRED_LIBRARIES DbgHelp) +@@ -430,6 +433,7 @@ + ]=] HAVE_SYMBOLIZE) + + cmake_pop_check_state () ++ endif() + + if (HAVE_SYMBOLIZE) + set (HAVE_STACKTRACE 1) diff --git a/ports/glog/fix_log_every_n.patch b/ports/glog/fix_log_every_n.patch index 529715ff0bc44b..52950481ce295a 100644 --- a/ports/glog/fix_log_every_n.patch +++ b/ports/glog/fix_log_every_n.patch @@ -2,15 +2,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 61e5f6c..889df87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -65,7 +65,7 @@ include (GenerateExportHeader) - include (GetCacheVariables) - include (GNUInstallDirs) - --#set (CMAKE_DEBUG_POSTFIX d) -+#set (CMAKE_DEBUG_POSTFIX d) - set (CMAKE_THREAD_PREFER_PTHREAD 1) - - find_package (GTest) @@ -501,6 +501,7 @@ set (GLOG_PUBLIC_H ${CMAKE_CURRENT_BINARY_DIR}/glog/stl_logging.h ${CMAKE_CURRENT_BINARY_DIR}/glog/vlog_is_on.h diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 47a85914076105..e1a90cf391599e 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( fix_glog_CMAKE_MODULE_PATH.patch fix_log_every_n.patch nogdi-nominmax.patch + fix_crosscompile_symbolize.patch ) diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index b9e198f55e9738..1b62ea548c1279 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,10 +1,10 @@ { "name": "glog", "version": "0.5.0", - "port-version": 2, + "port-version": 3, "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", - "license": null, + "license": "BSD-3-Clause", "dependencies": [ "gflags", { diff --git a/ports/libcopp/fix-x86-windows.patch b/ports/libcopp/fix-x86-windows.patch new file mode 100644 index 00000000000000..2e68b08793d953 --- /dev/null +++ b/ports/libcopp/fix-x86-windows.patch @@ -0,0 +1,20 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,12 +11,17 @@ + libcopp + VERSION "1.4.1" + DESCRIPTION "Cross-platform coroutine library in C++ ." + HOMEPAGE_URL "https://libcopp.atframe.work" + LANGUAGES C CXX ASM) + ++# libcopp requires x86 to be called i386 ++if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") ++ set(CMAKE_SYSTEM_PROCESSOR i386) ++endif() ++ + # ###################################################################################################################### + include("${PROJECT_SOURCE_DIR}/project/cmake/ProjectBuildOption.cmake") + + # # ############################################################################# + echowithcolor(COLOR GREEN "-- Build Type: ${CMAKE_BUILD_TYPE}") + diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake index c989a2da69ce90..1433a7f7cfd979 100644 --- a/ports/libcopp/portfile.cmake +++ b/ports/libcopp/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF 1.4.1 SHA512 eba06bd2de7c9ee557cdd0bf79e0c53e37722b671347436322c14c99e94d955477bfc0980a4f59a5c31051e108f952ec96791024c45fa8eeaa5f7a49099dd8ae HEAD_REF v2 + PATCHES fix-x86-windows.patch ) # atframework/cmake-toolset needed as a submodule for configure cmake diff --git a/ports/libcopp/vcpkg.json b/ports/libcopp/vcpkg.json index 1f6ff2c84a6639..5e1d7bc7324220 100644 --- a/ports/libcopp/vcpkg.json +++ b/ports/libcopp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcopp", "version-semver": "1.4.1", - "port-version": 1, + "port-version": 2, "maintainers": "owent ", "description": "A cross-platfrom coroutine library for C++", "homepage": "https://github.com/owent/libcopp", diff --git a/ports/libhydrogen/portfile.cmake b/ports/libhydrogen/portfile.cmake index 3a59970fed3d4e..2b888db86bfbba 100644 --- a/ports/libhydrogen/portfile.cmake +++ b/ports/libhydrogen/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF 01c32862f6f6e864c113efc3f0142e05ea3531fe #2021-12-02 SHA512 016181db4573a1ab31547fbfb51e19fa09e4ee4e0e788434a7654921956a02547b55eda14ccfea98425f4f615fb90e0534c5e1010d5320c1958b65b0489a2931 HEAD_REF master + PATCHES remove-tests.patch ) vcpkg_cmake_configure( diff --git a/ports/libhydrogen/remove-tests.patch b/ports/libhydrogen/remove-tests.patch new file mode 100644 index 00000000000000..399e883ff09cef --- /dev/null +++ b/ports/libhydrogen/remove-tests.patch @@ -0,0 +1,30 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -139,12 +139,13 @@ + # Tests + + set(tests_executable "${PROJECT_NAME}-tests") + set(tests_run_target "${PROJECT_NAME}-run-tests") + set(tests_run_file "${PROJECT_BINARY_DIR}/${tests_run_target}.done") + ++if(0) + enable_testing() + add_executable("${tests_executable}" ${test_files}) + target_compile_options("${tests_executable}" PRIVATE ${compile_options}) + target_link_libraries("${tests_executable}" "${PROJECT_NAME}") + add_test(NAME "${tests_executable}" COMMAND "${tests_executable}") + +@@ -166,12 +167,13 @@ + COMMAND "${CMAKE_COMMAND}" + ARGS -E touch "${tests_run_file}" + WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" + VERBATIM) + add_custom_target("${tests_run_target}" ALL DEPENDS "${tests_run_file}" VERBATIM) + endif() ++endif() + + # Generate Arduino package + + set(arduino_package_file "${PROJECT_BINARY_DIR}/hydrogen-crypto.zip") + + # Use the relative versions of the file path lists or else the full paths will end up in the diff --git a/ports/libhydrogen/vcpkg.json b/ports/libhydrogen/vcpkg.json index f76895c40a185c..2057f88208f09f 100644 --- a/ports/libhydrogen/vcpkg.json +++ b/ports/libhydrogen/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libhydrogen", "version-date": "2021-12-02", + "port-version": 1, "description": "A lightweight, secure, easy-to-use crypto library suitable for constrained environments", "homepage": "https://github.com/jedisct1/libhydrogen", "dependencies": [ diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 7140f07f6b0c65..015000a419723a 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -53,6 +53,7 @@ vcpkg_cmake_configure( -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON -DUSE_EXTERNAL_MAPBOX_VARIANT=ON + -DBOOST_REGEX_HAS_ICU=ON -DMAPNIK_CMAKE_DIR=share/mapnik/cmake -DFONTS_INSTALL_DIR=share/mapnik/fonts -DMAPNIK_PKGCONF_DIR=lib/pkgconfig diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index c1dc491aea2459..40a796611c1091 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mapnik", "version-date": "2022-01-28", - "port-version": 1, + "port-version": 2, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "license": "LGPL-2.1-only", diff --git a/ports/openblas/fix-uwp-build.patch b/ports/openblas/fix-uwp-build.patch index 7604cf736c1c8e..43e6c860737186 100644 --- a/ports/openblas/fix-uwp-build.patch +++ b/ports/openblas/fix-uwp-build.patch @@ -33,3 +33,127 @@ index 3e98dba..ee597f7 100644 // cgemv_t.S return NaN if there are NaN or Inf in the buffer (see bug #746) if(trans && stack_alloc_size) memset(buffer, 0, MIN(BUFFER_SIZE, sizeof(FLOAT) * buffer_size)); + +--- a/driver/others/CMakeLists.txt ++++ b/driver/others/CMakeLists.txt +@@ -1,20 +1,23 @@ + include_directories(${PROJECT_SOURCE_DIR}) + include_directories(${PROJECT_BINARY_DIR}) ++if(WIN32) ++ add_compile_definitions(_CRT_SECURE_NO_WARNINGS) ++endif() + + if (${CORE} STREQUAL "PPC440") + set(MEMORY memory_qalloc.c) + else () + set(MEMORY memory.c) + endif () + + if (USE_THREAD) + + if (USE_OPENMP) + set(BLAS_SERVER blas_server_omp.c) +- elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ++ elseif (WIN32) + set(BLAS_SERVER blas_server_win32.c) + elseif (${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") + set(BLAS_SERVER blas_server_win32.c) + endif () + + if (NOT DEFINED BLAS_SERVER) + +--- a/cmake/os.cmake ++++ b/cmake/os.cmake +@@ -15,13 +15,13 @@ + + if (${CMAKE_SYSTEM_NAME} STREQUAL "AIX") + set(EXTRALIB "${EXTRALIB} -lm") + endif () + + # TODO: this is probably meant for mingw, not other windows compilers +-if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ++if (WIN32) + + set(NEED_PIC 0) + set(NO_EXPRECISION 1) + + set(EXTRALIB "${EXTRALIB} -defaultlib:advapi32") + +@@ -66,13 +66,13 @@ + + if (CYGWIN) + set(NEED_PIC 0) + set(NO_EXPRECISION 1) + endif () + +-if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Interix" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android") ++if (NOT WIN32 AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Interix" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android") + if (USE_THREAD) + set(EXTRALIB "${EXTRALIB} -lpthread") + endif () + endif () + + if (QUAD_PRECISION) + +--- a/cmake/system.cmake ++++ b/cmake/system.cmake +@@ -422,22 +422,22 @@ + endif () + + if (USE_SIMPLE_THREADED_LEVEL3) + set(CCOMMON_OPT "${CCOMMON_OPT} -DUSE_SIMPLE_THREADED_LEVEL3") + endif () + +-if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ++if (NOT WIN32) + if (DEFINED MAX_STACK_ALLOC) + if (NOT ${MAX_STACK_ALLOC} EQUAL 0) + set(CCOMMON_OPT "${CCOMMON_OPT} -DMAX_STACK_ALLOC=${MAX_STACK_ALLOC}") + endif () + else () + set(CCOMMON_OPT "${CCOMMON_OPT} -DMAX_STACK_ALLOC=2048") + endif () + endif () +-if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ++if (NOT WIN32) + if (DEFINED BLAS3_MEM_ALLOC_THRESHOLD) + if (NOT ${BLAS3_MEM_ALLOC_THRESHOLD} EQUAL 32) + set(CCOMMON_OPT "${CCOMMON_OPT} -DBLAS3_MEM_ALLOC_THRESHOLD=${BLAS3_MEM_ALLOC_THRESHOLD}") + endif() + endif() + endif() +@@ -544,13 +544,13 @@ + + #For LAPACK Fortran codes. + set(LAPACK_FFLAGS "${LAPACK_FFLAGS} ${CMAKE_Fortran_FLAGS}") + set(LAPACK_FPFLAGS "${LAPACK_FPFLAGS} ${FPFLAGS}") + + #Disable -fopenmp for LAPACK Fortran codes on Windows. +-if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ++if (NOT WIN32) + set(FILTER_FLAGS "-fopenmp;-mp;-openmp;-xopenmp=parallel") + foreach (FILTER_FLAG ${FILTER_FLAGS}) + string(REPLACE ${FILTER_FLAG} "" LAPACK_FFLAGS ${LAPACK_FFLAGS}) + string(REPLACE ${FILTER_FLAG} "" LAPACK_FPFLAGS ${LAPACK_FPFLAGS}) + endforeach () + endif () +@@ -562,17 +562,17 @@ + + set(LAPACK_CFLAGS "${CMAKE_C_CFLAGS} -DHAVE_LAPACK_CONFIG_H") + if (INTERFACE64) + set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DLAPACK_ILP64") + endif () + +-if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ++if (WIN32) + set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DOPENBLAS_OS_WINDOWS") + endif () + +-if (${CMAKE_C_COMPILER} STREQUAL "LSB" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ++if (${CMAKE_C_COMPILER} STREQUAL "LSB" OR WIN32) + set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DLAPACK_COMPLEX_STRUCTURE") + endif () + + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") + if ("${F_COMPILER}" STREQUAL "FLANG") + if (${CMAKE_Fortran_COMPILER_VERSION} VERSION_LESS_EQUAL 3) diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index eaafc620b11f1c..d7be1f3383ab11 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openblas", "version": "0.3.19", + "port-version": 1, "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "dependencies": [ diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index ee22997e7721a4..12307b88567087 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -20,8 +20,13 @@ set(PROTOBUF_EXECUTABLE "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VC if(VCPKG_TARGET_IS_WINDOWS) set(BUILD_TOOLS OFF) + # when cross compiling, we can't run their test. however: + # - Windows doesn't support time_t < 0 => HAS_PRE_1970 test returns false + # - Windows doesn't support setenv => HAS_POST_2038 test fails to compile + set(time_t_checks "-DHAS_PRE_1970=OFF" "-DHAS_POST_2038=OFF") else() set(BUILD_TOOLS ON) + set(time_t_checks "") endif() if(VCPKG_TARGET_IS_UWP) @@ -32,6 +37,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ${configure_opts} OPTIONS + ${time_t_checks} -DBUILD_TOOLS=${BUILD_TOOLS} -DBUILD_CPP_TESTS=OFF -DBUILD_JAVA=OFF @@ -40,6 +46,8 @@ vcpkg_cmake_configure( -DPROTOBUF_EXECUTABLE:FILEPATH=${PROTOBUF_EXECUTABLE} -DSTOP_BUILD_ON_WARNING=OFF -DENABLE_TEST=OFF + MAYBE_UNUSED_VARIABLES + ENABLE_TEST ) vcpkg_cmake_install() diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index d442716c41223f..652aa6ca0813a6 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "orc", "version": "1.6.4", - "port-version": 3, + "port-version": 4, "description": "The smallest, fastest columnar storage for Hadoop workloads.", "homepage": "https://orc.apache.org/", "dependencies": [ diff --git a/ports/pthreadpool/fix-uwp.patch b/ports/pthreadpool/fix-uwp.patch index 6ad039d21b5ff3..0b1e5109ae553b 100644 --- a/ports/pthreadpool/fix-uwp.patch +++ b/ports/pthreadpool/fix-uwp.patch @@ -2,12 +2,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index a07945c..6df83d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -75,7 +75,7 @@ ELSE() +@@ -75,7 +75,8 @@ ELSE() LIST(APPEND PTHREADPOOL_SRCS src/portable-api.c src/memory.c) IF(APPLE AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "gcd")) LIST(APPEND PTHREADPOOL_SRCS src/gcd.c) - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) ++ add_compile_options(-wd4146) LIST(APPEND PTHREADPOOL_SRCS src/windows.c) ELSE() LIST(APPEND PTHREADPOOL_SRCS src/pthreads.c) diff --git a/ports/pthreadpool/vcpkg.json b/ports/pthreadpool/vcpkg.json index cff1bc65057ab9..8341b32cebe1bc 100644 --- a/ports/pthreadpool/vcpkg.json +++ b/ports/pthreadpool/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pthreadpool", "version-date": "2020-04-10", - "port-version": 1, + "port-version": 2, "description": "Portable (POSIX/Windows/Emscripten) thread pool for C/C++", "homepage": "https://github.com/Maratyszcza/pthreadpool", "dependencies": [ diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index 868a030e7668cc..b4a73e82964946 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -11,6 +11,12 @@ vcpkg_from_github( shared-zstd.patch ) +vcpkg_replace_string( + "${SOURCE_PATH}/cmake/CheckCXXIntrinsicsSpecific.cmake" + "check_cxx_source_runs" + "check_cxx_source_compiles" +) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ms-gsl SEAL_USE_MSGSL diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json index be1b20e5d800a0..bccf3b64e9e848 100644 --- a/ports/seal/vcpkg.json +++ b/ports/seal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "seal", "version-semver": "3.7.2", - "port-version": 2, + "port-version": 3, "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", "homepage": "https://github.com/microsoft/SEAL", "dependencies": [ diff --git a/ports/vc/dont-use-uninit-var.patch b/ports/vc/dont-use-uninit-var.patch new file mode 100644 index 00000000000000..c974555bd3a05c --- /dev/null +++ b/ports/vc/dont-use-uninit-var.patch @@ -0,0 +1,17 @@ +--- a/Vc/avx/const.h ++++ b/Vc/avx/const.h +@@ -131,13 +131,13 @@ + #endif + } + template <> Vc_ALWAYS_INLINE Vc_CONST Vector Const::highMask(int bits) + { + #ifdef Vc_IMPL_AVX2 + #if defined Vc_ICC || defined Vc_MSVC +- __m256i allone; ++ auto allone = __m256i(); + allone = _mm256_cmpeq_epi8(allone, allone); + #else + auto allone = ~__m256i(); + #endif + return _mm256_castsi256_pd(_mm256_slli_epi64(allone, bits)); + #else diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake index 35a5461e9c3467..2c9150c6a7ebd2 100644 --- a/ports/vc/portfile.cmake +++ b/ports/vc/portfile.cmake @@ -5,7 +5,8 @@ vcpkg_from_github( SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf HEAD_REF 1.4 PATCHES - "correct_cmake_config_path.patch" + correct_cmake_config_path.patch + dont-use-uninit-var.patch ) vcpkg_configure_cmake( diff --git a/ports/vc/vcpkg.json b/ports/vc/vcpkg.json index 14ab1d8bbf6ce1..11bf991ca43717 100644 --- a/ports/vc/vcpkg.json +++ b/ports/vc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vc", "version": "1.4.2", - "port-version": 2, + "port-version": 3, "description": "SIMD Vector Classes for C++ .", "homepage": "https://github.com/VcDevel/Vc", "supports": "!arm64" diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index 49511dcd8b6a5c..9e76d4512dc723 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -2,6 +2,38 @@ if(NOT _VCPKG_WINDOWS_TOOLCHAIN) set(_VCPKG_WINDOWS_TOOLCHAIN 1) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>$<$:DLL>" CACHE STRING "") +set(CMAKE_SYSTEM_NAME WindowsStore CACHE STRING "") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "") +endif() + +if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) +endif() + +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") + # any of the four platforms can run x86 binaries + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") + # arm64 can run binaries of any of the four platforms after Windows 11 + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + endif() + + if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") + endif() +endif() + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) @@ -20,11 +52,11 @@ if(NOT _CMAKE_IN_TRY_COMPILE) endif() set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs; - set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") + set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") #/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD set(_vcpkg_winmd_flag "") file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) - set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}") + set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}") # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps @@ -48,11 +80,11 @@ if(NOT _CMAKE_IN_TRY_COMPILE) if(CMAKE_GENERATOR MATCHES "Ninja") set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection endif() - string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") # VS adds /DEBUG:FULL /TLBID:1. WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES - string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ") string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ") diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake index 954f95535dd93e..7c8a54989d532f 100644 --- a/scripts/toolchains/windows.cmake +++ b/scripts/toolchains/windows.cmake @@ -2,6 +2,38 @@ if(NOT _VCPKG_WINDOWS_TOOLCHAIN) set(_VCPKG_WINDOWS_TOOLCHAIN 1) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>$<$:DLL>" CACHE STRING "") +set(CMAKE_SYSTEM_NAME Windows CACHE STRING "") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "") +endif() + +if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) +endif() + +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") + # any of the four platforms can run x86 binaries + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") + # arm64 can run binaries of any of the four platforms after Windows 11 + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + endif() + + if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") + endif() +endif() + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) diff --git a/versions/a-/ampl-mp.json b/versions/a-/ampl-mp.json index f10ce12eaa3242..15bbff6a2811ee 100644 --- a/versions/a-/ampl-mp.json +++ b/versions/a-/ampl-mp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3bdafa2896aad8990e3886bdd83b8cd5538e7ea", + "version-date": "2020-11-11", + "port-version": 3 + }, { "git-tree": "d52dd1ac4a69a74bb658b52be36c7457ca6049ef", "version-string": "2020-11-11", diff --git a/versions/a-/aom.json b/versions/a-/aom.json index 09f2625b8cd6e1..39f282cdf9d06b 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f251779a2df24b29eac37690d2692fda395218dd", + "version-semver": "3.2.0", + "port-version": 3 + }, { "git-tree": "013d95ace27d59d663acada0264327bf5382308c", "version-semver": "3.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 38d7d3c34f9d26..8e39fb9a20986d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -70,7 +70,7 @@ }, "ampl-mp": { "baseline": "2020-11-11", - "port-version": 2 + "port-version": 3 }, "amqpcpp": { "baseline": "4.3.15", @@ -102,7 +102,7 @@ }, "aom": { "baseline": "3.2.0", - "port-version": 2 + "port-version": 3 }, "approval-tests-cpp": { "baseline": "10.12.2", @@ -1218,7 +1218,7 @@ }, "caf": { "baseline": "0.18.6", - "port-version": 0 + "port-version": 1 }, "caffe2": { "baseline": "0.8.1", @@ -1550,7 +1550,7 @@ }, "corrade": { "baseline": "2020.06", - "port-version": 3 + "port-version": 4 }, "cpp-base64": { "baseline": "V2.rc.08", @@ -1658,7 +1658,7 @@ }, "cpu-features": { "baseline": "0.6.0", - "port-version": 1 + "port-version": 2 }, "cpuid": { "baseline": "0.5.1", @@ -2250,7 +2250,7 @@ }, "fltk": { "baseline": "1.3.8", - "port-version": 1 + "port-version": 2 }, "fluidlite": { "baseline": "2020-08-27", @@ -2398,7 +2398,7 @@ }, "gainput": { "baseline": "1.0.0", - "port-version": 5 + "port-version": 6 }, "gamedev-framework": { "baseline": "0.20.0", @@ -2554,7 +2554,7 @@ }, "glog": { "baseline": "0.5.0", - "port-version": 2 + "port-version": 3 }, "gloo": { "baseline": "20201203", @@ -3462,7 +3462,7 @@ }, "libcopp": { "baseline": "1.4.1", - "port-version": 1 + "port-version": 2 }, "libcpplocate": { "baseline": "2.3.0", @@ -3650,7 +3650,7 @@ }, "libhydrogen": { "baseline": "2021-12-02", - "port-version": 0 + "port-version": 1 }, "libical": { "baseline": "3.0.11", @@ -4398,7 +4398,7 @@ }, "mapnik": { "baseline": "2022-01-28", - "port-version": 1 + "port-version": 2 }, "marble": { "baseline": "19.08.2", @@ -5058,7 +5058,7 @@ }, "openblas": { "baseline": "0.3.19", - "port-version": 0 + "port-version": 1 }, "opencascade": { "baseline": "7.6.0", @@ -5230,7 +5230,7 @@ }, "orc": { "baseline": "1.6.4", - "port-version": 3 + "port-version": 4 }, "orocos-kdl": { "baseline": "1.4", @@ -5606,7 +5606,7 @@ }, "pthreadpool": { "baseline": "2020-04-10", - "port-version": 1 + "port-version": 2 }, "pthreads": { "baseline": "3.0.0", @@ -6410,7 +6410,7 @@ }, "seal": { "baseline": "3.7.2", - "port-version": 2 + "port-version": 3 }, "secp256k1": { "baseline": "2017-19-10", @@ -7302,7 +7302,7 @@ }, "vc": { "baseline": "1.4.2", - "port-version": 2 + "port-version": 3 }, "vcglib": { "baseline": "1.0.1", diff --git a/versions/c-/caf.json b/versions/c-/caf.json index f576dbd6783252..b2ef7f0a4143ce 100644 --- a/versions/c-/caf.json +++ b/versions/c-/caf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b7001bd4d131fa36b766ca44a6ddbb47d3304a1", + "version": "0.18.6", + "port-version": 1 + }, { "git-tree": "be83968f892180d5ee2f1943cf9cac3782e9111e", "version": "0.18.6", diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json index 6a1a88a1a19834..f32bd03b909a20 100644 --- a/versions/c-/corrade.json +++ b/versions/c-/corrade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91ad9b127c41c0538051a0c81e2cb9206a2587dd", + "version-string": "2020.06", + "port-version": 4 + }, { "git-tree": "087770e2a196c44cb1b56473bd57797ed9b9bc87", "version-string": "2020.06", diff --git a/versions/c-/cpu-features.json b/versions/c-/cpu-features.json index 4a9fbc9fc0a7e2..0268469c8abdbd 100644 --- a/versions/c-/cpu-features.json +++ b/versions/c-/cpu-features.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "608368f9c6d85d0278ae92687024e8bd31aecbe4", + "version": "0.6.0", + "port-version": 2 + }, { "git-tree": "7df362e53cec246374da4f3d192bb1d4bb71b2b9", "version": "0.6.0", diff --git a/versions/f-/fltk.json b/versions/f-/fltk.json index 07d0695eeeaddf..96d9824a35cf2d 100644 --- a/versions/f-/fltk.json +++ b/versions/f-/fltk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67f9090df208862fcd949bfae2214dd5fb0a3157", + "version": "1.3.8", + "port-version": 2 + }, { "git-tree": "86da5d186aa27c3a6a9a9903eaa2806edde44bd8", "version": "1.3.8", diff --git a/versions/g-/gainput.json b/versions/g-/gainput.json index 9ce5b1b0ce044c..d23cb9d36d587b 100644 --- a/versions/g-/gainput.json +++ b/versions/g-/gainput.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7d03d82f8c42466bcd155b94e0dcefa79763931", + "version": "1.0.0", + "port-version": 6 + }, { "git-tree": "6edb146db254b1cec192c12f335bef0e54455770", "version": "1.0.0", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 18f3d4be4567cc..62d76e7bab2614 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecb04a5ba4d046af782f62ae7c167bd05b0101a8", + "version": "0.5.0", + "port-version": 3 + }, { "git-tree": "10e0077ffa3485fa75178aa8e2a3f8ec0314573b", "version": "0.5.0", diff --git a/versions/l-/libcopp.json b/versions/l-/libcopp.json index 104a19a9de79be..bceee8ee29270f 100644 --- a/versions/l-/libcopp.json +++ b/versions/l-/libcopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2f995866846ccb6dd7ae147312e095c66f912db", + "version-semver": "1.4.1", + "port-version": 2 + }, { "git-tree": "214d2cff167ae0646312fd5d5f2eecca62a91e19", "version-semver": "1.4.1", diff --git a/versions/l-/libhydrogen.json b/versions/l-/libhydrogen.json index b6e8a73ad28a4f..ed35e83c2dfe33 100644 --- a/versions/l-/libhydrogen.json +++ b/versions/l-/libhydrogen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "609fe75a9dbacc5dc5d3765cdaa1dd045eb89a13", + "version-date": "2021-12-02", + "port-version": 1 + }, { "git-tree": "d5de7dac51afd6d1575a5a74f6a562b2affc1717", "version-date": "2021-12-02", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 19ea139ebe822a..7f11caf0309f4c 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd7ab22238efd828be89e8e17677aa5b395ac07b", + "version-date": "2022-01-28", + "port-version": 2 + }, { "git-tree": "ab089220fb5ecc215804a68c2122d3e0d3ed58bc", "version-date": "2022-01-28", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 0cf8441a75e8b1..8b7301aa54fd11 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90e2cde7fda025b587d6c41e699c98c263cf41eb", + "version": "0.3.19", + "port-version": 1 + }, { "git-tree": "631541b0dcf2ea300f96829885d9bc0282d38a65", "version": "0.3.19", diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 841853463a003c..3110baebac0f1d 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c8bc9de897f95a0499e5dc4a49545cda6e496b2", + "version": "1.6.4", + "port-version": 4 + }, { "git-tree": "543e83b37120267db3f81b5fdb3d349717b20135", "version": "1.6.4", diff --git a/versions/p-/pthreadpool.json b/versions/p-/pthreadpool.json index 8e89e584df016c..2311710b6722b1 100644 --- a/versions/p-/pthreadpool.json +++ b/versions/p-/pthreadpool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb803332761faba74d3a5d83ca25b73d3285d397", + "version-date": "2020-04-10", + "port-version": 2 + }, { "git-tree": "37e004fa65e21e9ffb647d6ff92cd834a46777cf", "version-date": "2020-04-10", diff --git a/versions/s-/seal.json b/versions/s-/seal.json index 5fd1786eaf2ff3..c7ea11730a7baf 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "323502a09f055a964f6b501aed82701570b96cba", + "version-semver": "3.7.2", + "port-version": 3 + }, { "git-tree": "c3499eaa1c19049bc521c3d2799d8d7d6d032a8a", "version-semver": "3.7.2", diff --git a/versions/v-/vc.json b/versions/v-/vc.json index 2d7db742642630..18be5f33328459 100644 --- a/versions/v-/vc.json +++ b/versions/v-/vc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98b96fa582424d700421161838544f1daf738467", + "version": "1.4.2", + "port-version": 3 + }, { "git-tree": "57204c2b095452a828860a6476b8b997463ee36d", "version": "1.4.2", From 8ca9b2b84cb027735a5eb83bad79fa5616d6c369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 29 Apr 2022 20:42:37 +0200 Subject: [PATCH 144/383] [wavpack] arm support (#21790) * [osx] set CMAKE_SYSTEM_PROCESSOR from VCPKG_TARGET_ARCHITECTURE on osx * [linux] Set CMAKE_ASM_COMPILER and CMAKE_ASM-ATT_COMPILER in case of crosscompile * [wavpack] migrate to vcpkg_cmake_install * [wavpack] enable arm builds * [wavpack] Add license field to vcpkg.json * [OSX] don't default to 86_64 --- ports/wavpack/portfile.cmake | 9 ++++----- ports/wavpack/vcpkg.json | 15 +++++++++++++-- scripts/toolchains/linux.cmake | 12 ++++++++++++ scripts/toolchains/osx.cmake | 15 ++++++++++++--- versions/baseline.json | 2 +- versions/w-/wavpack.json | 5 +++++ 6 files changed, 47 insertions(+), 11 deletions(-) diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index 2c0dba8ad00b2a..6b3d4a5c47a7c9 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -9,9 +9,8 @@ vcpkg_from_github( fix-symbol-exports.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS -DWAVPACK_INSTALL_DOCS=OFF -DWAVPACK_BUILD_PROGRAMS=OFF @@ -21,12 +20,12 @@ vcpkg_configure_cmake( -DWAVPACK_BUILD_DOCS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/WavPack) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WavPack) endif() vcpkg_copy_pdbs() diff --git a/ports/wavpack/vcpkg.json b/ports/wavpack/vcpkg.json index 7918e036d04b8f..dff83543e0e642 100644 --- a/ports/wavpack/vcpkg.json +++ b/ports/wavpack/vcpkg.json @@ -1,8 +1,19 @@ { "name": "wavpack", "version": "5.4.0", - "port-version": 1, + "port-version": 2, "description": "WavPack encode/decode library, command-line programs, and several plugins", "homepage": "https://github.com/dbry/WavPack", - "supports": "!(arm | arm64)" + "license": "BSD-3-Clause", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index fb56665384e695..2fac4922deacf7 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -19,6 +19,12 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") if(NOT DEFINED CMAKE_C_COMPILER) set(CMAKE_C_COMPILER "arm-linux-gnueabihf-gcc") endif() + if(NOT DEFINED CMAKE_ASM_COMPILER) + set(CMAKE_ASM_COMPILER "arm-linux-gnueabihf-gcc") + endif() + if(NOT DEFINED CMAKE_ASM-ATT_COMPILER) + set(CMAKE_ASM-ATT_COMPILER "arm-linux-gnueabihf-as") + endif() message(STATUS "Cross compiling arm on host x86_64, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}") endif() elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -30,6 +36,12 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") if(NOT DEFINED CMAKE_C_COMPILER) set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc") endif() + if(NOT DEFINED CMAKE_ASM_COMPILER) + set(CMAKE_ASM_COMPILER "aarch64-linux-gnu-gcc") + endif() + if(NOT DEFINED CMAKE_ASM-ATT_COMPILER) + set(CMAKE_ASM-ATT_COMPILER "aarch64-linux-gnu-as") + endif() message(STATUS "Cross compiling arm64 on host x86_64, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}") endif() endif() diff --git a/scripts/toolchains/osx.cmake b/scripts/toolchains/osx.cmake index 1ab3da5e5d442f..efad6c5fedaca8 100644 --- a/scripts/toolchains/osx.cmake +++ b/scripts/toolchains/osx.cmake @@ -2,17 +2,26 @@ if(NOT _VCPKG_OSX_TOOLCHAIN) set(_VCPKG_OSX_TOOLCHAIN 1) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") - set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") - set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "") else() set(CMAKE_SYSTEM_VERSION "17.0.0" CACHE STRING "") - set(CMAKE_SYSTEM_PROCESSOR "x86_64" CACHE STRING "") endif() set(CMAKE_SYSTEM_NAME Darwin CACHE STRING "") set(CMAKE_MACOSX_RPATH ON CACHE BOOL "") +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR arm64 CACHE STRING "") + else() + set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "") + endif() +endif() + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") diff --git a/versions/baseline.json b/versions/baseline.json index 8e39fb9a20986d..05813878654ae9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7438,7 +7438,7 @@ }, "wavpack": { "baseline": "5.4.0", - "port-version": 1 + "port-version": 2 }, "websocketpp": { "baseline": "0.8.2", diff --git a/versions/w-/wavpack.json b/versions/w-/wavpack.json index a723cf1107e7a3..9a826a33033f6c 100644 --- a/versions/w-/wavpack.json +++ b/versions/w-/wavpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39c514f313b4bc2fc7af0f3a889425bb78aca9e3", + "version": "5.4.0", + "port-version": 2 + }, { "git-tree": "77b8c9ab85776abb2d049d562db7350525ddf7e2", "version": "5.4.0", From 0051a1879cad12eb33078a0960cb954737cad3b2 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 29 Apr 2022 20:44:17 +0200 Subject: [PATCH 145/383] [aricpp] Update to 1.1.2 (#24391) * Update aricpp to 1.1.2 * Update CI baseline * Mark as header-only, remove vcpkg_copy_pdbs * Update CI baseline Co-authored-by: chausner --- ports/aricpp/portfile.cmake | 15 +++++++-------- ports/aricpp/vcpkg.json | 4 ++-- versions/a-/aricpp.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ports/aricpp/portfile.cmake b/ports/aricpp/portfile.cmake index f9c96b5bdbfeb7..189e85e6a8d98e 100644 --- a/ports/aricpp/portfile.cmake +++ b/ports/aricpp/portfile.cmake @@ -1,21 +1,20 @@ +# Header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO daniele77/aricpp - REF v1.1.1 - SHA512 b1e02b9ba9afc1f3315e238cd61b98a8d28eee08ddbaccaf171aa77d27ecec2b3abfaa5aae6905f9c2a1c83b0095a135f2186c977a0ae0cfafb48e3690814183 + REF v1.1.2 + SHA512 bf325de240cdc9c567524cdc127c256d1ac783e785779117374f1d2a5fd4f352545e87f3d1556c2a24e47a203b55bc581a92fb20426295f5f9dcb4a8078cb215 HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() -vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/aricpp) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aricpp/vcpkg.json b/ports/aricpp/vcpkg.json index acfc7e0fb5f162..ec4431ea93690c 100644 --- a/ports/aricpp/vcpkg.json +++ b/ports/aricpp/vcpkg.json @@ -1,9 +1,9 @@ { "name": "aricpp", - "version-semver": "1.1.1", - "port-version": 1, + "version-semver": "1.1.2", "description": "Asterisk ARI interface bindings for modern C++", "homepage": "https://github.com/daniele77/aricpp", + "license": "BSL-1.0", "dependencies": [ "boost-asio", "boost-beast", diff --git a/versions/a-/aricpp.json b/versions/a-/aricpp.json index 728221b15af2cd..745be246936aac 100644 --- a/versions/a-/aricpp.json +++ b/versions/a-/aricpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4c60d911e60c041e3e7791a84894a1c028a7e85", + "version-semver": "1.1.2", + "port-version": 0 + }, { "git-tree": "266bfd31b17badea05be9f9859b0ce84f4d9f60e", "version-semver": "1.1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 05813878654ae9..fdb02fc57b8d5f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -157,8 +157,8 @@ "port-version": 1 }, "aricpp": { - "baseline": "1.1.1", - "port-version": 1 + "baseline": "1.1.2", + "port-version": 0 }, "armadillo": { "baseline": "10.6.2", From 64d550b430188cbbe1f177e8afe7d55a9c737e37 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Fri, 29 Apr 2022 12:33:44 -0700 Subject: [PATCH 146/383] [libunibreak] Update to 5.0 (#24469) * Updated libunibreak and added config.cmake file * Updated version * Updated the manifest file * updated git-tree * Remove vcpkg-cmake-config dependency * updated version Co-authored-by: Benjamin Oldenburg --- ports/libunibreak/CMakeLists.txt | 18 +++++++++----- ports/libunibreak/libunibreak-config.cmake.in | 24 +++++++++++++++++++ ports/libunibreak/portfile.cmake | 12 ++++++---- ports/libunibreak/vcpkg.json | 12 +++++++--- versions/baseline.json | 4 ++-- versions/l-/libunibreak.json | 5 ++++ 6 files changed, 59 insertions(+), 16 deletions(-) create mode 100644 ports/libunibreak/libunibreak-config.cmake.in diff --git a/ports/libunibreak/CMakeLists.txt b/ports/libunibreak/CMakeLists.txt index 7bbff8f3a4e3d1..f1924c2787743a 100644 --- a/ports/libunibreak/CMakeLists.txt +++ b/ports/libunibreak/CMakeLists.txt @@ -3,22 +3,24 @@ cmake_minimum_required(VERSION 3.8.0) project(libunibreak) set(libunibreak_srcs + src/linebreak.c src/linebreakdata.c src/linebreakdef.c - src/linebreak.c src/wordbreak.c + src/wordbreakdata.c src/graphemebreak.c + src/graphemebreakdata.c + src/emojidef.c src/unibreakbase.c src/unibreakdef.c ) - include_directories(src) -add_library(libunibreak ${libunibreak_srcs}) +add_library(unibreak ${libunibreak_srcs}) install( - TARGETS libunibreak + TARGETS unibreak RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib @@ -27,12 +29,16 @@ install( if(NOT DISABLE_INSTALL_HEADERS) install( FILES + src/emojidef.h + src/graphemebreak.h + src/graphemebreakdef.h src/linebreak.h src/linebreakdef.h - src/wordbreak.h - src/wordbreakdef.h + src/test_skips.h src/unibreakbase.h src/unibreakdef.h + src/wordbreak.h + src/wordbreakdef.h DESTINATION include ) endif() diff --git a/ports/libunibreak/libunibreak-config.cmake.in b/ports/libunibreak/libunibreak-config.cmake.in new file mode 100644 index 00000000000000..3c217318c0fedf --- /dev/null +++ b/ports/libunibreak/libunibreak-config.cmake.in @@ -0,0 +1,24 @@ +# For old projects where the minimum CMake version is lower than 3.3. +cmake_policy(SET CMP0057 NEW) +include(CMakeFindDependencyMacro) + +if(TARGET libunibreak) + return() +endif() + +add_library(unibreak INTERFACE IMPORTED GLOBAL) +add_library(libunibreak::libunibreak ALIAS unibreak) + +find_library(LIBUNIBREAK_LIBRARY_DEBUG NAMES unibreak PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) +if(LIBUNIBREAK_LIBRARY_DEBUG) + target_link_libraries(unibreak INTERFACE $<$:${LIBUNIBREAK_LIBRARY_DEBUG}>) +endif() + +find_library(LIBUNIBREAK_LIBRARY_RELEASE NAMES unibreak PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) +target_link_libraries(unibreak INTERFACE $<$>:${LIBUNIBREAK_LIBRARY_RELEASE}>) + +set(LIBUNIBREAK_LIBRARY libunibreak::libunibreak PARENT_SCOPE) +set(LIBUNIBREAK_LIBRARIES libunibreak::libunibreak PARENT_SCOPE) +set(LIBUNIBREAK_INCLUDE_DIR "${_INSTALL_DIR}/include" PARENT_SCOPE) + +target_include_directories(unibreak INTERFACE ${_INSTALL_DIR}/include) \ No newline at end of file diff --git a/ports/libunibreak/portfile.cmake b/ports/libunibreak/portfile.cmake index 883a58c554dccb..c73851614fccd5 100644 --- a/ports/libunibreak/portfile.cmake +++ b/ports/libunibreak/portfile.cmake @@ -3,19 +3,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adah1972/libunibreak - REF 8df6ef4ebe5dbd2a49539d05366337ab7fb57ae3 # libunibreak_4_3 - SHA512 791e342dcc0e79e15f578ec93239d53a656f9e1804f9ec8b970cfac2b6c4f3456855513c36f18f8e72a91dac64060abc336e4716d584dbec86e1fb0c91eded69 + REF libunibreak_5_0 # libunibreak_5_0 + SHA512 909c12cf5df92f0374050fc7a0ef9e91bc1efe6a5dc5a80f4e2c81a507f1228ecaba417c3ee001e11b2422024bea68cc14eb66e08360ae69f830cdaa18764484 HEAD_REF master ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/libunibreak-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/libunibreak-config.cmake" @ONLY) file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libunibreak RENAME copyright) diff --git a/ports/libunibreak/vcpkg.json b/ports/libunibreak/vcpkg.json index c1d89b1a2e5d68..7e2a8dd328f561 100644 --- a/ports/libunibreak/vcpkg.json +++ b/ports/libunibreak/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libunibreak", - "version-string": "4.3", - "port-version": 1, + "version": "5.0", "description": "an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.", - "homepage": "https://github.com/adah1972/libunibreak" + "homepage": "https://github.com/adah1972/libunibreak", + "license": "zlib-acknowledgement", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index fdb02fc57b8d5f..ea7a6b254910c4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4113,8 +4113,8 @@ "port-version": 2 }, "libunibreak": { - "baseline": "4.3", - "port-version": 1 + "baseline": "5.0", + "port-version": 0 }, "libunifex": { "baseline": "2021-12-07", diff --git a/versions/l-/libunibreak.json b/versions/l-/libunibreak.json index ebb9099296bdc9..9250855dc31da9 100644 --- a/versions/l-/libunibreak.json +++ b/versions/l-/libunibreak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab89a270477d6d97e3d70c4503ee573f1ca8e539", + "version": "5.0", + "port-version": 0 + }, { "git-tree": "f1fb2965625f4dc28c5ab3c4e0a8a128901a0f0e", "version-string": "4.3", From 2ece8fedb9e5065e7a21ffa7f110e2b6c2d95dab Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Fri, 29 Apr 2022 22:21:34 +0200 Subject: [PATCH 147/383] [qt5-base]: Fix build with "mysqlplugin" feature by linking to OpenSSL and zlib (#24462) Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- ports/qt5-base/portfile.cmake | 4 ++-- ports/qt5-base/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 80c5996e59ac43..f686611f2f7264 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -279,8 +279,8 @@ if(VCPKG_TARGET_IS_WINDOWS) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") endif() if (WITH_MYSQL_PLUGIN) - list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE}") - list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG}") + list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ZLIB_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") + list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ZLIB_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") endif(WITH_MYSQL_PLUGIN) elseif(VCPKG_TARGET_IS_LINUX) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index c4b5d854b4881b..71b1b9488d70a6 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version": "5.15.3", - "port-version": 2, + "port-version": 3, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index ea7a6b254910c4..b4c17d93ee79d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5690,7 +5690,7 @@ }, "qt5-base": { "baseline": "5.15.3", - "port-version": 2 + "port-version": 3 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index a14cf4e64aa0ec..324f49b931495d 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7518c5eeb84d3bbfaaa88cb19795b693fd0923f7", + "version": "5.15.3", + "port-version": 3 + }, { "git-tree": "abaaa592badf33576f197d915ed1f4ddd91d0931", "version": "5.15.3", From c8a56fdc1594dfe134213c8c3edf1cc620e4fb37 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 29 Apr 2022 21:27:24 -0700 Subject: [PATCH 148/383] [libvpx,lmdb,aubio,freetype-gl,intelrdfpmathlib,libbson,libtcod,metis,pqp,smpeg2] Build fixes 2022-04-28 (#24470) * [libvpx,lmdb,aubio,freetype-gl,intelrdfpmathlib,libbson,libtcod,metis,pqp,smpeg2] Build fixes 2022-04-28 These results are from the most recent CI run: https://dev.azure.com/vcpkg/public/_build/results?buildId=71465 PASSING, REMOVE FROM FAIL LIST: aubio:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). I also did some investigation as to why aubio:arm-uwp didn't pass. Turns out, it's because aubio depends on ffmpeg, which failed to build because it depends on libvpx, which we never fixed for UWP following the VS2022 update. See also https://developercommunity.visualstudio.com/t/MicrosoftVisualStudioComponentVCTool/10002207?space=62&scope=follow&sort=newest PASSING, REMOVE FROM FAIL LIST: freetype-gl:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). I also checked freetype-gl:arm-uwp, but it's blocked by glew which is blocked by opengl which appears to not be a thing on arm. PASSING, REMOVE FROM FAIL LIST: intelrdfpmathlib:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). The arm-uwp version of this emits errors that look like source issues; I blocked arm&windows with a supports expression: D:\buildtrees\intelrdfpmathlib\src\athLib20U2-d2a8954428.clean\LIBRARY\src\bid_functions.h(3113): error C2719: 'x': formal parameter with requested alignment of 16 won't be aligned PASSING, REMOVE FROM FAIL LIST: libbson:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libbson:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libtcod:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libtcod:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: lmdb:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). arm-uwp failed with again what looks like a source issue: mdb.c.obj : error LNK2001: unresolved external symbol __tls_used mdb.c.obj : error LNK2001: unresolved external symbol _mdb_tls_cbp PASSING, REMOVE FROM FAIL LIST: metis:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: metis:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: pqp:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: pqp:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: smpeg2:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: smpeg2:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). I also checked Linux and it says Could NOT find ibverbs (missing: IBVERBS_INCLUDE_DIRS IBVERBS_LIBRARIES) which may be vcpkg's fault so I left that ci.baseline.txt skip alone. REGRESSION: jansson:arm-uwp failed with POST_BUILD_CHECKS_FAILED. If expected, add jansson:arm-uwp=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: jansson:x64-uwp failed with POST_BUILD_CHECKS_FAILED. If expected, add jansson:x64-uwp=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. Already fixed by https://github.com/microsoft/vcpkg/pull/24466 * dos2unix the patch * :dos2unix the other patches too --- ports/intelrdfpmathlib/vcpkg.json | 3 +- .../0002-Fix-nasm-debug-format-flag.patch | 42 ++++++------ ... 0003-add-uwp-v142-and-v143-support.patch} | 65 ++++++++++++++++--- .../libvpx/0004-remove-library-suffixes.patch | 26 ++++---- ports/libvpx/portfile.cmake | 22 ++++--- ports/libvpx/vcpkg.json | 1 + ports/lmdb/vcpkg.json | 3 +- scripts/ci.baseline.txt | 18 ----- versions/baseline.json | 6 +- versions/i-/intelrdfpmathlib.json | 5 ++ versions/l-/libvpx.json | 5 ++ versions/l-/lmdb.json | 5 ++ 12 files changed, 125 insertions(+), 76 deletions(-) rename ports/libvpx/{0003-add-uwp-and-v142-support.patch => 0003-add-uwp-v142-and-v143-support.patch} (73%) diff --git a/ports/intelrdfpmathlib/vcpkg.json b/ports/intelrdfpmathlib/vcpkg.json index 1be8cccde57bf9..87415c924a48ed 100644 --- a/ports/intelrdfpmathlib/vcpkg.json +++ b/ports/intelrdfpmathlib/vcpkg.json @@ -1,8 +1,9 @@ { "name": "intelrdfpmathlib", "version-string": "20U2", - "port-version": 3, + "port-version": 4, "description": "Intel(R) Decimal Floating-Point Math Library", + "supports": "!(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch b/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch index 9202f4bd9a5c11..5f4749ae0056c1 100644 --- a/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch +++ b/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch @@ -1,21 +1,21 @@ -diff --git a/build/make/configure.sh b/build/make/configure.sh -index 81d30a16c..d4f19cd97 100644 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -1370,12 +1370,14 @@ EOF - case ${tgt_os} in - win32) - add_asflags -f win32 -- enabled debug && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 - EXE_SFX=.exe - ;; - win64) - add_asflags -f win64 -- enabled debug && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 - EXE_SFX=.exe - ;; - linux*|solaris*|android*) +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 81d30a1..325017e 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -1370,12 +1370,14 @@ EOF + case ${tgt_os} in + win32) + add_asflags -f win32 +- enabled debug && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 + EXE_SFX=.exe + ;; + win64) + add_asflags -f win64 +- enabled debug && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 + EXE_SFX=.exe + ;; + linux*|solaris*|android*) diff --git a/ports/libvpx/0003-add-uwp-and-v142-support.patch b/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch similarity index 73% rename from ports/libvpx/0003-add-uwp-and-v142-support.patch rename to ports/libvpx/0003-add-uwp-v142-and-v143-support.patch index 9d689ab59f9051..fd82486c10dbf4 100644 --- a/ports/libvpx/0003-add-uwp-and-v142-support.patch +++ b/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch @@ -1,5 +1,5 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index d4f19cd97..fb51368b1 100644 +index 325017e..5ab54e4 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -1016,7 +1016,7 @@ EOF @@ -47,10 +47,31 @@ index d4f19cd97..fb51368b1 100644 *-win*-vs*) ;; *-android-gcc) +diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh +index d1adfd7..a03ea59 100644 +--- a/build/make/gen_msvs_sln.sh ++++ b/build/make/gen_msvs_sln.sh +@@ -219,6 +219,7 @@ for opt in "$@"; do + 14) vs_year=2015 ;; + 15) vs_year=2017 ;; + 16) vs_year=2019 ;; ++ 17) vs_year=2022 ;; + *) die Unrecognized Visual Studio Version in $opt ;; + esac + ;; diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh -index 6f91ad478..916851662 100755 +index 6f91ad4..b4cad6c 100644 --- a/build/make/gen_msvs_vcxproj.sh +++ b/build/make/gen_msvs_vcxproj.sh +@@ -170,7 +170,7 @@ for opt in "$@"; do + --ver=*) + vs_ver="$optval" + case "$optval" in +- 1[4-6]) ++ 1[4-7]) + ;; + *) die Unrecognized Visual Studio Version in $opt + ;; @@ -296,7 +296,22 @@ generate_vcxproj() { tag_content ProjectGuid "{${guid}}" tag_content RootNamespace ${name} @@ -75,7 +96,17 @@ index 6f91ad478..916851662 100755 tag_content AppContainerApplication true # The application type can be one of "Windows Store", # "Windows Phone" or "Windows Phone Silverlight". The -@@ -391,7 +406,7 @@ generate_vcxproj() { +@@ -344,6 +359,9 @@ generate_vcxproj() { + if [ "$vs_ver" = "16" ]; then + tag_content PlatformToolset v142 + fi ++ if [ "$vs_ver" = "17" ]; then ++ tag_content PlatformToolset v143 ++ fi + tag_content CharacterSet Unicode + if [ "$config" = "Release" ]; then + tag_content WholeProgramOptimization true +@@ -391,7 +409,7 @@ generate_vcxproj() { Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'" if [ "$name" == "vpx" ]; then hostplat=$plat @@ -85,47 +116,63 @@ index 6f91ad478..916851662 100755 fi fi diff --git a/configure b/configure -index da631a45e..da93474e5 100755 +index da631a4..2804678 100644 --- a/configure +++ b/configure -@@ -101,16 +101,20 @@ all_platforms="${all_platforms} arm64-android-gcc" +@@ -101,16 +101,24 @@ all_platforms="${all_platforms} arm64-android-gcc" all_platforms="${all_platforms} arm64-darwin-gcc" all_platforms="${all_platforms} arm64-darwin20-gcc" all_platforms="${all_platforms} arm64-linux-gcc" +all_platforms="${all_platforms} arm64-uwp-vs16" ++all_platforms="${all_platforms} arm64-uwp-vs17" all_platforms="${all_platforms} arm64-win64-gcc" all_platforms="${all_platforms} arm64-win64-vs15" +all_platforms="${all_platforms} arm64-win64-vs16" ++all_platforms="${all_platforms} arm64-win64-vs17" all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 +all_platforms="${all_platforms} armv7-uwp-vs16" ++all_platforms="${all_platforms} armv7-uwp-vs17" all_platforms="${all_platforms} armv7-win32-gcc" all_platforms="${all_platforms} armv7-win32-vs14" all_platforms="${all_platforms} armv7-win32-vs15" +all_platforms="${all_platforms} armv7-win32-vs16" ++all_platforms="${all_platforms} armv7-win32-vs17" all_platforms="${all_platforms} armv7s-darwin-gcc" all_platforms="${all_platforms} armv8-linux-gcc" all_platforms="${all_platforms} mips32-linux-gcc" -@@ -135,6 +139,7 @@ all_platforms="${all_platforms} x86-linux-gcc" +@@ -135,10 +143,13 @@ all_platforms="${all_platforms} x86-linux-gcc" all_platforms="${all_platforms} x86-linux-icc" all_platforms="${all_platforms} x86-os2-gcc" all_platforms="${all_platforms} x86-solaris-gcc" +all_platforms="${all_platforms} x86-uwp-vs16" ++all_platforms="${all_platforms} x86-uwp-vs17" all_platforms="${all_platforms} x86-win32-gcc" all_platforms="${all_platforms} x86-win32-vs14" all_platforms="${all_platforms} x86-win32-vs15" -@@ -156,6 +161,7 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" + all_platforms="${all_platforms} x86-win32-vs16" ++all_platforms="${all_platforms} x86-win32-vs17" + all_platforms="${all_platforms} x86_64-android-gcc" + all_platforms="${all_platforms} x86_64-darwin9-gcc" + all_platforms="${all_platforms} x86_64-darwin10-gcc" +@@ -156,10 +167,13 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-icc" all_platforms="${all_platforms} x86_64-solaris-gcc" +all_platforms="${all_platforms} x86_64-uwp-vs16" ++all_platforms="${all_platforms} x86_64-uwp-vs17" all_platforms="${all_platforms} x86_64-win64-gcc" all_platforms="${all_platforms} x86_64-win64-vs14" all_platforms="${all_platforms} x86_64-win64-vs15" -@@ -476,11 +482,10 @@ process_targets() { + all_platforms="${all_platforms} x86_64-win64-vs16" ++all_platforms="${all_platforms} x86_64-win64-vs17" + all_platforms="${all_platforms} generic-gnu" + + # all_targets is a list of all targets that can be configured +@@ -476,11 +490,10 @@ process_targets() { ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt" ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs" DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}" @@ -141,7 +188,7 @@ index da631a45e..da93474e5 100755 if [ -f "${source_path}/build/make/version.sh" ]; then ver=`"$source_path/build/make/version.sh" --bare "$source_path"` DIST_DIR="${DIST_DIR}-${ver}" -@@ -569,6 +574,10 @@ process_detect() { +@@ -569,6 +582,10 @@ process_detect() { # Specialize windows and POSIX environments. case $toolchain in diff --git a/ports/libvpx/0004-remove-library-suffixes.patch b/ports/libvpx/0004-remove-library-suffixes.patch index c8feaf8f388864..e7f827d7b156ab 100644 --- a/ports/libvpx/0004-remove-library-suffixes.patch +++ b/ports/libvpx/0004-remove-library-suffixes.patch @@ -1,13 +1,13 @@ -diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh -index 916851662..e60405bc9 100755 ---- a/build/make/gen_msvs_vcxproj.sh -+++ b/build/make/gen_msvs_vcxproj.sh -@@ -394,7 +394,7 @@ generate_vcxproj() { - else - config_suffix="" - fi -- tag_content TargetName "${name}${lib_sfx}${config_suffix}" -+ tag_content TargetName "${name}" - fi - close_tag PropertyGroup - done +diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh +index 916851662..e60405bc9 100755 +--- a/build/make/gen_msvs_vcxproj.sh ++++ b/build/make/gen_msvs_vcxproj.sh +@@ -394,7 +394,7 @@ generate_vcxproj() { + else + config_suffix="" + fi +- tag_content TargetName "${name}${lib_sfx}${config_suffix}" ++ tag_content TargetName "${name}" + fi + close_tag PropertyGroup + done diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index ac17dbbfa2f896..8126ad72232a43 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 0002-Fix-nasm-debug-format-flag.patch - 0003-add-uwp-and-v142-support.patch + 0003-add-uwp-v142-and-v143-support.patch 0004-remove-library-suffixes.patch ) @@ -19,12 +19,12 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) if(CMAKE_HOST_WIN32) - vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) - set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) - set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") + vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") else() - set(BASH /bin/bash) - set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") + set(BASH /bin/bash) + set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") endif() vcpkg_find_acquire_program(NASM) @@ -42,7 +42,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_CRT_SUFFIX md) endif() - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore AND VCPKG_PLATFORM_TOOLSET STREQUAL v142) + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore AND (VCPKG_PLATFORM_TOOLSET STREQUAL v142 OR VCPKG_PLATFORM_TOOLSET STREQUAL v143)) set(LIBVPX_TARGET_OS "uwp") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm) set(LIBVPX_TARGET_OS "win32") @@ -64,7 +64,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_ARCH_DIR "ARM") endif() - if(VCPKG_PLATFORM_TOOLSET STREQUAL v142) + if(VCPKG_PLATFORM_TOOLSET STREQUAL v143) + set(LIBVPX_TARGET_VS "vs17") + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL v142) set(LIBVPX_TARGET_VS "vs16") else() set(LIBVPX_TARGET_VS "vs15") @@ -143,10 +145,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}") configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vpx.pc" @ONLY) endif() - + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}/debug") - configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY) endif() else() diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index 321571a287b6cf..05d404362c05cf 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libvpx", "version": "1.11.0", + "port-version": 1, "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx", "license": "BSD-3-Clause", diff --git a/ports/lmdb/vcpkg.json b/ports/lmdb/vcpkg.json index 15ef262df8e55a..210c776d13ada1 100644 --- a/ports/lmdb/vcpkg.json +++ b/ports/lmdb/vcpkg.json @@ -1,10 +1,11 @@ { "name": "lmdb", "version": "0.9.29", - "port-version": 1, + "port-version": 2, "description": "LMDB is an extraordinarily fast, memory-efficient database", "homepage": "https://github.com/LMDB/lmdb", "license": null, + "supports": "!(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f4ae0f062de5a4..59ab14591ea0cc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -48,8 +48,6 @@ # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail -aubio:arm-uwp=fail -aubio:x64-uwp=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:x64-osx=fail @@ -288,7 +286,6 @@ freeglut:x64-uwp=fail freeglut:x64-osx=fail # Needs /bigobj freeopcua:arm64-windows=fail -freetype-gl:x64-uwp=fail ftgl:x64-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 functions-framework-cpp:x64-uwp=fail @@ -400,8 +397,6 @@ intel-mkl:x64-windows=fail intel-mkl:x64-windows-static=fail intel-mkl:x64-windows-static-md=fail intel-mkl:x86-windows=fail -intelrdfpmathlib:arm-uwp=fail -intelrdfpmathlib:x64-uwp=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail irrlicht:x64-uwp=fail @@ -450,8 +445,6 @@ libbf:x64-windows=fail libbf:x64-windows-static=fail libbf:x64-windows-static-md=fail libbf:x86-windows=fail -libbson:arm-uwp=fail -libbson:x64-uwp=fail libcopp:arm64-windows=fail libcopp:arm-uwp=fail # Missing system libraries on linux to run/prepare autoconf @@ -584,8 +577,6 @@ libsrt:x64-uwp=fail libssh:arm64-windows=fail libssh:arm-uwp=fail libssh:x64-uwp=fail -libtcod:arm-uwp=fail -libtcod:x64-uwp=fail libtins:arm-uwp=fail libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail @@ -616,7 +607,6 @@ libvmdk:x64-windows-static-md=skip libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip -libvpx:arm-uwp=fail libwandio:x86-windows=fail libwandio:x64-windows=fail libwandio:x64-windows-static=fail @@ -633,8 +623,6 @@ live555:x64-osx=fail live555:x64-uwp=fail llgl:arm-uwp=fail llgl:x64-uwp=fail -lmdb:arm-uwp=fail -lmdb:x64-uwp=fail log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail log4cxx:arm-uwp=fail @@ -676,8 +664,6 @@ mesa:x64-windows-static-md=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail -metis:arm-uwp=fail -metis:x64-uwp=fail mfl:x64-linux=skip mfl:x64-osx=skip milerius-sfml-imgui:x64-windows-static=fail @@ -933,8 +919,6 @@ pmdk:x64-windows-static=fail pmdk:x86-windows=fail popsift:x64-windows-static-md=fail portable-snippets:arm-uwp=fail -pqp:arm-uwp=fail -pqp:x64-uwp=fail # Not yet ready for these platforms. qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail @@ -1117,9 +1101,7 @@ skia:x64-uwp=fail sleef:x86-windows=fail slikenet:arm-uwp=fail slikenet:x64-uwp=fail -smpeg2:arm-uwp=fail smpeg2:x64-linux=fail -smpeg2:x64-uwp=fail soci:arm-uwp=fail soci:x64-uwp=fail sockpp:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index b4c17d93ee79d6..d24eaa5d93ee9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2974,7 +2974,7 @@ }, "intelrdfpmathlib": { "baseline": "20U2", - "port-version": 3 + "port-version": 4 }, "io2d": { "baseline": "2020-09-14", @@ -4162,7 +4162,7 @@ }, "libvpx": { "baseline": "1.11.0", - "port-version": 0 + "port-version": 1 }, "libwandio": { "baseline": "4.2.1", @@ -4266,7 +4266,7 @@ }, "lmdb": { "baseline": "0.9.29", - "port-version": 1 + "port-version": 2 }, "lodepng": { "baseline": "2021-12-04", diff --git a/versions/i-/intelrdfpmathlib.json b/versions/i-/intelrdfpmathlib.json index 0795294158b376..fdeefa02e2a816 100644 --- a/versions/i-/intelrdfpmathlib.json +++ b/versions/i-/intelrdfpmathlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47e6c0bf433235a53c450a3c1c61388a10a643e0", + "version-string": "20U2", + "port-version": 4 + }, { "git-tree": "b105f0256b4fccc53e7653a732dc65459e1d8562", "version-string": "20U2", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index 03cd212ec3ed26..7758ffc7ab7577 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d03c5487a2e01ccc310c1d3e5b0b2c78232cf2b", + "version": "1.11.0", + "port-version": 1 + }, { "git-tree": "3ec8aec9ecbcb2e3b5a0af7cea8045359d9aec94", "version": "1.11.0", diff --git a/versions/l-/lmdb.json b/versions/l-/lmdb.json index 22e21e7ef8553e..d150fa7f195cd8 100644 --- a/versions/l-/lmdb.json +++ b/versions/l-/lmdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c94e6b90d91bc39a4307502116b20d7b38de413", + "version": "0.9.29", + "port-version": 2 + }, { "git-tree": "02d32452e2c5a3284fcdd1f448ab513dbb18a085", "version": "0.9.29", From f30786c9c4c901f21a13e2d524349e39cc359a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 2 May 2022 18:56:24 +0000 Subject: [PATCH 149/383] [vcpkg toolchain] Fix paths with special characters (#24463) * [vcpkg toolchain] Fix paths with special characters * fix * Use VERBATIM instead of double quotes --- scripts/buildsystems/vcpkg.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index ce3a9bbe1d6ab1..0ae8473ffd2e2a 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -584,14 +584,16 @@ function(add_executable) -targetBinary "$" -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin" -OutVariable out + VERBATIM ${EXTRA_OPTIONS} ) elseif(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx") if(NOT MACOSX_BUNDLE_IDX EQUAL -1) add_custom_command(TARGET "${target_name}" POST_BUILD - COMMAND python "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py" - "$" - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>" + COMMAND python "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py" + "$" + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>" + VERBATIM ) endif() endif() @@ -618,6 +620,7 @@ function(add_library) -targetBinary "$" -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin" -OutVariable out + VERBATIM ) endif() set_target_properties("${target_name}" PROPERTIES VS_USER_PROPS do_not_import_user.props) From 5c47237349574ae40cba685992a94d45599c1ea4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 2 May 2022 20:42:37 -0700 Subject: [PATCH 150/383] [rsm-binary-io] Update to 2.0.5 (#24477) * add license info * update to 2.0.5 * update versions --- ports/rsm-binary-io/portfile.cmake | 4 ++-- ports/rsm-binary-io/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/r-/rsm-binary-io.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/rsm-binary-io/portfile.cmake b/ports/rsm-binary-io/portfile.cmake index bb14909cee9a9c..121c0601883f20 100644 --- a/ports/rsm-binary-io/portfile.cmake +++ b/ports/rsm-binary-io/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ryan-rsm-McKenzie/binary_io - REF 2.0.4 - SHA512 a2025be9db79e2d89ab28fdda98cfe88ae6a7f0f0a7e3b6d9f99a1bf8a7b4d89e8a34db21a9bdf11784c7f01fb27a6b083c8af81743919e04efb0736c151bb7e + REF 2.0.5 + SHA512 787833487b9e2b64aeb73842024a52a6ad646d2609342983ebf1539878b96565bf329c8b05afca0fb35a1e40a91174131ad7a0bdc79b168a12bf02f3d6e0cd6d HEAD_REF main ) diff --git a/ports/rsm-binary-io/vcpkg.json b/ports/rsm-binary-io/vcpkg.json index 0c5c77eb66dd54..1b66d51418c5b0 100644 --- a/ports/rsm-binary-io/vcpkg.json +++ b/ports/rsm-binary-io/vcpkg.json @@ -1,10 +1,10 @@ { "name": "rsm-binary-io", - "version-semver": "2.0.4", - "port-version": 1, + "version-semver": "2.0.5", "description": "A binary i/o library for C++, without the agonizing pain", "homepage": "https://github.com/Ryan-rsm-McKenzie/binary_io", "documentation": "https://ryan-rsm-mckenzie.github.io/binary_io/", + "license": "MIT", "supports": "!osx & !uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index d24eaa5d93ee9e..bc81891e737805 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6245,8 +6245,8 @@ "port-version": 0 }, "rsm-binary-io": { - "baseline": "2.0.4", - "port-version": 1 + "baseline": "2.0.5", + "port-version": 0 }, "rsm-bsa": { "baseline": "4.0.3", diff --git a/versions/r-/rsm-binary-io.json b/versions/r-/rsm-binary-io.json index 34c422faf7d580..213de95d551507 100644 --- a/versions/r-/rsm-binary-io.json +++ b/versions/r-/rsm-binary-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a170dd2013d45c86b272169552cf4ac52a5d1c79", + "version-semver": "2.0.5", + "port-version": 0 + }, { "git-tree": "954debdfb4b8f785728e7c263ea3ea3ee7093253", "version-semver": "2.0.4", From 9f9f6572f58c1971ab1c3005afb8623e40bfa2ce Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 3 May 2022 05:43:03 +0200 Subject: [PATCH 151/383] [nuspell] Update to 5.1.0 (#24485) * Update nuspell to 5.1.0 * Update CI baseline * Fix license * Update CI baseline Co-authored-by: chausner --- ports/nuspell/portfile.cmake | 25 +++++++++++-------------- ports/nuspell/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/n-/nuspell.json | 5 +++++ 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/ports/nuspell/portfile.cmake b/ports/nuspell/portfile.cmake index 3128018e3e72bf..9e52673c1bbca0 100644 --- a/ports/nuspell/portfile.cmake +++ b/ports/nuspell/portfile.cmake @@ -1,17 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nuspell/nuspell - REF v5.0.0 - SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5 + REF v5.1.0 + SHA512 08ce776d224c66ba4bdd8cb22943741f30e8e5ba03396bfef1db598321c9b0f8814dacffcb52287b3b669426c7b08e2c1a40323341a9ff9768a7187002e1d77a HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_TESTING=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nuspell) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nuspell) vcpkg_fixup_pkgconfig( # nuspell.pc depends on icu-uc.pc which has -lm specified as private # library. Ignore this -lm, otherwise this function shows error @@ -20,10 +20,7 @@ vcpkg_fixup_pkgconfig( ) vcpkg_copy_tools(TOOL_NAMES nuspell AUTO_CLEAN) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -file( - INSTALL ${SOURCE_PATH}/COPYING.LESSER - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nuspell/vcpkg.json b/ports/nuspell/vcpkg.json index 5840ce1c50b459..7ec126bd67a0ec 100644 --- a/ports/nuspell/vcpkg.json +++ b/ports/nuspell/vcpkg.json @@ -1,13 +1,22 @@ { "name": "nuspell", - "version-semver": "5.0.0", + "version-semver": "5.1.0", "description": [ "Nuspell is a fast and safe spelling checker software program.", "It is designed for languages with rich morphology and complex word compounding.", "Nuspell is written in modern C++ and it supports Hunspell dictionaries." ], "homepage": "https://nuspell.github.io/", + "license": "LGPL-3.0-or-later", "dependencies": [ - "icu" + "icu", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index bc81891e737805..fc5613f68b3745 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4921,7 +4921,7 @@ "port-version": 0 }, "nuspell": { - "baseline": "5.0.0", + "baseline": "5.1.0", "port-version": 0 }, "nvtt": { diff --git a/versions/n-/nuspell.json b/versions/n-/nuspell.json index a6bb2cf2931856..06ba7265629aa3 100644 --- a/versions/n-/nuspell.json +++ b/versions/n-/nuspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53fb93bbc0d441813026ef171e32d7479ab839f3", + "version-semver": "5.1.0", + "port-version": 0 + }, { "git-tree": "80e078d3797fd83a92fd3a6d0f59a373e43beadb", "version-semver": "5.0.0", From 4da5dcbad9a7cc012d48e095f3dd8f43b62bc935 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 3 May 2022 05:43:36 +0200 Subject: [PATCH 152/383] [mdns] Update to 1.4.2 (#24487) * Update mdns to 1.4.2 * Update CI baseline Co-authored-by: chausner --- ports/mdns/portfile.cmake | 4 ++-- ports/mdns/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/m-/mdns.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/mdns/portfile.cmake b/ports/mdns/portfile.cmake index 665b7a99a4c225..272ef3b93feabf 100644 --- a/ports/mdns/portfile.cmake +++ b/ports/mdns/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mjansson/mdns - REF 1.4.1 - SHA512 f1268841b5e4ba40ba62e7e08d55ac7f83b675f76c694976097a1c17dd6c662ced953230a4556b81ff5a39a969c67e01d040f1b6c83b9dd27b2cb0adc6af05b9 + REF 1.4.2 + SHA512 fa3fcf130721ee6f7012225c1e7952bd41703c2488b1d0ffe2b8c73ed06744d1cd9f03b6ab19aa0b8074fbfaafe46f8e102d6a648756725a60dc076e896cfbf6 HEAD_REF master ) diff --git a/ports/mdns/vcpkg.json b/ports/mdns/vcpkg.json index 2cb48af8d6c748..c0dade8e7ba38e 100644 --- a/ports/mdns/vcpkg.json +++ b/ports/mdns/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mdns", - "version": "1.4.1", + "version": "1.4.2", "description": "Public domain mDNS/DNS-SD library in C", "homepage": "https://github.com/mjansson/mdns", + "license": "Unlicense", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index fc5613f68b3745..8e75fb2e8a9e48 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4441,7 +4441,7 @@ "port-version": 3 }, "mdns": { - "baseline": "1.4.1", + "baseline": "1.4.2", "port-version": 0 }, "mdnsresponder": { diff --git a/versions/m-/mdns.json b/versions/m-/mdns.json index b902fa0fd6050b..1f40a43a9acc95 100644 --- a/versions/m-/mdns.json +++ b/versions/m-/mdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56cbde1a40c13e9584e62d15f69c2579f6bcd476", + "version": "1.4.2", + "port-version": 0 + }, { "git-tree": "4983c367da3c0798e1e0a7b9d8844eeba57c5b97", "version": "1.4.1", From 3fc8bbe48fab68917817bbbe7b74f3dcffc489b2 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 3 May 2022 05:43:48 +0200 Subject: [PATCH 153/383] [spectra] Update to 1.0.1 (#24488) * Update spectra to 1.0.1 * Update CI baseline Co-authored-by: chausner --- ports/spectra/portfile.cmake | 4 ++-- ports/spectra/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/spectra.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/spectra/portfile.cmake b/ports/spectra/portfile.cmake index 9a2394490bcee4..dad97dd37f13ae 100644 --- a/ports/spectra/portfile.cmake +++ b/ports/spectra/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yixuan/spectra - REF v1.0.0 - SHA512 45540b12d370a28029f507f503618a0be9c19ec3a41813e23e036211dbc98237ac502c7f60cd42ccaa262f9dc0ebc02aabdefcd314f0c98c1e3dc925df02d783 + REF v1.0.1 + SHA512 575f90d2ab9c3cbdd4bbfe1abce35a262e319dac8689420859811a169cbfd8f617c80bfcd430aa8a5383c96f338155870a0ad7ac0d5db855c1e822c2d19837b5 HEAD_REF master ) diff --git a/ports/spectra/vcpkg.json b/ports/spectra/vcpkg.json index 83d1c1fc46d168..1d7f1e1e71abd9 100644 --- a/ports/spectra/vcpkg.json +++ b/ports/spectra/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spectra", - "version": "1.0.0", + "version": "1.0.1", "description": "A header-only C++ library for large scale eigenvalue problems", "homepage": "https://spectralib.org", "documentation": "https://spectralib.org/quick-start.html", diff --git a/versions/baseline.json b/versions/baseline.json index 8e75fb2e8a9e48..05e9308bd28738 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6673,7 +6673,7 @@ "port-version": 0 }, "spectra": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "speex": { diff --git a/versions/s-/spectra.json b/versions/s-/spectra.json index 93fa4767692434..191ee1f5e83a4d 100644 --- a/versions/s-/spectra.json +++ b/versions/s-/spectra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f0c59842a36bd2be452ce3b9f1f7de0a17f01aa", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "1ba33cde480488a9a7d4f98f6f2f26e591feb019", "version": "1.0.0", From 43e35945783d078d1216927b85447b2eba34a7cc Mon Sep 17 00:00:00 2001 From: talregev Date: Tue, 3 May 2022 06:45:24 +0300 Subject: [PATCH 154/383] Add ipv6 glib source code source (#24503) --- ports/glib/portfile.cmake | 6 +++--- ports/glib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/glib.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 8ef135df7353ad..c0e4b526657e10 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -7,9 +7,9 @@ endif() set(GLIB_MAJOR_MINOR 2.70) set(GLIB_PATCH 5) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/gnome/sources/glib/${GLIB_MAJOR_MINOR}/glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.xz" - FILENAME "glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.xz" - SHA512 3dfb45a9b6fe67fcf185f5cbb3985b6f1da17caf9c6f01e638d8fe4a6271ea1a30b0cf4ca8f43728bd29a8ac13b05a34e1cf262ade7795f0c0d0a2c0b90b1ff8) + URLS "https://gitlab.gnome.org/GNOME/glib/-/archive/${GLIB_MAJOR_MINOR}.${GLIB_PATCH}/glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.gz" + FILENAME "glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.gz" + SHA512 69c032358e0a0d88414a97e0bc898b5ce2797839a432b95790d03f108e55a79eee2d51bab5e281cc9469e2a57accc0d2c9bbaa80f9369050534387d1a215dd98) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 6ad02e28ce8356..fa88feecc5e3f7 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glib", "version": "2.70.5", + "port-version": 1, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "supports": "!uwp & !(windows & static)", diff --git a/versions/baseline.json b/versions/baseline.json index 05e9308bd28738..68cab36bbcd279 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2538,7 +2538,7 @@ }, "glib": { "baseline": "2.70.5", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.70.0", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index c4c805e65d474e..bf0260aef3f7f0 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23fe84cc74f69a066a1e2a2629a527b9c8d058ad", + "version": "2.70.5", + "port-version": 1 + }, { "git-tree": "c9d76755634e72f74de67a04e2713ba0278e772a", "version": "2.70.5", From b98afc9f1192becb2f447cee485ce36ba111f9f6 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 3 May 2022 05:46:25 +0200 Subject: [PATCH 155/383] [pcre2] Update to 10.40, drop `-static` suffix (#24505) * Update to 10.40 * Drop '-static' suffix for MSVC The suffix breaks pc files. Renaming allowed by maintainer guidelines, to facilitate downstream usage. * Update versions --- ports/pcre2/no-static-suffix.patch | 33 ++++++++++++++++++++++++++++++ ports/pcre2/portfile.cmake | 7 ++++--- ports/pcre2/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/p-/pcre2.json | 5 +++++ 5 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 ports/pcre2/no-static-suffix.patch diff --git a/ports/pcre2/no-static-suffix.patch b/ports/pcre2/no-static-suffix.patch new file mode 100644 index 00000000000000..7f41bcd566cfe8 --- /dev/null +++ b/ports/pcre2/no-static-suffix.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fa2181e..3bf5317 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -711,8 +711,8 @@ IF(PCRE2_BUILD_PCRE2_8) + SET(targets ${targets} pcre2-posix-static) + + IF(MSVC) +- SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8-static) +- SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix-static) ++ SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8) ++ SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix) + ELSE(MSVC) + SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8) + SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix) +@@ -777,7 +777,7 @@ IF(PCRE2_BUILD_PCRE2_16) + SET(targets ${targets} pcre2-16-static) + + IF(MSVC) +- SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16-static) ++ SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16) + ELSE(MSVC) + SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16) + ENDIF(MSVC) +@@ -829,7 +829,7 @@ IF(PCRE2_BUILD_PCRE2_32) + SET(targets ${targets} pcre2-32-static) + + IF(MSVC) +- SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32-static) ++ SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32) + ELSE(MSVC) + SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32) + ENDIF(MSVC) diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index 0568f07a35b999..8211bb287dce16 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO PhilipHazel/pcre2 - REF 35fee4193b852cb504892352bd0155de10809889 # pcre2-10.39 - SHA512 a6e50f3354dc4172df05e887dd8646d4ce6a3584fe180b17dc27b42b094e13d1d1a7e5ab3cb15dd352764d81ac33cfd03e81b0c890d9ddec72d823ca6f8bd667 + REPO PCRE2Project/pcre2 + REF pcre2-10.40 + SHA512 098c21d60ecb3bb8449173f50c9ab8e6018fafd5d55548be08b15df37f8e08bcd4f851d75758c4d22505db30a3444bb65783d83cd876c63fdf0de2850815ef93 HEAD_REF master PATCHES pcre2-10.35_fix-uwp.patch + no-static-suffix.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json index b6a59e074e28a1..410cd552ead830 100644 --- a/ports/pcre2/vcpkg.json +++ b/ports/pcre2/vcpkg.json @@ -1,9 +1,9 @@ { "name": "pcre2", - "version": "10.39", - "port-version": 2, + "version": "10.40", "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", - "homepage": "https://github.com/PhilipHazel/pcre2", + "homepage": "https://github.com/PCRE2Project/pcre2", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 68cab36bbcd279..ddd2324713eb02 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5341,8 +5341,8 @@ "port-version": 2 }, "pcre2": { - "baseline": "10.39", - "port-version": 2 + "baseline": "10.40", + "port-version": 0 }, "pdal": { "baseline": "2.3.0", diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json index bba977373475ab..55d7929cfe68a7 100644 --- a/versions/p-/pcre2.json +++ b/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "725d8f25eea7d10b24944f314db69aa8b29d4932", + "version": "10.40", + "port-version": 0 + }, { "git-tree": "9a15903858198c8a3b890972b5e8c0d2aa3f89f8", "version": "10.39", From d5bb8c15411cb0db067c7ba61b6d8fb8ebfc3352 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 4 May 2022 15:09:15 -0700 Subject: [PATCH 156/383] Build Fixes 2022-05-01 (#24497) Discovered in https://dev.azure.com/vcpkg/public/_build/results?buildId=71530 PASSING, REMOVE FROM FAIL LIST: blosc:arm64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: corrade:arm-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: corrade:x64-uwp (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: libhydrogen:arm64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). REGRESSION: sundials:x64-osx failed with BUILD_FAILED. If expected, add sundials:x64-osx=fail to /Users/vagrant/Data/work/2/s/scripts/azure-pipelines/../ci.baseline.txt. File does not have the expected hash: url : [ https://github.com/LLNL/sundials/archive/v5.8.0.tar.gz ] File path : [ /Users/vagrant/Data/downloads/LLNL-sundials-v5.8.0.tar.gz.98418.part ] Expected hash : [ 30f6a7bddf813634e4266c36331673b52448b719f938f45a4efb6a96cfbeea4fe168fdded89309672b148f8ef8bc05997d838627e828573900ec169a41472372 ] Actual hash : [ 0b11db1b944cfce4672954aceeec3f21253b4f684031f26b8bc0a8b3b12d895e604456bd1f283767812352eb5a9202c5797f612410f654f561ca5565d719bcae ] REGRESSION: brunocodutra-metal:x64-linux failed with BUILD_FAILED. If expected, add brunocodutra-metal:x64-linux=fail to /agent/_work/1/s/scripts/azure-pipelines/../ci.baseline.txt. This was another download failure but may as well update. REGRESSION: plplot:x64-linux failed with BUILD_FAILED. If expected, add plplot:x64-linux=fail to /agent/_work/1/s/scripts/azure-pipelines/../ci.baseline.txt. This was another download failure with every SourceForge mirror giving a different hash O_O. I tried to do an update but it's ... involved for this library so I've separated it. --- ports/brunocodutra-metal/portfile.cmake | 4 ++-- ports/brunocodutra-metal/vcpkg.json | 2 +- ports/sundials/portfile.cmake | 16 ++++++++-------- ports/sundials/vcpkg.json | 2 +- scripts/ci.baseline.txt | 4 ---- versions/b-/brunocodutra-metal.json | 5 +++++ versions/baseline.json | 4 ++-- versions/s-/sundials.json | 5 +++++ 8 files changed, 24 insertions(+), 18 deletions(-) diff --git a/ports/brunocodutra-metal/portfile.cmake b/ports/brunocodutra-metal/portfile.cmake index 8e43dca25a8e03..7dc6ce53094ca7 100644 --- a/ports/brunocodutra-metal/portfile.cmake +++ b/ports/brunocodutra-metal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brunocodutra/metal - REF 2.1.3 - SHA512 7a71f8bdbdb8a19084d0cabd4c78a4f2990514f2da56312aec8dfac02f6781c95f28bc33815ecbb3d9e3e8d2b47cc5dbcd4917751195a8318bea7c08fca29b23 + REF 9db9b403e58e0be0bbd295ff64f01e700965f25d + SHA512 b611d88d310893329f48111716c849571cb1459da1e71851bf3ec7393f18f8eb94077ce12410a9bcb1953e6b4ea0e8f2d2db5ce7f555a72ab2b7dae434b52d62 HEAD_REF master ) diff --git a/ports/brunocodutra-metal/vcpkg.json b/ports/brunocodutra-metal/vcpkg.json index b2d73955d64953..400950a7c02576 100644 --- a/ports/brunocodutra-metal/vcpkg.json +++ b/ports/brunocodutra-metal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "brunocodutra-metal", - "version": "2.1.3", + "version": "2.1.4", "description": "A single header C++11 library designed to make you love template metaprogramming", "dependencies": [ { diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake index 34ceecc99bd5d0..b340a361dd584e 100644 --- a/ports/sundials/portfile.cmake +++ b/ports/sundials/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LLNL/sundials - REF v5.8.0 - SHA512 30f6a7bddf813634e4266c36331673b52448b719f938f45a4efb6a96cfbeea4fe168fdded89309672b148f8ef8bc05997d838627e828573900ec169a41472372 + REF e2f29c34f324829302037a1492db480be8828084 + SHA512 9af9a5d7a44de1f2afbc35d8e2ec3d35a2d15f1b708be7a90bf849a0d0576fda6c73fae6b8954025805ac1ca25468558c02dcc2fd86b5767699518988817d4d8 HEAD_REF master PATCHES install-dlls-in-bin.patch @@ -12,20 +12,20 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SUN_BUILD_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -D_BUILD_EXAMPLES=OFF -DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC} -DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED} ) -vcpkg_cmake_install(DISABLE_PARALLEL) +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") diff --git a/ports/sundials/vcpkg.json b/ports/sundials/vcpkg.json index df5c71f1478792..bcb330e61a5ebb 100644 --- a/ports/sundials/vcpkg.json +++ b/ports/sundials/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sundials", - "version-semver": "5.8.0", + "version-semver": "6.2.0", "description": "SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)", "homepage": "https://computation.llnl.gov/projects/sundials", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 59ab14591ea0cc..1dc331037c5616 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -54,7 +54,6 @@ bitserializer:x64-osx=fail blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail -blosc:arm64-windows=fail bond:arm-uwp=fail bond:x64-osx=fail bond:x64-uwp=fail @@ -160,8 +159,6 @@ coolprop:x64-uwp=fail coroutine:arm-uwp=fail coroutine:x64-linux=fail coroutine:x64-uwp=fail -corrade:arm-uwp=fail -corrade:x64-uwp=fail cppcms:x64-linux=fail cppcms:x64-osx=fail cppcms:x64-windows-static=fail @@ -477,7 +474,6 @@ libgpg-error:x64-uwp=fail libhdfs3:x64-linux=fail libhdfs3:x64-osx=fail -libhydrogen:arm64-windows=fail libigl:arm64-windows=fail libigl:arm-uwp=fail libigl:x64-uwp=fail diff --git a/versions/b-/brunocodutra-metal.json b/versions/b-/brunocodutra-metal.json index 49c93e2f2f7e58..dc8d49cf9e59aa 100644 --- a/versions/b-/brunocodutra-metal.json +++ b/versions/b-/brunocodutra-metal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cf9fc40f35037ebc568d8da494ba1c84221327d", + "version": "2.1.4", + "port-version": 0 + }, { "git-tree": "54b5610e8e1541618650eec938a77148866716cc", "version": "2.1.3", diff --git a/versions/baseline.json b/versions/baseline.json index ddd2324713eb02..8dc083208a0a69 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1157,7 +1157,7 @@ "port-version": 7 }, "brunocodutra-metal": { - "baseline": "2.1.3", + "baseline": "2.1.4", "port-version": 0 }, "brynet": { @@ -6817,7 +6817,7 @@ "port-version": 1 }, "sundials": { - "baseline": "5.8.0", + "baseline": "6.2.0", "port-version": 0 }, "superlu": { diff --git a/versions/s-/sundials.json b/versions/s-/sundials.json index f9d1be6be58a74..48ada8c7e01e13 100644 --- a/versions/s-/sundials.json +++ b/versions/s-/sundials.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c95957f06e56f03fb6336a30a984ff7273a36c5a", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "206df7509167e6e89bdac2e9252e9e57615e18a4", "version-semver": "5.8.0", From c59864c27c19f42617de571309926eb8c7f13943 Mon Sep 17 00:00:00 2001 From: SvenPStarFinanz Date: Thu, 5 May 2022 00:58:09 +0200 Subject: [PATCH 157/383] [xmlsec] Update to 1.2.34 (#24537) * [xmlsec] Update to 1.2.34 * x-add-version --- ports/xmlsec/portfile.cmake | 4 ++-- ports/xmlsec/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/x-/xmlsec.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/xmlsec/portfile.cmake b/ports/xmlsec/portfile.cmake index 06100e4c159d61..e105d409c12775 100644 --- a/ports/xmlsec/portfile.cmake +++ b/ports/xmlsec/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lsh123/xmlsec - REF e628e70040cb0d81a561462472806aeaac1d1bc7 #xmlsec-1_2_33 - SHA512 2d4485941d354160f7fabd84394c61eef9dcea8be572d78bf7da7370880747f86ff76127fa000f8b0de06f462abef17d653270dee680fa35d96cc8200fb4d1a6 + REF d823da17c80b38ccc3c4262d7b2042b07e69e266 # xmlsec-1_2_34 + SHA512 10ca5cb948723fcf1531efaab547c0665bc323cd52906decd314e0c78fff46ac7bc51eba5177838fc7f081f74f5e4a202d765c17dd0da6e378798676773a68ce HEAD_REF master PATCHES pkgconfig_fixes.patch diff --git a/ports/xmlsec/vcpkg.json b/ports/xmlsec/vcpkg.json index 446cfcf1a72626..c09ebc45e816ce 100644 --- a/ports/xmlsec/vcpkg.json +++ b/ports/xmlsec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xmlsec", - "version": "1.2.33", + "version": "1.2.34", "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.", "homepage": "https://www.aleksey.com/xmlsec/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8dc083208a0a69..beb5a4f59a2eb8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7577,7 +7577,7 @@ "port-version": 0 }, "xmlsec": { - "baseline": "1.2.33", + "baseline": "1.2.34", "port-version": 0 }, "xnnpack": { diff --git a/versions/x-/xmlsec.json b/versions/x-/xmlsec.json index 0667e390fb267b..f9b1032eb01c51 100644 --- a/versions/x-/xmlsec.json +++ b/versions/x-/xmlsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a41c14aae637b02b4e018902e0f9b67bcdef12f2", + "version": "1.2.34", + "port-version": 0 + }, { "git-tree": "635a9b0883829c524cc712d552d9a265ef984bf7", "version": "1.2.33", From ea31629cde96402045289cc9efdcb9b2ddf71ffb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 5 May 2022 01:09:42 +0200 Subject: [PATCH 158/383] [qtwebengine] Fix VS2022 ICE (#24532) * qtwebengine ice fix * move CURRENT_BUILDTREES_DIR only if necessary * version stuff * create tmp dir. * version update Co-authored-by: Alexander Neumann --- ports/qtwebengine/0ce5e91.diff | 94 ++++++++++++++++++++++++++++++++ ports/qtwebengine/portfile.cmake | 17 +++++- ports/qtwebengine/vcpkg.json | 1 + scripts/ci.baseline.txt | 3 - versions/baseline.json | 2 +- versions/q-/qtwebengine.json | 5 ++ 6 files changed, 115 insertions(+), 7 deletions(-) create mode 100644 ports/qtwebengine/0ce5e91.diff diff --git a/ports/qtwebengine/0ce5e91.diff b/ports/qtwebengine/0ce5e91.diff new file mode 100644 index 00000000000000..cf26bade11dd20 --- /dev/null +++ b/ports/qtwebengine/0ce5e91.diff @@ -0,0 +1,94 @@ +From 0ce5e91bdfa2cd7cac247911b9e8c4404c114937 Mon Sep 17 00:00:00 2001 +From: Peter Varga +Date: Thu, 21 Apr 2022 08:49:53 +0200 +Subject: [PATCH] Workaround MSVC2022 ICE in constexpr functions + +It happens around initialization of STL containers in a constexpr +function. In this case, aggregate initialization of std::array with +double braces seems to cause the crash. + +For some reason it doesn't seem to happen in 98-based. This workaround +can be reverted after Microsoft fixes the issue: +https://developercommunity.visualstudio.com/t/fatal-error-C1001:-Internal-compiler-err/1669485 + +Change-Id: I6bc2c71d328691cc74bc53c6d62f3d5df519b81e +Pick-to: 90-based +Fixes: QTBUG-101917 +Reviewed-by: Allan Sandfeld Jensen +--- + +diff --git a/chromium/base/hash/md5_constexpr_internal.h b/chromium/base/hash/md5_constexpr_internal.h +index b705bc8..5c9c004 100644 +--- a/chromium/base/hash/md5_constexpr_internal.h ++++ b/chromium/base/hash/md5_constexpr_internal.h +@@ -281,15 +281,63 @@ + return IntermediateDataToMD5Digest(ProcessMessage(data, n)); + } + +- static constexpr uint64_t Hash64(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return (static_cast(SwapEndian(intermediate.a)) << 32) | +- static_cast(SwapEndian(intermediate.b)); ++ static constexpr uint64_t Hash64(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return (static_cast(SwapEndian(intermediate0.a)) << 32) | ++ static_cast(SwapEndian(intermediate0.b)); + } + +- static constexpr uint32_t Hash32(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return SwapEndian(intermediate.a); ++ static constexpr uint32_t Hash32(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return SwapEndian(intermediate0.a); + } + }; + diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index 3ffe0b37638f1d..469852f8324e5e 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -82,15 +82,26 @@ if(WIN32) # WIN32 HOST probably has win_flex and win_bison! endif() endif() -#set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/../tmp") # avoid long path issues in CI. -#cmake_path(NORMAL_PATH CURRENT_BUILDTREES_DIR) -#file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}") +string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length) +# We know that C:/buildrees/${PORT} is to long to build Release. Debug works however. Means 24 length is too much but 23 might work. +if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS) + message(WARNING "Buildtree path '${CURRENT_BUILDTREES_DIR}' is too long.\nConsider passing --x-buildtrees-root= to vcpkg!\nTrying to use '${CURRENT_BUILDTREES_DIR}/../tmp'") + set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/../tmp") # activly avoid long path issues in CI. -> Means CI will not return logs + cmake_path(NORMAL_PATH CURRENT_BUILDTREES_DIR) + string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length_new) + if(buildtree_length_new GREATER 22) + message(FATAL_ERROR "Buildtree path is too long. Build will fail! Pass --x-buildtrees-root= to vcpkg!") + endif() + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}") +endif() ### Download third_party modules vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE URL git://code.qt.io/qt/qtwebengine-chromium.git REF "${${PORT}_chromium_REF}" + PATCHES + 0ce5e91.diff ) ##### qt_install_submodule diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 6b55e368c92c58..0c84aa2301e438 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", "version": "6.3.0", + "port-version": 1, "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1dc331037c5616..a5a5e8750662c4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -923,9 +923,6 @@ qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail qt5-base:arm64-windows=fail -# qtwebengine:x64-windows has an ICE in VS2022 -qtwebengine:x64-windows=fail - # Skip deprecated Qt module # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) qt5-canvas3d:x64-linux=skip diff --git a/versions/baseline.json b/versions/baseline.json index beb5a4f59a2eb8..20b4cd5d7cffcd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5998,7 +5998,7 @@ }, "qtwebengine": { "baseline": "6.3.0", - "port-version": 0 + "port-version": 1 }, "qtwebsockets": { "baseline": "6.3.0", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 0e91c3f0b7ec38..afcecd55057c15 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6562d0a0294290afd20da039ff60602c1f3f4701", + "version": "6.3.0", + "port-version": 1 + }, { "git-tree": "47cd0b321b5eda832afbb46e58159ca3adb65ce9", "version": "6.3.0", From b33f616f85e207012aa8229706d8e603efd5794d Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 4 May 2022 16:17:35 -0700 Subject: [PATCH 159/383] [directx-headers] updated for DirectX SDK Agility SDK v1.602.0 (#24490) * Updated directx-headers port for v.1.600.10 * Update baseline * Updated directx-headers port for v.1.602.0 * Update baseline * Updated per github-actions bot recommendations * Update baseline * Update versions/d-/directx-headers.json Co-authored-by: Billy O'Neal Co-authored-by: Billy O'Neal --- ports/directx-headers/portfile.cmake | 13 ++++++------- ports/directx-headers/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 4 ++-- versions/d-/directx-headers.json | 5 +++++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake index 93ec93f09c30de..02dad035541c95 100644 --- a/ports/directx-headers/portfile.cmake +++ b/ports/directx-headers/portfile.cmake @@ -1,19 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectX-Headers - REF v1.4.9 - SHA512 439d28a8344ef3a012428f53fcb9d2d9823d51c61786363d87f8ba15921326c220478b2557aab3f641a2406f1e5f299a8e21a82547febff3b9cd7b26b09b1c22 + REF v1.602.0 + SHA512 75d81191e3e0b60bc901f04fcb9cf53f0faae7f0c196a1b04f2b9199c72243d4dddaeacad29d82ca7ccb209b16d07b4f1b71a58368fccad13c4d8421e0c9f0d9 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DDXHEADERS_BUILD_TEST=OFF + OPTIONS -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/directx-headers/cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/directx-headers/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directx-headers/vcpkg.json b/ports/directx-headers/vcpkg.json index b0723567c13f00..b250c966d03b8a 100644 --- a/ports/directx-headers/vcpkg.json +++ b/ports/directx-headers/vcpkg.json @@ -1,8 +1,19 @@ { "name": "directx-headers", - "version": "1.4.9", - "port-version": 1, + "version": "1.602.0", "description": "Official DirectX 12 Headers", "homepage": "https://devblogs.microsoft.com/directx/", - "supports": "windows | linux" + "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/", + "license": "MIT", + "supports": "windows | linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 20b4cd5d7cffcd..166fe60485662e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1857,8 +1857,8 @@ "port-version": 3 }, "directx-headers": { - "baseline": "1.4.9", - "port-version": 1 + "baseline": "1.602.0", + "port-version": 0 }, "directxmath": { "baseline": "2022-01-18", diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json index 7f8bb1812bf07a..bb915e8257c307 100644 --- a/versions/d-/directx-headers.json +++ b/versions/d-/directx-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6271f7dc1af5888b39b0443ff7ecc9d01f1db94", + "version": "1.602.0", + "port-version": 0 + }, { "git-tree": "e9da93d00966da04931e1eab14be7bb4fc8998d5", "version": "1.4.9", From 87b258ee6b674f0a5de97e5d466ebd8de8849908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 5 May 2022 03:30:24 +0200 Subject: [PATCH 160/383] [libsndfile] Adjust depenedncies to libsndfile that only the really requred additional external libraries are needed (#24539) --- ports/aubio/vcpkg.json | 8 ++++++-- ports/flashlight-cpu/vcpkg.json | 11 +++++++++-- ports/flashlight-cuda/vcpkg.json | 11 +++++++++-- ports/gamma/vcpkg.json | 11 +++++++++-- ports/simage/vcpkg.json | 12 +++++++++--- ports/vamp-sdk/vcpkg.json | 8 ++++++-- versions/a-/aubio.json | 5 +++++ versions/baseline.json | 12 ++++++------ versions/f-/flashlight-cpu.json | 5 +++++ versions/f-/flashlight-cuda.json | 5 +++++ versions/g-/gamma.json | 5 +++++ versions/s-/simage.json | 5 +++++ versions/v-/vamp-sdk.json | 5 +++++ 13 files changed, 84 insertions(+), 19 deletions(-) diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index dd977ac9242754..bbae92425a9f02 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -1,9 +1,10 @@ { "name": "aubio", "version-semver": "0.4.9", - "port-version": 7, + "port-version": 8, "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", + "license": "GPL-3.0-or-later", "dependencies": [ { "name": "vcpkg-cmake", @@ -34,7 +35,10 @@ "libflac", "liblzma", "libogg", - "libsndfile", + { + "name": "libsndfile", + "default-features": false + }, "libvorbis" ] } diff --git a/ports/flashlight-cpu/vcpkg.json b/ports/flashlight-cpu/vcpkg.json index 98a934d244dff8..03ef5e957d6c11 100644 --- a/ports/flashlight-cpu/vcpkg.json +++ b/ports/flashlight-cpu/vcpkg.json @@ -1,9 +1,10 @@ { "name": "flashlight-cpu", "version": "0.3", - "port-version": 2, + "port-version": 3, "description": "A C++ standalone library for machine learning. CPU backend.", "homepage": "https://github.com/facebookresearch/flashlight", + "license": "MIT", "supports": "!(windows | osx)", "default-features": [ "fl" @@ -20,7 +21,13 @@ ] }, "gflags", - "libsndfile" + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } ] }, "fl": { diff --git a/ports/flashlight-cuda/vcpkg.json b/ports/flashlight-cuda/vcpkg.json index c0e0a026f4cd22..0f0afd07551030 100644 --- a/ports/flashlight-cuda/vcpkg.json +++ b/ports/flashlight-cuda/vcpkg.json @@ -1,9 +1,10 @@ { "name": "flashlight-cuda", "version": "0.3", - "port-version": 2, + "port-version": 4, "description": "A C++ standalone library for machine learning. CUDA backend.", "homepage": "https://github.com/facebookresearch/flashlight", + "license": "MIT", "supports": "!(windows | osx)", "default-features": [ "fl" @@ -20,7 +21,13 @@ ] }, "gflags", - "libsndfile" + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } ] }, "fl": { diff --git a/ports/gamma/vcpkg.json b/ports/gamma/vcpkg.json index 9e13ebd52ce97b..3fcba5d20dc3ac 100644 --- a/ports/gamma/vcpkg.json +++ b/ports/gamma/vcpkg.json @@ -1,11 +1,18 @@ { "name": "gamma", "version-string": "gamma-2018-01-27", - "port-version": 3, + "port-version": 4, "description": "Gamma is a cross-platform, C++ library for doing generic synthesis and filtering of signals. It is oriented towards real-time sound and graphics applications, but is equally useful for non-real-time tasks. Gamma is designed to be \"light-footed\" in terms of memory and processing making it highly suitable for plug-in development or embedding in other C++ projects.", "homepage": "https://github.com/LancePutnam/Gamma", + "license": "MIT", "dependencies": [ - "libsndfile", + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + }, "portaudio" ] } diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json index c02cb098bcf821..f961409b4dfaca 100644 --- a/ports/simage/vcpkg.json +++ b/ports/simage/vcpkg.json @@ -1,9 +1,10 @@ { "name": "simage", "version-semver": "1.8.2", + "port-version": 1, "description": "Image file format library abstraction layer", "homepage": "https://github.com/coin3d/simage", - "license": null, + "license": "ISC", "supports": "!uwp", "dependencies": [ { @@ -129,8 +130,13 @@ "sndfile": { "description": "Use libsndfile to load/save sampled sound", "dependencies": [ - "libflac", - "libsndfile" + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } ] }, "tiff": { diff --git a/ports/vamp-sdk/vcpkg.json b/ports/vamp-sdk/vcpkg.json index 1c2156b5117022..33f02b2358818e 100644 --- a/ports/vamp-sdk/vcpkg.json +++ b/ports/vamp-sdk/vcpkg.json @@ -2,12 +2,16 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "vamp-sdk", "version": "2.10", - "port-version": 2, + "port-version": 3, "description": "Library for Vamp plugins", "homepage": "https://www.vamp-plugins.org/develop.html", + "license": "MIT", "supports": "!uwp", "dependencies": [ - "libsndfile", + { + "name": "libsndfile", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index 540f6d7eafa42c..9528d263f51df9 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4888190139ae3bd7f3fdb15f79453b25f59a45f5", + "version-semver": "0.4.9", + "port-version": 8 + }, { "git-tree": "b7115b787e5f71bf65454f4c3cff3ec85b4eb264", "version-semver": "0.4.9", diff --git a/versions/baseline.json b/versions/baseline.json index 166fe60485662e..b5596d48805bc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -222,7 +222,7 @@ }, "aubio": { "baseline": "0.4.9", - "port-version": 7 + "port-version": 8 }, "audiofile": { "baseline": "1.1.0", @@ -2234,11 +2234,11 @@ }, "flashlight-cpu": { "baseline": "0.3", - "port-version": 2 + "port-version": 3 }, "flashlight-cuda": { "baseline": "0.3", - "port-version": 2 + "port-version": 4 }, "flatbuffers": { "baseline": "2.0.6", @@ -2410,7 +2410,7 @@ }, "gamma": { "baseline": "gamma-2018-01-27", - "port-version": 3 + "port-version": 4 }, "gasol": { "baseline": "2018-01-04", @@ -6494,7 +6494,7 @@ }, "simage": { "baseline": "1.8.2", - "port-version": 0 + "port-version": 1 }, "simbody": { "baseline": "2022-01-04", @@ -7294,7 +7294,7 @@ }, "vamp-sdk": { "baseline": "2.10", - "port-version": 2 + "port-version": 3 }, "variant-lite": { "baseline": "2.0.0", diff --git a/versions/f-/flashlight-cpu.json b/versions/f-/flashlight-cpu.json index af315e2b94a47c..9f6e60debc4b82 100644 --- a/versions/f-/flashlight-cpu.json +++ b/versions/f-/flashlight-cpu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "217b238dc2abf773a66a004f21d4c89dcc9324e3", + "version": "0.3", + "port-version": 3 + }, { "git-tree": "b37aa1e8b06ce24319b6969ed0fa87664e4ec308", "version": "0.3", diff --git a/versions/f-/flashlight-cuda.json b/versions/f-/flashlight-cuda.json index 0844f0264d8377..3c6f29741703fd 100644 --- a/versions/f-/flashlight-cuda.json +++ b/versions/f-/flashlight-cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c59cec24c52379832bb5b227963c0b6681346a7", + "version": "0.3", + "port-version": 4 + }, { "git-tree": "afbc9bcce8e115033ecd9d1c64c2b4375c556e67", "version": "0.3", diff --git a/versions/g-/gamma.json b/versions/g-/gamma.json index 2c67cdc47146a9..f507b7da0b9e69 100644 --- a/versions/g-/gamma.json +++ b/versions/g-/gamma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "335e66b704d42844b1fef58f31a05545aec2e328", + "version-string": "gamma-2018-01-27", + "port-version": 4 + }, { "git-tree": "69d699310fe2e651e63668d194c19dfae5fd9376", "version-string": "gamma-2018-01-27", diff --git a/versions/s-/simage.json b/versions/s-/simage.json index 76fc0327589a8d..1bbd0a518afed9 100644 --- a/versions/s-/simage.json +++ b/versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d877e927cdad3e67542b5c66c26bdc0bda9f5ade", + "version-semver": "1.8.2", + "port-version": 1 + }, { "git-tree": "9a3815e60349ce152d08a7f02abab301e3b6bceb", "version-semver": "1.8.2", diff --git a/versions/v-/vamp-sdk.json b/versions/v-/vamp-sdk.json index 153a9e1f0a314a..ab9cdc4230b3d1 100644 --- a/versions/v-/vamp-sdk.json +++ b/versions/v-/vamp-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac0236fcb60d389d21fe96a9c96c5f21f9e905b0", + "version": "2.10", + "port-version": 3 + }, { "git-tree": "9d2b2ab057b4e31d833668e82f95283c7afbc551", "version": "2.10", From 4a9ce78d941ce8d08833a58396627e708c1c4601 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 5 May 2022 03:31:36 +0200 Subject: [PATCH 161/383] [activemq-cpp] no absolute paths (#24525) --- ports/activemq-cpp/portfile.cmake | 8 ++++++++ ports/activemq-cpp/vcpkg.json | 2 +- versions/a-/activemq-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ports/activemq-cpp/portfile.cmake b/ports/activemq-cpp/portfile.cmake index 0645eaf234241e..595326c5188e1e 100644 --- a/ports/activemq-cpp/portfile.cmake +++ b/ports/activemq-cpp/portfile.cmake @@ -38,6 +38,12 @@ if (VCPKG_TARGET_IS_LINUX) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}") vcpkg_copy_pdbs() + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}/debug" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + endif() else() set(ACTIVEMQCPP_MSVC_PROJ "${SOURCE_PATH}/vs2010-build/activemq-cpp.vcxproj") @@ -126,5 +132,7 @@ else() vcpkg_clean_msbuild() endif() +vcpkg_fixup_pkgconfig() + file(INSTALL "${CURRENT_PORT_DIR}/activemq-cppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/activemq-cpp") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json index c2bdb9c173f615..1128611005b510 100644 --- a/ports/activemq-cpp/vcpkg.json +++ b/ports/activemq-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 8, + "port-version": 9, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "supports": "!(uwp | osx)", "dependencies": [ diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index 4869266c2869cb..6403895d71c48a 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f5d3901f612afe54e714fb14e47d343822e398e", + "version-semver": "3.9.5", + "port-version": 9 + }, { "git-tree": "ec8c68847a3d3950cec058e76a3963fac34fd682", "version-semver": "3.9.5", diff --git a/versions/baseline.json b/versions/baseline.json index b5596d48805bc4..b04d1863981ef1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -22,7 +22,7 @@ }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 8 + "port-version": 9 }, "ade": { "baseline": "0.1.1f", From 86a51af126bc1f2b14bd2e68e66a230f49003a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hock?= Date: Thu, 5 May 2022 03:33:35 +0200 Subject: [PATCH 162/383] [stftpitchshift] New port (#24529) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add stftpitchshift port * Fix shared library build on Windows * Run vcpkg x-add-version stftpitchshift * Update version database * Just increase the version counter to hopefully fix the vcpkg problem I simply don't understand... šŸ˜” * Now update both sha and version... * Update version database * Fix version database. * Add quotes and modernize cmake helpers. Co-authored-by: Billy Robert O'Neal --- ports/stftpitchshift/portfile.cmake | 19 +++++++++++++++++++ ports/stftpitchshift/vcpkg.json | 11 +++++++++++ versions/baseline.json | 4 ++++ versions/s-/stftpitchshift.json | 9 +++++++++ 4 files changed, 43 insertions(+) create mode 100644 ports/stftpitchshift/portfile.cmake create mode 100644 ports/stftpitchshift/vcpkg.json create mode 100644 versions/s-/stftpitchshift.json diff --git a/ports/stftpitchshift/portfile.cmake b/ports/stftpitchshift/portfile.cmake new file mode 100644 index 00000000000000..ecf27ef9ac5090 --- /dev/null +++ b/ports/stftpitchshift/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jurihock/stftPitchShift + HEAD_REF main + REF e25def2f6aad9db865aded9f0550fd1c7925188f + SHA512 a7e9343ede83eb7d37a231e3db80659f8fa7c61c70811618c75a817fcc94902f5fa4582f81e4473a0e137f12c2eaf17025a057a7ef7c4b348451454e39b3fa2f +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVCPKG=ON +) + +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/stftpitchshift" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/stftpitchshift/vcpkg.json b/ports/stftpitchshift/vcpkg.json new file mode 100644 index 00000000000000..f11f71221e390a --- /dev/null +++ b/ports/stftpitchshift/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "stftpitchshift", + "version": "1.3.2", + "description": "STFT based multi pitch shifting with optional formant preservation.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b04d1863981ef1..88f215f9003ce7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6780,6 +6780,10 @@ "baseline": "2020-09-14", "port-version": 2 }, + "stftpitchshift": { + "baseline": "1.3.2", + "port-version": 0 + }, "stlab": { "baseline": "1.6.2", "port-version": 1 diff --git a/versions/s-/stftpitchshift.json b/versions/s-/stftpitchshift.json new file mode 100644 index 00000000000000..d04954fabb6ffc --- /dev/null +++ b/versions/s-/stftpitchshift.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1f4a495416b6e2e3a830c8ba72eb5cf9034c68cc", + "version": "1.3.2", + "port-version": 0 + } + ] +} From 8f381259810e4be08e35a9326dae4454677518b8 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 5 May 2022 03:34:41 +0200 Subject: [PATCH 163/383] [nspr] no absolute paths (#24523) --- ports/nspr/portfile.cmake | 6 ++++++ ports/nspr/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/nspr.json | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ports/nspr/portfile.cmake b/ports/nspr/portfile.cmake index c3302609fee90d..c22bb9984598bd 100644 --- a/ports/nspr/portfile.cmake +++ b/ports/nspr/portfile.cmake @@ -90,5 +90,11 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") endif() endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/nspr-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/nspr-config" "${CURRENT_INSTALLED_DIR}/debug" "`dirname $0`/../../../..") +endif() + # Copy license file(INSTALL "${SOURCE_PATH}/nspr/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nspr" RENAME copyright) diff --git a/ports/nspr/vcpkg.json b/ports/nspr/vcpkg.json index 096df7d4ab7056..59024271252ba3 100644 --- a/ports/nspr/vcpkg.json +++ b/ports/nspr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nspr", "version": "4.33", + "port-version": 1, "description": "Netscape portable runtime", "homepage": "https://releases.mozilla.org/pub/nspr/", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 88f215f9003ce7..9ecf9c85f00046 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4890,7 +4890,7 @@ }, "nspr": { "baseline": "4.33", - "port-version": 0 + "port-version": 1 }, "nss": { "baseline": "3.77", diff --git a/versions/n-/nspr.json b/versions/n-/nspr.json index a784fd0685425f..966cf7e2d612c2 100644 --- a/versions/n-/nspr.json +++ b/versions/n-/nspr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efd7b94673495b09ee48d1c2a4453f70c5e0bb7c", + "version": "4.33", + "port-version": 1 + }, { "git-tree": "ec6fe24b3b4db98f624391627f113a7bd93397eb", "version": "4.33", From ba4aef9454583740ee42428a27bfec84334dca5f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 5 May 2022 03:34:58 +0200 Subject: [PATCH 164/383] [curl] Update to 7.83.0 (#24519) * Update to 7.83.0 * Update curl --- ports/curl/portfile.cmake | 4 ++-- ports/curl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index f81d0c491d410c..bb637af3f040cf 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF curl-7_82_0 - SHA512 5b42e3c520e540059113fb4a5da2bbb82a4eea88e05ba17d661ab04e16e4b1f5f0ac2d16e51e17c9c2c4f5aca07e23015564a11bd0d034e1544c6f603b800c21 + REF curl-7_83_0 + SHA512 7acb6f524b1045afa045a6f21d72e1410becadf6c3c1228378451f9436b7bac9c15aad4472193d36e9d075937aee641d186c5d0e9ba5f3e4d3af623ec78ad0e9 HEAD_REF master PATCHES 0002_fix_uwp.patch diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index fd52ac3942660e..eddc9c86987895 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "curl", - "version": "7.82.0", + "version": "7.83.0", "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 9ecf9c85f00046..9ba5a8881b6110 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1741,7 +1741,7 @@ "port-version": 7 }, "curl": { - "baseline": "7.82.0", + "baseline": "7.83.0", "port-version": 0 }, "curlpp": { diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 8828352aa56c30..5efa8e666adedf 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d72a11c8c3990818ba5987cc1ceee799046de9be", + "version": "7.83.0", + "port-version": 0 + }, { "git-tree": "203696f71dd43fa55a1b1104570135bebf869819", "version": "7.82.0", From 13ba05cb535f57cf876aa8d4c070d85da19fdcc2 Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 5 May 2022 04:35:37 +0300 Subject: [PATCH 165/383] Update x11 dependencies msg (#24517) --- ports/cairo/portfile.cmake | 2 +- ports/cairo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cairo.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 6eff7ba436f966..2a7390d8287b7f 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -28,7 +28,7 @@ if ("x11" IN_LIST FEATURES) if (VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "Feature x11 only support UNIX.") endif() - message(WARNING "You will need to install Xorg dependencies to use feature x11:\napt install libx11-dev libxft-dev\n") + message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") list(APPEND OPTIONS -Dxlib=enabled) else() list(APPEND OPTIONS -Dxlib=disabled) diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 1f65b37aac5a33..f503956c58ea7a 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cairo", "version": "1.17.6", - "port-version": 1, + "port-version": 2, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", "license": "MPL-1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 9ba5a8881b6110..27d97a8c9a074f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1226,7 +1226,7 @@ }, "cairo": { "baseline": "1.17.6", - "port-version": 1 + "port-version": 2 }, "cairomm": { "baseline": "1.16.1", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index bedb50249f7e05..b4a94e391b9809 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63bc79e8f9980f2b780bb296d96bfc3221dba137", + "version": "1.17.6", + "port-version": 2 + }, { "git-tree": "f43fb974219928aea5f95efc7c61f27b49051a28", "version": "1.17.6", From 370272f169c2942902ddaa55589db527d4ccc3f9 Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 5 May 2022 04:37:00 +0300 Subject: [PATCH 166/383] Add ipv6 source code source (#24516) --- ports/gdk-pixbuf/portfile.cmake | 6 +++--- ports/gdk-pixbuf/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gdk-pixbuf.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 9451c30ecfccc6..c097c84dd24732 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -2,9 +2,9 @@ set(GDK_PIXBUF_VERSION 2.42) set(GDK_PIXBUF_PATCH 8) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz" - FILENAME "gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz" - SHA512 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387 + URLS "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/archive/${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.gz" + FILENAME "gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.gz" + SHA512 ea3b7d47f2ef3dbb88f640629e03eb4fab4a371da2545c199274d75b993b176af0c69ea72b46d5fadf58f82dff9a809fe1e0a4802ad1f1f13eaa9d757ebfeb4c ) vcpkg_extract_source_archive_ex( diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index a8c88501df1f86..ad6fe21e002e9d 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdk-pixbuf", "version": "2.42.8", + "port-version": 1, "description": "Image loading library.", "homepage": "https://developer.gnome.org/gdk-pixbuf/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 27d97a8c9a074f..aaf1f6bb5eff1c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2442,7 +2442,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.8", - "port-version": 0 + "port-version": 1 }, "gemmlowp": { "baseline": "2021-09-28", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index 1551e55a4630c9..5cadc3c3746cac 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1c32f1df7acf96c17689e559b2e1edeb947de38", + "version": "2.42.8", + "port-version": 1 + }, { "git-tree": "ad94c8b8ea1bd1f66085e17b9763b22080d6bf6b", "version": "2.42.8", From b92a81a0090865adfcb81046aba4a2fcb2ab9334 Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 5 May 2022 04:37:35 +0300 Subject: [PATCH 167/383] - Bump atk to 2.38.0. (#24515) - Add ipv6 source code source --- ports/atk/portfile.cmake | 8 ++++---- ports/atk/vcpkg.json | 3 +-- versions/a-/atk.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index c7db3633489d9d..1aac1f0a3e570d 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -set(ATK_VERSION 2.36.0) +set(ATK_VERSION 2.38.0) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/atk/2.36/atk-${ATK_VERSION}.tar.xz" - FILENAME "atk-${ATK_VERSION}.tar.xz" - SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634 + URLS "https://gitlab.gnome.org/GNOME/atk/-/archive/${ATK_VERSION}/atk-${ATK_VERSION}.tar.gz" + FILENAME "atk-${ATK_VERSION}.tar.gz" + SHA512 f31951ecbdace6a18fb9f772616137cb8732163b37448fef4daf1af60ba8479c94d498dcdaf4880468c80012c77a446da585926a99704a9a940b80e546080cf3 ) vcpkg_extract_source_archive_ex( diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index 2c7b4360ab7218..37b590e8c5d2cd 100644 --- a/ports/atk/vcpkg.json +++ b/ports/atk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "atk", - "version": "2.36.0", - "port-version": 2, + "version": "2.38.0", "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", "supports": "!arm", diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 9d9460584f05ae..705a9d0a1e4081 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e43338e95e4bfeb688d23ade7792fb45b185356", + "version": "2.38.0", + "port-version": 0 + }, { "git-tree": "15723fa24f08f04e859253b16f5cbc05529d10cf", "version": "2.36.0", diff --git a/versions/baseline.json b/versions/baseline.json index aaf1f6bb5eff1c..946a5b02abb23a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -205,8 +205,8 @@ "port-version": 1 }, "atk": { - "baseline": "2.36.0", - "port-version": 2 + "baseline": "2.38.0", + "port-version": 0 }, "atkmm": { "baseline": "2.36.1", From 5219a7a12f9c3b4d030e0719e05d0f3206cf07d0 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 5 May 2022 04:07:23 +0200 Subject: [PATCH 168/383] [wxwidgets] CMake re-run must not change libs (#24499) * Test that CMake re-run doesn't change wxWidget libs * Reset wxWidgets_USE_REL_AND_DBG * Update versions --- ports/wxwidgets/example/CMakeLists.txt | 5 +++++ ports/wxwidgets/vcpkg-cmake-wrapper.cmake | 1 + ports/wxwidgets/vcpkg.json | 2 +- .../vcpkg-ci-wxwidgets/portfile.cmake | 21 +++++++++++++++++++ versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 +++++ 6 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ports/wxwidgets/example/CMakeLists.txt b/ports/wxwidgets/example/CMakeLists.txt index b9fc010314a7be..7d5b12dba4cdbe 100644 --- a/ports/wxwidgets/example/CMakeLists.txt +++ b/ports/wxwidgets/example/CMakeLists.txt @@ -19,3 +19,8 @@ if(USE_WXRC) message(FATAL_ERROR "Failed to run wxWidgets_wxrc_EXECUTABLE (${wxWidgets_wxrc_EXECUTABLE})") endif() endif() + +set(PRINT_VARS "" CACHE STRING "Variables to print at the end of configuration") +foreach(var IN LISTS PRINT_VARS) + message(STATUS "${var}:=${${var}}") +endforeach() diff --git a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake index a7563f68ded208..f4a1403eee02c2 100644 --- a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake +++ b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake @@ -25,6 +25,7 @@ if(WIN32 AND NOT CMAKE_CROSSCOMPILING) _find_package(${ARGS}) # Reset for regular lookup unset(wxWidgets_CONFIGURATION CACHE) + unset(wxWidgets_USE_REL_AND_DBG CACHE) set(WX_CONFIGURATION_LIST "") set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "") else() diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index bb03ce03563ce5..634fa57f187429 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wxwidgets", "version-semver": "3.1.5", - "port-version": 10, + "port-version": 11, "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", diff --git a/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake b/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake index e69c2351ae1a44..d301fa74a15038 100644 --- a/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake +++ b/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake @@ -7,7 +7,28 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${CURRENT_INSTALLED_DIR}/share/wxwidgets/example" + DISABLE_PARALLEL_CONFIGURE # Need separate dbg log for following test OPTIONS ${OPTIONS} + -DCMAKE_CONFIG_RUN=1 + "-DPRINT_VARS=CMAKE_CONFIG_RUN;wxWidgets_LIBRARIES" ) vcpkg_cmake_build() + +if(NOT VCPKG_BUILD_TYPE) + # Check that debug libs are still used after re-configuration, #24489 + set(config_log "config-${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" -DCMAKE_CONFIG_RUN=2 . + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME "${config_log}-2" + ) + file(STRINGS "${CURRENT_BUILDTREES_DIR}/${config_log}-out.log" expected REGEX "wxWidgets_LIBRARIES:=") + file(STRINGS "${CURRENT_BUILDTREES_DIR}/${config_log}-2-out.log" actual REGEX "wxWidgets_LIBRARIES:=") + if(NOT actual STREQUAL expected) + message(FATAL_ERROR "wxWidgets libraries changed after CMake re-run\n" + "actual:\n${actual}\n" + "expected:\n ${expected}\n" + ) + endif() +endif() diff --git a/versions/baseline.json b/versions/baseline.json index 946a5b02abb23a..bb26bd96d7b175 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7534,7 +7534,7 @@ }, "wxwidgets": { "baseline": "3.1.5", - "port-version": 10 + "port-version": 11 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 53c9c27d76f018..2994bc67a749aa 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f891e383d71c7665ba49dcc254d8b2094c00c2b", + "version-semver": "3.1.5", + "port-version": 11 + }, { "git-tree": "99203047a716a1b39d06fb93c48daebb4b184141", "version-semver": "3.1.5", From 40a4e68a4f177c1569aca69bfe1ba59b8153a8a1 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Wed, 4 May 2022 19:08:35 -0700 Subject: [PATCH 169/383] [google-cloud-cpp] update to latest release (v1.40.1) (#24514) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 27 +++++++++++++++++++++++++-- versions/baseline.json | 4 ++-- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 40ed37f4b2689c..9cbe00fc6cd2b9 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.39.0 - SHA512 d61ebcdb6680797f20147ee1d37b9d29c82e8c7267b944a346685bfa607cf0b7f1772854874b967f19b4f54ddcefc94a771a4686cafcd6a5fed426d64e553205 + REF v1.40.1 + SHA512 55c33f91cdbf5713fdc85ecd461c99fefb8d2a60e53e67c246370288f85e323c7a3a7915f4313ed3331fc1278ac4b910ce6fe20929378096a237c2fb31863b13 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 5036979e710ca1..718e0ee4f04dcf 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.39.0", - "port-version": 1, + "version": "1.40.1", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -486,6 +485,18 @@ } ] }, + "logging": { + "description": "Google Cloud Logging C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "managedidentities": { "description": "Managed Service for Microsoft Active Directory API C++ Client Library", "dependencies": [ @@ -786,6 +797,18 @@ } ] }, + "speech": { + "description": "The Google Cloud Speech-to-Text C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "storage": { "description": "The Google Cloud Storage C++ client library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index bb26bd96d7b175..fb15bcdeb55f68 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2589,8 +2589,8 @@ "port-version": 1 }, "google-cloud-cpp": { - "baseline": "1.39.0", - "port-version": 1 + "baseline": "1.40.1", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 62f2f8638f101f..056d907a3019b8 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a18f7bea0f4811da422b3099c4331305cb1f617", + "version": "1.40.1", + "port-version": 0 + }, { "git-tree": "7f6839d85455e137c21bf5bf894e00e0327c3423", "version": "1.39.0", From 8c9537add3c3a97e9c7a80271c8df9d8706cd01f Mon Sep 17 00:00:00 2001 From: spaxio Date: Thu, 5 May 2022 04:24:07 +0200 Subject: [PATCH 170/383] [openal-soft] enable OpenSL backend for Android (#24506) * [openal-soft] enable OpenSL backend for Android * Make use of VCPKG_TARGET_IS_ANDROID * Remove unneded ALSOFT_REQUIRE_ANDROID * Update version database --- ports/openal-soft/portfile.cmake | 2 +- ports/openal-soft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index c090c7406671d4..4194a47471aeb8 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -46,7 +46,7 @@ vcpkg_configure_cmake( -DALSOFT_BACKEND_PULSEAUDIO=OFF -DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_APPLE} -DALSOFT_BACKEND_JACK=OFF - -DALSOFT_BACKEND_OPENSL=OFF + -DALSOFT_BACKEND_OPENSL=${VCPKG_TARGET_IS_ANDROID} -DALSOFT_BACKEND_WAVE=ON -DALSOFT_BACKEND_WINMM=OFF -DALSOFT_BACKEND_DSOUND=OFF diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index 4988f6635261d8..abf53a63b3927b 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version-semver": "1.21.1", - "port-version": 4, + "port-version": 5, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index fb15bcdeb55f68..bc4d960c615494 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5054,7 +5054,7 @@ }, "openal-soft": { "baseline": "1.21.1", - "port-version": 4 + "port-version": 5 }, "openblas": { "baseline": "0.3.19", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index 1d70617a9c2886..eb2a35e05294c9 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cff63a457841bcacd168775e25794f8245d06cf0", + "version-semver": "1.21.1", + "port-version": 5 + }, { "git-tree": "a1dee3171a9184c0a13631fda79f6aa58d2b80b6", "version-semver": "1.21.1", From b47a6fa0517f84a840540969c3fad7fe6c9cfdfc Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Wed, 4 May 2022 22:24:59 -0400 Subject: [PATCH 171/383] Fix blend2d vs2017 (#24508) * Fix blend2d build with vs2017 * Update blend2d port with new version --- ports/blend2d/portfile.cmake | 4 ++-- ports/blend2d/vcpkg.json | 2 +- versions/b-/blend2d.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake index 09c8cf8d77460a..8d49c067679553 100644 --- a/ports/blend2d/portfile.cmake +++ b/ports/blend2d/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blend2d/blend2d - REF 63db360c7eb2c1c3ca9cd92a867dbb23dc95ca7d - SHA512 cf83dd36e51fc92587633dec315b3ad8570137ab0b58836c43b8c73ba934dfc0ad03a58e633bd76b79753b12831007c2a5b3fde237d671594c62a3919507c39a + REF 0ca46df1d8ec7d8bc5250329ce281d82cfc96b99 + SHA512 fbe54a59b0dc9fd0397619e3f6b1d336d3f906322a06583fe4f90bbb8bd95188f39f162b8ee66cc464050f6f40e856b72a80f37ac190a4a584fda71e2ce73689 HEAD_REF master ) diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json index 5db3d5ce2e52cc..36cf6f902a5bcd 100644 --- a/ports/blend2d/vcpkg.json +++ b/ports/blend2d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "blend2d", - "version-date": "2022-02-19", + "version-date": "2022-05-02", "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", "homepage": "https://github.com/blend2d/blend2d", "documentation": "https://blend2d.com/doc/index.html", diff --git a/versions/b-/blend2d.json b/versions/b-/blend2d.json index 280aafcce37456..d729bd25809694 100644 --- a/versions/b-/blend2d.json +++ b/versions/b-/blend2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96db1e7844aafd005e469f47b8f89e139df8d8e1", + "version-date": "2022-05-02", + "port-version": 0 + }, { "git-tree": "ceedb664deed987cc4e4493554ae3aa58088f08c", "version-date": "2022-02-19", diff --git a/versions/baseline.json b/versions/baseline.json index bc4d960c615494..6172b7fe44ae98 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -497,7 +497,7 @@ "port-version": 2 }, "blend2d": { - "baseline": "2022-02-19", + "baseline": "2022-05-02", "port-version": 0 }, "blitz": { From 2930fd4571e2b477f7d406169829ea81f605bb4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 5 May 2022 04:25:20 +0200 Subject: [PATCH 172/383] icu 71.1 (#24512) * [icu] Update to upstream version 71.1 * [icu] warn if autoconf-archive is not installed * [icu] update version database and add license field --- ports/icu/check-autoconf-archive.patch | 14 ++++++++++++++ ports/icu/portfile.cmake | 5 +++-- ports/icu/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/i-/icu.json | 5 +++++ 5 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 ports/icu/check-autoconf-archive.patch diff --git a/ports/icu/check-autoconf-archive.patch b/ports/icu/check-autoconf-archive.patch new file mode 100644 index 00000000000000..4da4be13a486ea --- /dev/null +++ b/ports/icu/check-autoconf-archive.patch @@ -0,0 +1,14 @@ +diff --git a/source/configure.ac b/source/configure.ac +index d194c6d..33fcb2f 100644 +--- a/source/configure.ac ++++ b/source/configure.ac +@@ -208,6 +208,8 @@ fi + #AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true) + #AC_CHECK_PROG(STRIP, strip, strip, true) + ++m4_ifndef([AX_CHECK_COMPILE_FLAG], [AC_MSG_ERROR(['autoconf-archive' is missing])]) ++ + # TODO(ICU-20301): Remove fallback to Python 2. + AC_CHECK_PROGS(PYTHON, python3 "py -3" python "py") + AC_SUBST(PYTHON) + diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 1383c2bba5df6d..8aff183ccf9e44 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -1,4 +1,4 @@ -set(ICU_VERSION_MAJOR 70) +set(ICU_VERSION_MAJOR 71) set(ICU_VERSION_MINOR 1) set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}") set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}") @@ -8,7 +8,7 @@ vcpkg_download_distfile( ARCHIVE URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz" FILENAME "icu4c-${VERSION2}-src.tgz" - SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9 + SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912 ) vcpkg_extract_source_archive_ex( @@ -22,6 +22,7 @@ vcpkg_extract_source_archive_ex( mingw-dll-install.patch disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw. fix-win-build.patch + check-autoconf-archive.patch ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index e3fec7996d7bd1..9f40f50dd43fb2 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,8 +1,9 @@ { "name": "icu", - "version": "70.1", + "version": "71.1", "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", + "license": "ICU", "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 6172b7fe44ae98..0bd5621093830c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2817,7 +2817,7 @@ "port-version": 0 }, "icu": { - "baseline": "70.1", + "baseline": "71.1", "port-version": 0 }, "ideviceinstaller": { diff --git a/versions/i-/icu.json b/versions/i-/icu.json index fe4be9d2f93607..0829a549a4b770 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13fe0c9056059654ea7e482cd06ff70c26f9e029", + "version": "71.1", + "port-version": 0 + }, { "git-tree": "2d082108b0899697c9b6253c260188728374e56b", "version": "70.1", From 8b2ace21945bf5f796fa3b4d8f355dc80fd52766 Mon Sep 17 00:00:00 2001 From: Stig Hornang Date: Thu, 5 May 2022 04:26:44 +0200 Subject: [PATCH 173/383] [freetype-gl] Update to fix compatibility with freetype 2.11 (#24513) freetype-gl has been broken at runtime after freetype was upgraded to 2.11.0. --- ...o-dependencies-also-for-static-build.patch | 43 ++++++++++++++++++ .../0002-Remove-duplicate-installs.patch | 31 +++++++++++++ ports/freetype-gl/0003-Add-exports.patch | 34 ++++++++++++++ ...004-Change-install-dir-for-pkgconfig.patch | 25 +++++++++++ ports/freetype-gl/glew.patch | 13 ------ ports/freetype-gl/portfile.cmake | 45 +++++-------------- ports/freetype-gl/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/f-/freetype-gl.json | 5 +++ 9 files changed, 152 insertions(+), 51 deletions(-) create mode 100644 ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch create mode 100644 ports/freetype-gl/0002-Remove-duplicate-installs.patch create mode 100644 ports/freetype-gl/0003-Add-exports.patch create mode 100644 ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch delete mode 100644 ports/freetype-gl/glew.patch diff --git a/ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch b/ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch new file mode 100644 index 00000000000000..d81093da392f2c --- /dev/null +++ b/ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch @@ -0,0 +1,43 @@ +From 1ad7d07765445511d51f3888ffdedba2cb282e84 Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Sun, 1 May 2022 21:57:18 +0200 +Subject: [PATCH 1/4] Link to dependencies also for static build + +--- + CMakeLists.txt | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2ccbf9a..b5db60a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -185,12 +185,6 @@ if(freetype-gl_BUILD_SHARED) + PROPERTIES + VERSION 0.3.2 + SOVERSION 0) +- target_link_libraries (freetype-gl +- ${OPENGL_LIBRARY} +- ${FREETYPE_LIBRARIES} +- ${MATH_LIBRARY} +- ${GLEW_LIBRARY} +- ) + else() + add_library(freetype-gl STATIC + ${FREETYPE_GL_SRC} +@@ -198,6 +192,13 @@ else() + ) + endif() + ++target_link_libraries(freetype-gl ++ ${OPENGL_LIBRARY} ++ ${FREETYPE_LIBRARIES} ++ ${MATH_LIBRARY} ++ ${GLEW_LIBRARY} ++) ++ + if(freetype-gl_BUILD_MAKEFONT) + add_executable(makefont makefont.c) + +-- +2.27.0 + diff --git a/ports/freetype-gl/0002-Remove-duplicate-installs.patch b/ports/freetype-gl/0002-Remove-duplicate-installs.patch new file mode 100644 index 00000000000000..2006d4ee3a15cc --- /dev/null +++ b/ports/freetype-gl/0002-Remove-duplicate-installs.patch @@ -0,0 +1,31 @@ +From 9af89db45ef951d5fd8e8be5b4029136f59e94a1 Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Sun, 1 May 2022 22:00:38 +0200 +Subject: [PATCH 2/4] Remove duplicate installs + +--- + CMakeLists.txt | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5db60a..09163ec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -249,14 +249,3 @@ if ("${LIB64}" STREQUAL "TRUE") + else() + set(LIBSUFFIX "") + endif() +- +-set(INSTALL_LIB_DIR lib${LIBSUFFIX} CACHE PATH "Installation directory for libraries") +-mark_as_advanced(INSTALL_LIB_DIR) +- +-install(TARGETS freetype-gl +- ARCHIVE DESTINATION ${INSTALL_LIB_DIR} +- LIBRARY DESTINATION ${INSTALL_LIB_DIR} +- COMPONENT library) +-install(FILES ${FREETYPE_GL_HDR} DESTINATION include +- COMPONENT headers) +- +-- +2.27.0 + diff --git a/ports/freetype-gl/0003-Add-exports.patch b/ports/freetype-gl/0003-Add-exports.patch new file mode 100644 index 00000000000000..2fdfe8ae6e9e5e --- /dev/null +++ b/ports/freetype-gl/0003-Add-exports.patch @@ -0,0 +1,34 @@ +From 2c2e7e6cc7cb55eff502889421fe7a207cec932d Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Sun, 1 May 2022 22:01:00 +0200 +Subject: [PATCH 3/4] Add exports + +--- + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09163ec..fd40e68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -217,7 +217,7 @@ if(freetype-gl_BUILD_MAKEFONT) + endif() + endif() + +-install(TARGETS freetype-gl ++install(TARGETS freetype-gl EXPORT freetype-glConfig + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +@@ -249,3 +249,8 @@ if ("${LIB64}" STREQUAL "TRUE") + else() + set(LIBSUFFIX "") + endif() ++ ++install( ++ EXPORT freetype-glConfig ++ DESTINATION share/freetype-gl ++) +-- +2.27.0 + diff --git a/ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch b/ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch new file mode 100644 index 00000000000000..8938ce606282cb --- /dev/null +++ b/ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch @@ -0,0 +1,25 @@ +From ad0c57a370a15e8114447b8170ecddf14f21d352 Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Tue, 3 May 2022 20:27:09 +0200 +Subject: [PATCH 4/4] Change install dir for pkgconfig + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd40e68..4f8d7dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -172,7 +172,7 @@ if(NOT MSVC) + set(PKG_CONFIG_LIBDIR "\${exec_prefix}/lib") + set(PKG_CONFIG_INCLUDEDIR "\${prefix}/include") + configure_file(freetype-gl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl.pc @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl.pc DESTINATION ${PKG_CONFIG_PREFIX}/share/pkgconfig) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl.pc DESTINATION ${PKG_CONFIG_PREFIX}/lib/pkgconfig) + endif() + + if(freetype-gl_BUILD_SHARED) +-- +2.27.0 + diff --git a/ports/freetype-gl/glew.patch b/ports/freetype-gl/glew.patch deleted file mode 100644 index 01b7f616d9c940..00000000000000 --- a/ports/freetype-gl/glew.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1c2e89fba..9e2d112c4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ include_directories( - ${OPENGL_INCLUDE_DIRS} - ${FREETYPE_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR} -- ${GLEW_INCLUDE_PATH} -+ ${GLEW_INCLUDE_DIRS} - ) - - if(MSVC) diff --git a/ports/freetype-gl/portfile.cmake b/ports/freetype-gl/portfile.cmake index 59815437b4cf9d..ecebe42dbc86e0 100644 --- a/ports/freetype-gl/portfile.cmake +++ b/ports/freetype-gl/portfile.cmake @@ -3,18 +3,16 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rougier/freetype-gl - REF 1a8c007f3fe7b1441f9e5616bc23d7455f4b07dd # accessed on 2020-09-14 - SHA512 ce858b5d5e892162daf6f5bff3476938e15cb9f04adbf2dc2b4c538bfda56b023278b3acb62940a9388c46b89edfd22c9c1c99891f8fcf9d926ffedb8af2b38e + REF 85d7850744465ac1dcd00b202787d72a4a3a1f5d + SHA512 4505b2162610500336ab975a5a0ac2c09503f51b2fb52b433018059f628ef6f6add9618c940a80efebc311d82fe96fa813d356acbd858cc2dbac6a1829ab3031 HEAD_REF master - PATCHES glew.patch + PATCHES + 0001-Link-to-dependencies-also-for-static-build.patch + 0002-Remove-duplicate-installs.patch + 0003-Add-exports.patch + 0004-Change-install-dir-for-pkgconfig.patch ) -# make sure that no "internal" libraries are used by removing them -file(REMOVE_RECURSE ${SOURCE_PATH}/windows/freetype) -file(REMOVE_RECURSE ${SOURCE_PATH}/windows/AntTweakBar) -file(REMOVE_RECURSE ${SOURCE_PATH}/windows/glew) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindGLEW.cmake) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -25,33 +23,12 @@ vcpkg_configure_cmake( -Dfreetype-gl_BUILD_MAKEFONT=OFF ) -# We may soon install using a modified cmake process with install target - -# Although FreeType-GL uses CMake as its build system, the implementation -# (*.cmake,CMakeLists.txt) doesn't provide for any type of installation. -# Presumably, it has been used as-is, in-tree, without ever needing to install -# itself within a larger system. -vcpkg_build_cmake(LOGFILE_ROOT install) - -file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") -file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/freetype-gl) - -# LIB -file(GLOB LIBS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" -) -file(GLOB DEBUG_LIBS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" -) - -file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +vcpkg_install_cmake() vcpkg_copy_pdbs() # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/freetype-gl RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/freetype-gl/vcpkg.json b/ports/freetype-gl/vcpkg.json index 6ac62331cbd916..1527e962d6c372 100644 --- a/ports/freetype-gl/vcpkg.json +++ b/ports/freetype-gl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "freetype-gl", - "version-string": "2020-09-14", - "port-version": 1, + "version-date": "2022-01-17", "description": "OpenGL text using one vertex buffer, one texture and FreeType", "homepage": "https://github.com/rougier/freetype-gl", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0bd5621093830c..5d9452c2661045 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2341,8 +2341,8 @@ "port-version": 1 }, "freetype-gl": { - "baseline": "2020-09-14", - "port-version": 1 + "baseline": "2022-01-17", + "port-version": 0 }, "freexl": { "baseline": "1.0.6", diff --git a/versions/f-/freetype-gl.json b/versions/f-/freetype-gl.json index 8031162af13b5d..749031ed13401e 100644 --- a/versions/f-/freetype-gl.json +++ b/versions/f-/freetype-gl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4184aadfa1242cc37b6a3c77d9893bafd3d54d3f", + "version-date": "2022-01-17", + "port-version": 0 + }, { "git-tree": "e290ae7965dd6b7d333df5aa3a9a56df1bd8e24c", "version-string": "2020-09-14", From 0e3f52a12b3c765def238df79ede2b42fe2b584a Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 5 May 2022 04:36:46 +0200 Subject: [PATCH 174/383] [zlib-ng] Update to 2.0.6 (#24486) * Update zlib-ng to 2.0.6 * Update CI baseline * Add ${ZLIB_FULL_VERSION} variable. Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal --- ports/zlib-ng/portfile.cmake | 10 ++++++---- ports/zlib-ng/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/zlib-ng.json | 5 +++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake index f1f4e3cafbf6b6..0d110d0f95243b 100644 --- a/ports/zlib-ng/portfile.cmake +++ b/ports/zlib-ng/portfile.cmake @@ -1,15 +1,17 @@ +set(ZLIB_FULL_VERSION 2.0.6) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/zlib-ng - REF 2.0.5 - SHA512 a643089a8189bf8bd24d679b84f07ae14932b4d88b88e94c44cca23350d6a9bbdaa411822d3651c2b0bf79f30c9f99514cc252cf9e9ab0b3a840540206466654 + REF "${ZLIB_FULL_VERSION}" + SHA512 4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5 HEAD_REF master ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DZLIB_FULL_VERSION=2.0.3 + "-DZLIB_FULL_VERSION=${ZLIB_FULL_VERSION}" -DZLIB_ENABLE_TESTS=OFF -DWITH_NEW_STRATEGIES=ON OPTIONS_RELEASE @@ -24,4 +26,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright -) \ No newline at end of file +) diff --git a/ports/zlib-ng/vcpkg.json b/ports/zlib-ng/vcpkg.json index 2822189a6dd2dd..a64c9bd6b7d9c1 100644 --- a/ports/zlib-ng/vcpkg.json +++ b/ports/zlib-ng/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zlib-ng", - "version": "2.0.5", + "version": "2.0.6", "description": "zlib replacement with optimizations for 'next generation' systems", "homepage": "https://github.com/zlib-ng/zlib-ng", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 5d9452c2661045..5b621212ce182d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7701,7 +7701,7 @@ "port-version": 0 }, "zlib-ng": { - "baseline": "2.0.5", + "baseline": "2.0.6", "port-version": 0 }, "zookeeper": { diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json index 6c2249e9b075fe..3cb2637e627dc2 100644 --- a/versions/z-/zlib-ng.json +++ b/versions/z-/zlib-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3324dce4e575e9ba671576b06108c612d0b500bf", + "version": "2.0.6", + "port-version": 0 + }, { "git-tree": "1edea9190001c716b745514982d2ee684f1183e8", "version": "2.0.5", From 4b766c1cd17205e1b768c4fadfd5f867c1d0510e Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Thu, 5 May 2022 05:37:37 +0300 Subject: [PATCH 175/383] Update vcpkg.cmake (#24479) --- scripts/buildsystems/vcpkg.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 0ae8473ffd2e2a..6362c8eaf23cb6 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -345,6 +345,11 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_ set(Z_VCPKG_TARGET_TRIPLET_PLAT freebsd) endif() +if(EMSCRIPTEN) + set(Z_VCPKG_TARGET_TRIPLET_ARCH wasm32) + set(Z_VCPKG_TARGET_TRIPLET_PLAT emscripten) +endif() + set(VCPKG_TARGET_TRIPLET "${Z_VCPKG_TARGET_TRIPLET_ARCH}-${Z_VCPKG_TARGET_TRIPLET_PLAT}" CACHE STRING "Vcpkg target triplet (ex. x86-windows)") set(Z_VCPKG_TOOLCHAIN_DIR "${CMAKE_CURRENT_LIST_DIR}") From fd6a33622786d0e55b11c6318279ced006450151 Mon Sep 17 00:00:00 2001 From: hh10k Date: Fri, 6 May 2022 01:58:07 +0800 Subject: [PATCH 176/383] [opencv] Fix import paths for debug Android builds (#24394) * [opencv4] Fix import paths for debug Android builds * [opencv3] Fix import paths for debug Android builds in the same way as v4 * Only apply changes to OpenCVModules-debug.cmake when it is expected to exist --- ports/opencv3/portfile.cmake | 8 ++++++++ ports/opencv3/vcpkg.json | 2 +- ports/opencv4/portfile.cmake | 8 ++++++++ ports/opencv4/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/o-/opencv3.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 7 files changed, 30 insertions(+), 4 deletions(-) diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index e3e2a37a209192..d5cdf0bbdff226 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -377,6 +377,14 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") vcpkg_copy_pdbs() +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # Update debug paths for libs in Android builds (e.g. sdk/native/staticlibs/armeabi-v7a) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake" + "\${_IMPORT_PREFIX}/sdk" + "\${_IMPORT_PREFIX}/debug/sdk" + ) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index da0b06c0498e98..445ff3c4798c58 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.16", - "port-version": 7, + "port-version": 8, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index c3ef67463da5bf..ee65afa66ef8cb 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -457,6 +457,14 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") vcpkg_copy_pdbs() +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # Update debug paths for libs in Android builds (e.g. sdk/native/staticlibs/armeabi-v7a) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake" + "\${_IMPORT_PREFIX}/sdk" + "\${_IMPORT_PREFIX}/debug/sdk" + ) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index fef9910c84c81a..c055ed2c2e4dae 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.5", - "port-version": 3, + "port-version": 4, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5b621212ce182d..0aa965b6c7eac1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5098,11 +5098,11 @@ }, "opencv3": { "baseline": "3.4.16", - "port-version": 7 + "port-version": 8 }, "opencv4": { "baseline": "4.5.5", - "port-version": 3 + "port-version": 4 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 636f629fc09578..02d0949b182822 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8a8b60a98ada175921aadcd09ed66509c9be2a4", + "version": "3.4.16", + "port-version": 8 + }, { "git-tree": "d3c28cb4da2e7da9d31cc72415aff26f0b4d8442", "version": "3.4.16", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 82178c48b28375..a3175691e237c5 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86073388865f7730e42d02768f8963156f2be82f", + "version": "4.5.5", + "port-version": 4 + }, { "git-tree": "0771f6243ddde63a9b212efeb5ad51a74b640a62", "version": "4.5.5", From c648581695ee7c2d60e095fc86dd369d650e90c5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 5 May 2022 20:00:03 +0200 Subject: [PATCH 177/383] [Qt6] Fix Qt6.3 windeployqt (#24445) * move windeploylogic to qtbase. fix qtpaths for debug. * fix missing stuff * version stuff * add supports !uwp since qt6 dropped uwp support * version stuff * add newline. Fix BAKCD * version stuff * use enabledelayedexpansion * version stuff * use cd /D * version stuff Co-authored-by: Alexander Neumann --- ports/qtbase/portfile.cmake | 31 +++++++++++++++++++++++------ ports/qtbase/qmake.debug.bat | 2 +- ports/qtbase/qtpaths.debug.bat | 2 ++ ports/qtbase/vcpkg.json | 2 ++ ports/qtbase/windeployqt.debug.bat | 10 ++++++++++ ports/qttools/portfile.cmake | 14 +++++++------ ports/qttools/vcpkg.json | 1 + ports/qttools/windeployqt.debug.bat | 10 +++++----- versions/baseline.json | 4 ++-- versions/q-/qtbase.json | 5 +++++ versions/q-/qttools.json | 5 +++++ 11 files changed, 66 insertions(+), 20 deletions(-) create mode 100644 ports/qtbase/qtpaths.debug.bat create mode 100644 ports/qtbase/windeployqt.debug.bat diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index b49552e24ff77b..0656be7eeaa6ce 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -404,16 +404,35 @@ if(VCPKG_TARGET_IS_WINDOWS) file(COPY ${DLLS_TO_COPY} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") set(hostinfofile "${CURRENT_PACKAGES_DIR}/share/Qt6HostInfo/Qt6HostInfoConfig.cmake") file(READ "${hostinfofile}" _contents) string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEXECDIR "tools/Qt6/bin")]] _contents "${_contents}") string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}") file(WRITE "${hostinfofile}" "${_contents}") -set(coretools "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreTools.cmake") -if(EXISTS "${coretools}") - file(READ "${coretools}" _contents) - string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [["${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") - file(WRITE "${coretools}" "${_contents}") +if(QT_IS_LATEST) + set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") + if(EXISTS "${configfile}") + file(READ "${configfile}" _contents) + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qmake.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qtpaths.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qtpaths.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.debug.bat"]] _contents "${_contents}") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat"]] _contents "${_contents}") + endif() + file(WRITE "${configfile}" "${_contents}") + endif() +else() + set(coretools "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreTools.cmake") + if(EXISTS "${coretools}") + file(READ "${coretools}" _contents) + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") + file(WRITE "${coretools}" "${_contents}") + endif() endif() diff --git a/ports/qtbase/qmake.debug.bat b/ports/qtbase/qmake.debug.bat index 1b7440b3e08fc3..a7ed903a342ff4 100644 --- a/ports/qtbase/qmake.debug.bat +++ b/ports/qtbase/qmake.debug.bat @@ -1,2 +1,2 @@ @echo off -"%0\..\qmake.exe" -qtconf "%0\..\qt.debug.conf" %* \ No newline at end of file +"%0\..\qmake.exe" -qtconf "%0\..\qt.debug.conf" %* diff --git a/ports/qtbase/qtpaths.debug.bat b/ports/qtbase/qtpaths.debug.bat new file mode 100644 index 00000000000000..4fef8e754ebef1 --- /dev/null +++ b/ports/qtbase/qtpaths.debug.bat @@ -0,0 +1,2 @@ +@echo off +"%0\..\qtpaths.exe" --qtconf "%0\..\qt.debug.conf" %* diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index da1c8c1fc10445..7de58656267efd 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,9 +1,11 @@ { "name": "qtbase", "version": "6.3.0", + "port-version": 1, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, + "supports": "!uwp", "dependencies": [ "freetype", { diff --git a/ports/qtbase/windeployqt.debug.bat b/ports/qtbase/windeployqt.debug.bat new file mode 100644 index 00000000000000..99e5e79e7220bd --- /dev/null +++ b/ports/qtbase/windeployqt.debug.bat @@ -0,0 +1,10 @@ +@echo off +setlocal enabledelayedexpansion +set mypath=%~dp0 +set mypath=%mypath:~0,-1% +set BAKCD=!CD! +cd /D %mypath%\..\..\..\debug\bin +set PATH=!CD!;%PATH% +"%mypath%\windeployqt.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %* +cd %BAKCD% +endlocal diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index d0bf4c9de88c29..bab69a67c22ca3 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -134,12 +134,14 @@ if(VCPKG_TARGET_IS_OSX) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6ToolsTools/Qt6ToolsToolsTargets-debug.cmake") -if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - file(READ "${configfile}" _contents) - string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}") - file(WRITE "${configfile}" "${_contents}") +if(NOT QT_IS_LATEST) + set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") + if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + file(READ "${configfile}" _contents) + string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}") + file(WRITE "${configfile}" "${_contents}") + endif() endif() file(GLOB_RECURSE debug_dir "${CURRENT_PACKAGES_DIR}/debug/*") diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index e2177e6e672257..cbbda35b61e010 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qttools", "version": "6.3.0", + "port-version": 1, "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/windeployqt.debug.bat b/ports/qttools/windeployqt.debug.bat index d004e23f10d975..c0c41e34d8dd63 100644 --- a/ports/qttools/windeployqt.debug.bat +++ b/ports/qttools/windeployqt.debug.bat @@ -1,10 +1,10 @@ @echo off -setlocal +setlocal enabledelayedexpansion set mypath=%~dp0 set mypath=%mypath:~0,-1% -cd %mypath%\..\..\..\debug\bin -set BAKCD=%CD% -set PATH=%CD%;%PATH% +set BAKCD=!CD! +cd /D %mypath%\..\..\..\debug\bin +set PATH=!CD!;%PATH% "%mypath%\windeployqt.exe" --qmake "%mypath%\qmake.debug.bat" %* cd %BAKCD% -endlocal \ No newline at end of file +endlocal diff --git a/versions/baseline.json b/versions/baseline.json index 0aa965b6c7eac1..5e62a2b29bcb15 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5862,7 +5862,7 @@ }, "qtbase": { "baseline": "6.3.0", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.3.0", @@ -5978,7 +5978,7 @@ }, "qttools": { "baseline": "6.3.0", - "port-version": 0 + "port-version": 1 }, "qttranslations": { "baseline": "6.3.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 2b67b6aa132845..da074daed1f43f 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32ffa659c93542477ed0f0ee90f3a7f99c0035f0", + "version": "6.3.0", + "port-version": 1 + }, { "git-tree": "8a107123c1e35b7e5fc0df157026d7fde8a42632", "version": "6.3.0", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index d8aa3c99f573a5..a04b333daf417f 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4bef4075be6e9e33ada53f0e2b3a37329187fa5a", + "version": "6.3.0", + "port-version": 1 + }, { "git-tree": "002b7b9432d4c1f49de7a486f70a673285cd98a8", "version": "6.3.0", From aa72c159d0138b55f4b19460fb1c958bec340800 Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Thu, 5 May 2022 14:00:30 -0400 Subject: [PATCH 178/383] [qpid-proton] Fix missing runtime dependencies (#24450) * Fix qpid-proton missing runtime dependencies * Add macOS support --- ports/qpid-proton/portfile.cmake | 6 ++++++ ports/qpid-proton/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qpid-proton.json | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 347d89883f824c..3e29c19ee1fbb6 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -15,6 +15,11 @@ file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindJsonCpp.cmake") vcpkg_find_acquire_program(PYTHON3) +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(rpath "@loader_path") +else() + set(rpath "\$ORIGIN") +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE # It may cause call CHECK_LIBRARY_EXISTS before call project to set the language @@ -28,6 +33,7 @@ vcpkg_cmake_configure( -DENABLE_BENCHMARKS=OFF -DENABLE_FUZZ_TESTING=OFF -DBUILD_TESTING=OFF + -DCMAKE_INSTALL_RPATH=${rpath} -DPython_EXECUTABLE=${PYTHON3} ) diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index 604cb1df4db42d..c57969ea32970b 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qpid-proton", "version": "0.37.0", - "port-version": 1, + "port-version": 2, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5e62a2b29bcb15..f6ad8198984433 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5658,7 +5658,7 @@ }, "qpid-proton": { "baseline": "0.37.0", - "port-version": 1 + "port-version": 2 }, "qscintilla": { "baseline": "2.12.0", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index 2b30ab71e1571f..95a109f9dc3d86 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e019a7a0cb758104296c13689ca86f44db64cfb6", + "version": "0.37.0", + "port-version": 2 + }, { "git-tree": "543baa82530f5eb5ed9b3d6348a14b5e24ccda64", "version": "0.37.0", From 125fa2752810fd08c67b5ad2692444aab4719183 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 6 May 2022 04:35:09 +0800 Subject: [PATCH 179/383] [hyperscan] update to 5.4.0 (#24545) * [hyperscan] update to 5.4.0 * update version --- ports/hyperscan/portfile.cmake | 17 ++++++++--------- ports/hyperscan/vcpkg.json | 10 +++++++--- versions/baseline.json | 4 ++-- versions/h-/hyperscan.json | 5 +++++ 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ports/hyperscan/portfile.cmake b/ports/hyperscan/portfile.cmake index b69532635f7645..665a2873f8cd68 100644 --- a/ports/hyperscan/portfile.cmake +++ b/ports/hyperscan/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(HYPERSCAN_VERSION 5.3.0) +set(HYPERSCAN_VERSION 5.4.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hyperscan REF v${HYPERSCAN_VERSION} - SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56 + SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62 HEAD_REF master PATCHES 0001-remove-Werror.patch @@ -14,17 +14,16 @@ vcpkg_from_github( vcpkg_find_acquire_program(PYTHON3) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DPYTHON_EXECUTABLE=${PYTHON3}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/hyperscan/vcpkg.json b/ports/hyperscan/vcpkg.json index 05f19e116b4441..767c6b810f94fe 100644 --- a/ports/hyperscan/vcpkg.json +++ b/ports/hyperscan/vcpkg.json @@ -1,9 +1,9 @@ { "name": "hyperscan", - "version-string": "5.3.0", - "port-version": 3, + "version": "5.4.0", "description": "A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.", "homepage": "https://www.hyperscan.io", + "license": "BSD-3-Clause", "supports": "!arm", "dependencies": [ "boost-array", @@ -26,6 +26,10 @@ "boost-unordered", "boost-utility", "pcre", - "ragel" + "ragel", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index f6ad8198984433..eae9035668da93 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2805,8 +2805,8 @@ "port-version": 0 }, "hyperscan": { - "baseline": "5.3.0", - "port-version": 3 + "baseline": "5.4.0", + "port-version": 0 }, "hypodermic": { "baseline": "2.5.3", diff --git a/versions/h-/hyperscan.json b/versions/h-/hyperscan.json index 7003a010247b76..432e36530ee8e7 100644 --- a/versions/h-/hyperscan.json +++ b/versions/h-/hyperscan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72c36aba3fff7cd403bdf02ad8f691ced9da30a9", + "version": "5.4.0", + "port-version": 0 + }, { "git-tree": "14beb85ac3a741f5504afa923832eb651795f530", "version-string": "5.3.0", From 9828380e98fc9a906db797c0ac380882d81dc576 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 6 May 2022 04:36:46 +0800 Subject: [PATCH 180/383] update hash (#24544) --- scripts/vcpkgTools.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 51de1f1df7cb97..86dc96eb95c5d3 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -109,13 +109,13 @@ 0.11.0 coscli-windows.exe https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-windows.exe - 41cb397e0633df58663761ff2afa25324d8cf603fb798fc08f7dc933aeb6f6048c1c0d6d0356aaebcfc901c57cc1b4996f10d6d83cd68f8dd66b50944b1ee2a3 + 38a521ec80cdb6944124f4233d7e71eed8cc9f9be2c0c736269915d21c3718ea8131e4516bb6eeada6df331f5fa8f47a299907e50ee9edbe0114444520974d06 0.11.0 coscli-linux https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-linux - c990c0d1cc77e220ed449b603753a9e4ae91ade9db6d443c31f4e4dfdddcd86fba6543e2354a0834c1776da210ae092dc712bcf1802871146645e8d838820efa + 9c930a1d308e9581a0e2fdfe3751ea7fe13d6068df90ca6465740ec3eda034202ef71ec54c99e90015ff81aa68aa1489567db5e411e222eb7258704bdac7e924 0.11.0 From d5038f4eba2fec761133bc31ef642b2dd548ba04 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 5 May 2022 22:40:32 +0200 Subject: [PATCH 181/383] [freetype-gl] no absolute paths (#24551) --- ports/freetype-gl/0005-add-version.patch | 11 +++++++++++ ports/freetype-gl/portfile.cmake | 17 ++++++++++------- ports/freetype-gl/vcpkg.json | 11 ++++++++++- versions/baseline.json | 2 +- versions/f-/freetype-gl.json | 5 +++++ 5 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 ports/freetype-gl/0005-add-version.patch diff --git a/ports/freetype-gl/0005-add-version.patch b/ports/freetype-gl/0005-add-version.patch new file mode 100644 index 00000000000000..f23c2e4cab4a06 --- /dev/null +++ b/ports/freetype-gl/0005-add-version.patch @@ -0,0 +1,11 @@ +diff --git a/freetype-gl.pc.in b/freetype-gl.pc.in +index 3b33096..a5ae350 100644 +--- a/freetype-gl.pc.in ++++ b/freetype-gl.pc.in +@@ -5,5 +5,6 @@ includedir=@PKG_CONFIG_INCLUDEDIR@ + + Name: freetype-gl + Description: OpenGL text using one vertex buffer, one texture and FreeType ++Version: 2022-01-17 + Libs: -L${libdir} -lfreetype-gl + Cflags: -I${includedir} diff --git a/ports/freetype-gl/portfile.cmake b/ports/freetype-gl/portfile.cmake index ecebe42dbc86e0..36c0282bc104cd 100644 --- a/ports/freetype-gl/portfile.cmake +++ b/ports/freetype-gl/portfile.cmake @@ -11,11 +11,11 @@ vcpkg_from_github( 0002-Remove-duplicate-installs.patch 0003-Add-exports.patch 0004-Change-install-dir-for-pkgconfig.patch + 0005-add-version.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dfreetype-gl_BUILD_APIDOC=OFF -Dfreetype-gl_BUILD_DEMOS=OFF @@ -23,12 +23,15 @@ vcpkg_configure_cmake( -Dfreetype-gl_BUILD_MAKEFONT=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/freetype-gl RENAME copyright) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freetype-gl" RENAME copyright) + diff --git a/ports/freetype-gl/vcpkg.json b/ports/freetype-gl/vcpkg.json index 1527e962d6c372..3acfe4cbb6aaff 100644 --- a/ports/freetype-gl/vcpkg.json +++ b/ports/freetype-gl/vcpkg.json @@ -1,10 +1,19 @@ { "name": "freetype-gl", "version-date": "2022-01-17", + "port-version": 1, "description": "OpenGL text using one vertex buffer, one texture and FreeType", "homepage": "https://github.com/rougier/freetype-gl", "dependencies": [ "freetype", - "glew" + "glew", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index eae9035668da93..1d8fa5b0f596bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2342,7 +2342,7 @@ }, "freetype-gl": { "baseline": "2022-01-17", - "port-version": 0 + "port-version": 1 }, "freexl": { "baseline": "1.0.6", diff --git a/versions/f-/freetype-gl.json b/versions/f-/freetype-gl.json index 749031ed13401e..0e74040b060124 100644 --- a/versions/f-/freetype-gl.json +++ b/versions/f-/freetype-gl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c966935c663878c91381818cae1b87590be48191", + "version-date": "2022-01-17", + "port-version": 1 + }, { "git-tree": "4184aadfa1242cc37b6a3c77d9893bafd3d54d3f", "version-date": "2022-01-17", From 8e5e74fe09be9f9820d9ade40e07c11e37d2a2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 5 May 2022 20:47:56 +0000 Subject: [PATCH 182/383] [vcpkg baseline][nuspell] Add and fix feature tools (#24542) * [vcpkg baseline][nuspell] Add and fix feature tools * version --- ports/nuspell/fix-tools.patch | 30 ++++++++++++++++++++++++++++++ ports/nuspell/portfile.cmake | 17 ++++++++++++++++- ports/nuspell/vcpkg.json | 11 ++++++++++- versions/baseline.json | 2 +- versions/n-/nuspell.json | 5 +++++ 5 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 ports/nuspell/fix-tools.patch diff --git a/ports/nuspell/fix-tools.patch b/ports/nuspell/fix-tools.patch new file mode 100644 index 00000000000000..1698c2f73f1113 --- /dev/null +++ b/ports/nuspell/fix-tools.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b54c54..7c6f3a3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,7 +12,10 @@ find_package(ICU 60 REQUIRED COMPONENTS uc data) + get_directory_property(subproject PARENT_DIRECTORY) + + add_subdirectory(src/nuspell) ++option(BUILD_TOOLS "Build the tools." OFF) ++if (BUILD_TOOLS) + add_subdirectory(src/tools) ++endif() + + if (subproject) + # if added as subproject just build Nuspell +diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt +index 3e63610..9be98be 100644 +--- a/src/tools/CMakeLists.txt ++++ b/src/tools/CMakeLists.txt +@@ -3,6 +3,10 @@ set_target_properties(nuspell-exe PROPERTIES RUNTIME_OUTPUT_NAME nuspell) + target_compile_definitions(nuspell-exe PRIVATE + PROJECT_VERSION=\"${PROJECT_VERSION}\") + target_link_libraries(nuspell-exe Nuspell::nuspell) ++if (WIN32) ++ find_library(GETOPT_WIN32_LIBRARY getopt) ++ target_link_libraries(nuspell-exe Nuspell::nuspell ${GETOPT_WIN32_LIBRARY}) ++endif() + if (BUILD_SHARED_LIBS AND WIN32) + # This should be PRE_LINK (or PRE_BUILD), so Vcpkg's POST_BUILD + # step (see VCPKG_APPLOCAL_DEPS) that copies dll can pick up nuspell.dll diff --git a/ports/nuspell/portfile.cmake b/ports/nuspell/portfile.cmake index 9e52673c1bbca0..8f7ec68576128f 100644 --- a/ports/nuspell/portfile.cmake +++ b/ports/nuspell/portfile.cmake @@ -4,13 +4,23 @@ vcpkg_from_github( REF v5.1.0 SHA512 08ce776d224c66ba4bdd8cb22943741f30e8e5ba03396bfef1db598321c9b0f8814dacffcb52287b3b669426c7b08e2c1a40323341a9ff9768a7187002e1d77a HEAD_REF master + PATCHES fix-tools.patch ) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF ) vcpkg_cmake_install() +vcpkg_copy_pdbs() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nuspell) vcpkg_fixup_pkgconfig( # nuspell.pc depends on icu-uc.pc which has -lm specified as private @@ -18,9 +28,14 @@ vcpkg_fixup_pkgconfig( # because it can't find this. -lm is part of glibc on Linux. SYSTEM_LIBRARIES m ) -vcpkg_copy_tools(TOOL_NAMES nuspell AUTO_CLEAN) + +if (BUILD_TOOLS) + vcpkg_copy_tools(TOOL_NAMES nuspell AUTO_CLEAN) +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) + file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nuspell/vcpkg.json b/ports/nuspell/vcpkg.json index 7ec126bd67a0ec..969006fd41190a 100644 --- a/ports/nuspell/vcpkg.json +++ b/ports/nuspell/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nuspell", "version-semver": "5.1.0", + "port-version": 1, "description": [ "Nuspell is a fast and safe spelling checker software program.", "It is designed for languages with rich morphology and complex word compounding.", @@ -18,5 +19,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tools": { + "description": "Build tools", + "dependencies": [ + "getopt" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 1d8fa5b0f596bb..4528abea0e3305 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4922,7 +4922,7 @@ }, "nuspell": { "baseline": "5.1.0", - "port-version": 0 + "port-version": 1 }, "nvtt": { "baseline": "2.1.2", diff --git a/versions/n-/nuspell.json b/versions/n-/nuspell.json index 06ba7265629aa3..24322cbd2b33fb 100644 --- a/versions/n-/nuspell.json +++ b/versions/n-/nuspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02475776fc8cc0332efe7e0ea8851872c911de32", + "version-semver": "5.1.0", + "port-version": 1 + }, { "git-tree": "53fb93bbc0d441813026ef171e32d7479ab839f3", "version-semver": "5.1.0", From 620d33107ca9e300a63607b1a8b2cbf0d10175df Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 5 May 2022 14:23:30 -0700 Subject: [PATCH 183/383] [azure-core-cpp] Update to 1.6.0 (#24567) ## 1.6.0 (2022-05-05) ### Features Added - Add `Azure::Core::Http::Request` constructor overload to support payload and non-buffered response. ### Bugs Fixed - [[#3537]](https://github.com/Azure/azure-sdk-for-cpp/issues/3537) Updated field type `CurlTransportOptions.Proxy` from `std::string` to `Azure::Nullable`. This allows libcurl to ignore the proxy settings from the environment when the string is empty. - [[#3548]](https://github.com/Azure/azure-sdk-for-cpp/issues/3548), [[#1098]](https://github.com/Azure/azure-sdk-for-cpp/issues/1098) Improve performance of the Http transport on Windows by reusing the same session handle across all requests. ### Other Changes - [[#3581]](https://github.com/Azure/azure-sdk-for-cpp/issues/3581) Update log level in retry policy from warning to informational. --- ports/azure-core-cpp/portfile.cmake | 4 ++-- ports/azure-core-cpp/vcpkg.json | 2 +- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 262cdf715a7d6d..a7d0a06d2a24ec 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.5.0 - SHA512 7a0b8ed9345b565e4476cb66c1e7a44350f5cd4f79a9d40a11b77f646eff353d94762803ca5931264689d390255cd9d361c5d4a54ccc89548cf640f76a26e74c + REF azure-core_1.6.0 + SHA512 13374ddf74488c080ef19d78569961dc859cd95cb64f359e0d3a0d763a314f005a6ba51b8f8fe900a7acb3eb4b783f4570962569855f6e4839b02de4db0d026e ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 57bba11bd29ab6..c94da535b31311 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.5.0", + "version-semver": "1.6.0", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index 016f38eceefa51..8dbdcb38edeced 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b920c224b5fa4daa427701a123bdf213dac8c43", + "version-semver": "1.6.0", + "port-version": 0 + }, { "git-tree": "8940f6b17c33b8076e08c931fcf2ccdafa2fe2f2", "version-semver": "1.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4528abea0e3305..4b81e658c2f2fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -317,7 +317,7 @@ "port-version": 3 }, "azure-core-cpp": { - "baseline": "1.5.0", + "baseline": "1.6.0", "port-version": 0 }, "azure-identity-cpp": { From 60c2bed135d16119998eee915d9fbdaf4e922d0c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 5 May 2022 23:23:49 +0200 Subject: [PATCH 184/383] [nng] Update to 1.5.2 (#24566) * Update nng to 1.5.2 * Update CI baseline Co-authored-by: chausner --- ports/nng/portfile.cmake | 8 ++++---- ports/nng/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nng.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/nng/portfile.cmake b/ports/nng/portfile.cmake index 60af4ca7e02a6c..3dd2b297411d6b 100644 --- a/ports/nng/portfile.cmake +++ b/ports/nng/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanomsg/nng - REF 9fcf039b573d153ba9bbc2beb5f11259ddacdcff # v1.5.1 - SHA512 3db2668c3f971dc54156df2a3520645224fbb55460957da35940889c3148cb2cbc67c10cd23b9614ece70235d1f6003618310129eb9c40ced42db058c140dd58 + REF v1.5.2 + SHA512 33cda9e0422c6e8cb56e48bd812f381bf07a92a0aa2fbadddbca7cfde585c66299142186a3a76a97163e5570042452a62c1e53180ebfbf016a44eee998b16286 HEAD_REF master ) @@ -34,13 +34,13 @@ vcpkg_replace_string( if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/nng/nng.h + "${CURRENT_PACKAGES_DIR}/include/nng/nng.h" "!defined(NNG_STATIC_LIB)" "1 /* !defined(NNG_STATIC_LIB) */" ) else() vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/nng/nng.h + "${CURRENT_PACKAGES_DIR}/include/nng/nng.h" "!defined(NNG_STATIC_LIB)" "0 /* !defined(NNG_STATIC_LIB) */" ) diff --git a/ports/nng/vcpkg.json b/ports/nng/vcpkg.json index c89456dfd6237c..cdb6da7df70493 100644 --- a/ports/nng/vcpkg.json +++ b/ports/nng/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nng", - "version-semver": "1.5.1", + "version-semver": "1.5.2", "description": "nanomsg-next-gen, lightweight messaging library", "homepage": "https://nng.nanomsg.org", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4b81e658c2f2fb..27f14e50ba0d13 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4865,7 +4865,7 @@ "port-version": 1 }, "nng": { - "baseline": "1.5.1", + "baseline": "1.5.2", "port-version": 0 }, "nngpp": { diff --git a/versions/n-/nng.json b/versions/n-/nng.json index a63b840915b9dc..b13488a6a06c71 100644 --- a/versions/n-/nng.json +++ b/versions/n-/nng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e400d4ac38af1eafba51433102b0963d06053b2", + "version-semver": "1.5.2", + "port-version": 0 + }, { "git-tree": "ec4958fd8785c45084ce752f527ab7ef7acd69a7", "version-semver": "1.5.1", From cfcb3c761a39c9eeae3a60c795bfb8289ba6eac0 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Thu, 5 May 2022 15:14:26 -0700 Subject: [PATCH 185/383] [libunibreak] Fixed missing definition of variable in config.cmake (#24476) * Updated libunibreak and added config.cmake file * Updated version * Updated the manifest file * updated git-tree * Remove vcpkg-cmake-config dependency * updated version * Fix issue with libunibreak-config.cmake.in * updated git-tree * increased port-version * updated git-tree Co-authored-by: Benjamin Oldenburg --- ports/libunibreak/libunibreak-config.cmake.in | 8 ++++++++ ports/libunibreak/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libunibreak.json | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ports/libunibreak/libunibreak-config.cmake.in b/ports/libunibreak/libunibreak-config.cmake.in index 3c217318c0fedf..0a4746360e35dc 100644 --- a/ports/libunibreak/libunibreak-config.cmake.in +++ b/ports/libunibreak/libunibreak-config.cmake.in @@ -6,6 +6,14 @@ if(TARGET libunibreak) return() endif() +# Compute the installation prefix relative to this file. +get_filename_component(_INSTALL_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_INSTALL_DIR "${_INSTALL_DIR}" PATH) +get_filename_component(_INSTALL_DIR "${_INSTALL_DIR}" PATH) +if(_INSTALL_DIR STREQUAL "/") + set(_INSTALL_DIR "") +endif() + add_library(unibreak INTERFACE IMPORTED GLOBAL) add_library(libunibreak::libunibreak ALIAS unibreak) diff --git a/ports/libunibreak/vcpkg.json b/ports/libunibreak/vcpkg.json index 7e2a8dd328f561..3c4a6f438ebec9 100644 --- a/ports/libunibreak/vcpkg.json +++ b/ports/libunibreak/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libunibreak", "version": "5.0", + "port-version": 1, "description": "an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.", "homepage": "https://github.com/adah1972/libunibreak", "license": "zlib-acknowledgement", diff --git a/versions/baseline.json b/versions/baseline.json index 27f14e50ba0d13..30bc6b0055a913 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4114,7 +4114,7 @@ }, "libunibreak": { "baseline": "5.0", - "port-version": 0 + "port-version": 1 }, "libunifex": { "baseline": "2021-12-07", diff --git a/versions/l-/libunibreak.json b/versions/l-/libunibreak.json index 9250855dc31da9..364e54e6a65ce5 100644 --- a/versions/l-/libunibreak.json +++ b/versions/l-/libunibreak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "724f588851a5f81f6ddd8eb1fc01a45bedfa5517", + "version": "5.0", + "port-version": 1 + }, { "git-tree": "ab89a270477d6d97e3d70c4503ee573f1ca8e539", "version": "5.0", From 43a8badaedacb9fdae76b57440ea0eaf94ca867f Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Thu, 5 May 2022 18:28:56 -0400 Subject: [PATCH 186/383] [DiscordCoreAPI] Update to 2022-05-05 (#24563) * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating the port data! * Updating port data. * Updating port data. * Updating port data. * Updating port data. * Updating port data. --- ports/discordcoreapi/portfile.cmake | 10 +++------- ports/discordcoreapi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/discordcoreapi.json | 5 +++++ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 73715b3642e82c..c5bbb6f52aa92c 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -1,12 +1,12 @@ if(VCPKG_TARGET_IS_LINUX) - message(WARNING "Discordcoreapi only supports g++ 11 on linux.") + message(WARNING "DiscordCoreAPI only supports g++ 11 on linux.") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI - REF c5e7efee991f4dcff428ca21c2e157949e784a78 - SHA512 5f42864f8375c87542550ff1f05e761d75a02de5810a4ca1f1b4893894d9be11a21915ff16771e3233103c4fce3ce8734359baacd5f5051d719e387a225343dd + REF e80a0209c3192252ac7f7cd6a4d16afaf42f7902 + SHA512 6f318e12613b5a5103ffdd093ab7e281ffcc1320de2f7612a55d5402d2dc85d24356acd8a27c0734b1eec2bc0dc6f8a6e1fa97ea200a18c2d05225ab472ecffc HEAD_REF main ) @@ -18,10 +18,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION) -vcpkg_fixup_pkgconfig() - -vcpkg_copy_pdbs() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index da67d297b3625e..86fd14e0e4934c 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version-date": "2022-04-17", + "version-date": "2022-05-05", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "AGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 30bc6b0055a913..4d0b781470af5d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1897,7 +1897,7 @@ "port-version": 1 }, "discordcoreapi": { - "baseline": "2022-04-17", + "baseline": "2022-05-05", "port-version": 0 }, "discount": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 03cef54f206474..50434f139e277d 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c672bbd1eb0e22b11d0f3c20202a603c3a4634ed", + "version-date": "2022-05-05", + "port-version": 0 + }, { "git-tree": "dd790721f9b6d332bbcdae69e83a716720eedc1a", "version-date": "2022-04-17", From 0e11392612961684a8f526508098650f794d1c97 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 6 May 2022 00:42:20 +0200 Subject: [PATCH 187/383] [openblas] update to 0.3.20 (#24546) * update openblas * verison stuff * Remove ci.baseline.txt entries obsoleted by "supports" expression. Co-authored-by: Alexander Neumann Co-authored-by: Billy Robert O'Neal III --- ports/openblas/fix-uwp-build.patch | 124 ----------------------------- ports/openblas/portfile.cmake | 8 +- ports/openblas/vcpkg.json | 5 +- scripts/ci.baseline.txt | 2 - versions/baseline.json | 4 +- versions/o-/openblas.json | 5 ++ 6 files changed, 14 insertions(+), 134 deletions(-) diff --git a/ports/openblas/fix-uwp-build.patch b/ports/openblas/fix-uwp-build.patch index 43e6c860737186..7604cf736c1c8e 100644 --- a/ports/openblas/fix-uwp-build.patch +++ b/ports/openblas/fix-uwp-build.patch @@ -33,127 +33,3 @@ index 3e98dba..ee597f7 100644 // cgemv_t.S return NaN if there are NaN or Inf in the buffer (see bug #746) if(trans && stack_alloc_size) memset(buffer, 0, MIN(BUFFER_SIZE, sizeof(FLOAT) * buffer_size)); - ---- a/driver/others/CMakeLists.txt -+++ b/driver/others/CMakeLists.txt -@@ -1,20 +1,23 @@ - include_directories(${PROJECT_SOURCE_DIR}) - include_directories(${PROJECT_BINARY_DIR}) -+if(WIN32) -+ add_compile_definitions(_CRT_SECURE_NO_WARNINGS) -+endif() - - if (${CORE} STREQUAL "PPC440") - set(MEMORY memory_qalloc.c) - else () - set(MEMORY memory.c) - endif () - - if (USE_THREAD) - - if (USE_OPENMP) - set(BLAS_SERVER blas_server_omp.c) -- elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") -+ elseif (WIN32) - set(BLAS_SERVER blas_server_win32.c) - elseif (${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") - set(BLAS_SERVER blas_server_win32.c) - endif () - - if (NOT DEFINED BLAS_SERVER) - ---- a/cmake/os.cmake -+++ b/cmake/os.cmake -@@ -15,13 +15,13 @@ - - if (${CMAKE_SYSTEM_NAME} STREQUAL "AIX") - set(EXTRALIB "${EXTRALIB} -lm") - endif () - - # TODO: this is probably meant for mingw, not other windows compilers --if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") -+if (WIN32) - - set(NEED_PIC 0) - set(NO_EXPRECISION 1) - - set(EXTRALIB "${EXTRALIB} -defaultlib:advapi32") - -@@ -66,13 +66,13 @@ - - if (CYGWIN) - set(NEED_PIC 0) - set(NO_EXPRECISION 1) - endif () - --if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Interix" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android") -+if (NOT WIN32 AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Interix" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android") - if (USE_THREAD) - set(EXTRALIB "${EXTRALIB} -lpthread") - endif () - endif () - - if (QUAD_PRECISION) - ---- a/cmake/system.cmake -+++ b/cmake/system.cmake -@@ -422,22 +422,22 @@ - endif () - - if (USE_SIMPLE_THREADED_LEVEL3) - set(CCOMMON_OPT "${CCOMMON_OPT} -DUSE_SIMPLE_THREADED_LEVEL3") - endif () - --if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") -+if (NOT WIN32) - if (DEFINED MAX_STACK_ALLOC) - if (NOT ${MAX_STACK_ALLOC} EQUAL 0) - set(CCOMMON_OPT "${CCOMMON_OPT} -DMAX_STACK_ALLOC=${MAX_STACK_ALLOC}") - endif () - else () - set(CCOMMON_OPT "${CCOMMON_OPT} -DMAX_STACK_ALLOC=2048") - endif () - endif () --if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") -+if (NOT WIN32) - if (DEFINED BLAS3_MEM_ALLOC_THRESHOLD) - if (NOT ${BLAS3_MEM_ALLOC_THRESHOLD} EQUAL 32) - set(CCOMMON_OPT "${CCOMMON_OPT} -DBLAS3_MEM_ALLOC_THRESHOLD=${BLAS3_MEM_ALLOC_THRESHOLD}") - endif() - endif() - endif() -@@ -544,13 +544,13 @@ - - #For LAPACK Fortran codes. - set(LAPACK_FFLAGS "${LAPACK_FFLAGS} ${CMAKE_Fortran_FLAGS}") - set(LAPACK_FPFLAGS "${LAPACK_FPFLAGS} ${FPFLAGS}") - - #Disable -fopenmp for LAPACK Fortran codes on Windows. --if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") -+if (NOT WIN32) - set(FILTER_FLAGS "-fopenmp;-mp;-openmp;-xopenmp=parallel") - foreach (FILTER_FLAG ${FILTER_FLAGS}) - string(REPLACE ${FILTER_FLAG} "" LAPACK_FFLAGS ${LAPACK_FFLAGS}) - string(REPLACE ${FILTER_FLAG} "" LAPACK_FPFLAGS ${LAPACK_FPFLAGS}) - endforeach () - endif () -@@ -562,17 +562,17 @@ - - set(LAPACK_CFLAGS "${CMAKE_C_CFLAGS} -DHAVE_LAPACK_CONFIG_H") - if (INTERFACE64) - set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DLAPACK_ILP64") - endif () - --if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") -+if (WIN32) - set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DOPENBLAS_OS_WINDOWS") - endif () - --if (${CMAKE_C_COMPILER} STREQUAL "LSB" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") -+if (${CMAKE_C_COMPILER} STREQUAL "LSB" OR WIN32) - set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DLAPACK_COMPLEX_STRUCTURE") - endif () - - if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") - if ("${F_COMPILER}" STREQUAL "FLANG") - if (${CMAKE_Fortran_COMPILER_VERSION} VERSION_LESS_EQUAL 3) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 45c1f86c51e7e5..39a5dc94686de2 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS - REF 2480e5046e3b0120da8a7fd1442eca628df55f87 # v0.3.19 - SHA512 b85a96c8cd75bf7197732f3b923b8b0ffdc6261d7d6dc7b622d4bf24f061d02273ad99571cabe4686d92f77ff8e6f7e2de0851758cbb3c529d7c2ca96a0bc34d + REF 0b678b19dc03f2a999d6e038814c4c50b9640a4e # v0.3.20 + SHA512 6e32f7dfc5dde46570873810c1da09d102f76ccfce41a5adbaeef2fccada54f9ab07e1ee541a6d55e138e6500392a6f55236f4f3a7766803358e5a6205334946 HEAD_REF develop PATCHES uwp.patch @@ -36,8 +36,7 @@ set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON) if(VCPKG_TARGET_IS_OSX) if("dynamic-arch" IN_LIST FEATURES) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - message(STATUS "Openblas with \"dynamic-arch\" option for OSX supports only dynamic linkage. It's not a bag of openblas but bug of combination cmake+ninja+osx. See: https://gitlab.kitware.com/cmake/cmake/-/issues/16731") + set(conf_opts GENERATOR "Unix Makefiles") endif() endif() @@ -58,6 +57,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + ${conf_opts} OPTIONS ${FEATURE_OPTIONS} ${COMMON_OPTIONS} diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index d7be1f3383ab11..1bc43d57359048 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,9 +1,10 @@ { "name": "openblas", - "version": "0.3.19", - "port-version": 1, + "version": "0.3.20", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", + "license": "BSD-3-Clause", + "supports": "!(windows & arm)", "dependencies": [ { "name": "openblas", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a5a5e8750662c4..1ccc38638674ef 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -814,8 +814,6 @@ ompl:x64-osx=fail ompl:x64-linux=fail openal-soft:arm-uwp=fail openal-soft:x64-uwp=fail -openblas:arm64-windows=fail -openblas:arm-uwp=fail # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected opencc:arm64-windows=fail # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. diff --git a/versions/baseline.json b/versions/baseline.json index 4d0b781470af5d..88be35fed0085a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5057,8 +5057,8 @@ "port-version": 5 }, "openblas": { - "baseline": "0.3.19", - "port-version": 1 + "baseline": "0.3.20", + "port-version": 0 }, "opencascade": { "baseline": "7.6.0", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 8b7301aa54fd11..558bb03bf12f5a 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abd8d8b0d0286d963399d79e3e8b6f7f8e12117b", + "version": "0.3.20", + "port-version": 0 + }, { "git-tree": "90e2cde7fda025b587d6c41e699c98c263cf41eb", "version": "0.3.19", From 47cbed88514c0e48fdb72ddc29545f35136f5461 Mon Sep 17 00:00:00 2001 From: kromych Date: Thu, 5 May 2022 16:01:10 -0700 Subject: [PATCH 188/383] Fix building LuaJIT on Linux (#24498) * Fix building LuaJIT on Linux * Update version metadata * Fix remaining ci.baseline.txt entries: luajit:arm64-windows: Left as "skip": The problem is that the batch files used to build here want to run a binary they built which fails, but there's no good way to say "I can run the results" in our platform expressions right now luajit:arm64-uwp / luajit:arm-uwp: These are already stopped by the platform expression. luajit:x64-osx: I don't know if this works yet but we should try. * Block osx with a "supports". Co-authored-by: Billy Robert O'Neal III --- ports/luajit/portfile.cmake | 85 ++++++++++++++++++++++++++----------- ports/luajit/vcpkg.json | 4 +- scripts/ci.baseline.txt | 10 +---- versions/baseline.json | 2 +- versions/l-/luajit.json | 5 +++ 5 files changed, 69 insertions(+), 37 deletions(-) diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index e8a39ff25d1fcf..fefdc11e82c628 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -20,21 +20,38 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process_repeat( - COUNT 1 - COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - LOGNAME build-${TARGET_TRIPLET}-dbg - ) + if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_execute_required_process_repeat( + COUNT 1 + COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME build-${TARGET_TRIPLET}-dbg + ) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(COPY ${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) + endif() + vcpkg_copy_pdbs() + else() + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-debug + ) + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile PREFIX=${CURRENT_PACKAGES_DIR}/debug CCDEBUG=-g3 CFLAGS=-O0 BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-debug + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lua") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - vcpkg_copy_pdbs() endif() @@ -43,21 +60,39 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process_repeat(d8un - COUNT 1 - COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - LOGNAME build-${TARGET_TRIPLET}-rel - ) + if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_execute_required_process_repeat( + COUNT 1 + COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + LOGNAME build-${TARGET_TRIPLET}-rel + ) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) + endif() + vcpkg_copy_pdbs() + else() + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-rel + ) + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile PREFIX=${CURRENT_PACKAGES_DIR} CCDEBUG= BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-rel + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/lua" "${CURRENT_PACKAGES_DIR}/lib/lua") endif() - vcpkg_copy_pdbs() +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(INSTALL ${SOURCE_PATH}/src/lua.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) @@ -68,4 +103,4 @@ file(INSTALL ${SOURCE_PATH}/src/lauxlib.h DESTINATION ${CURRENT_PACKAGES_D file(INSTALL ${SOURCE_PATH}/src/lua.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) # Handle copyright -file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index 22c50d2682cac0..04da3220e3ba26 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,8 +1,8 @@ { "name": "luajit", "version": "2.0.5", - "port-version": 5, + "port-version": 6, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", - "supports": "!uwp" + "supports": "!uwp & !osx" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1ccc38638674ef..2e54d9f5f1cf3c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -623,15 +623,7 @@ log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail log4cxx:arm-uwp=fail log4cxx:x64-uwp=fail -luajit:arm64-windows = skip -luajit:arm-uwp = skip -luajit:x64-linux = skip -luajit:x64-osx = skip -luajit:x64-uwp = skip -luajit:x64-windows = skip -luajit:x64-windows-static = skip -luajit:x64-windows-static-md=skip -luajit:x86-windows = skip +luajit:arm64-windows=fail luafilesystem:arm-uwp=fail luafilesystem:x64-uwp=fail luasec:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 88be35fed0085a..8dd226218e4d96 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4310,7 +4310,7 @@ }, "luajit": { "baseline": "2.0.5", - "port-version": 5 + "port-version": 6 }, "luasec": { "baseline": "1.0.1", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index 2e60dce6192b5e..8cf378c23a875c 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8d4e2ca9656ec3a26a0ade9f0421e17b11206c7", + "version": "2.0.5", + "port-version": 6 + }, { "git-tree": "3748aef9d3bd9d941f6af4d9c049cc55194cb7f5", "version": "2.0.5", From 309f98597148adfa93ddab1f0e552c22cb11449f Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 6 May 2022 11:20:25 -0700 Subject: [PATCH 189/383] [atk,gdk-pixbuf,glib] Use vcpkg_from_gitlab. (#24541) * [atk,gdk-pixbuf,glib] Use vcpkg_from_gitlab. * Add quotes and licenses. --- ports/atk/portfile.cmake | 21 +++++++++---------- ports/atk/vcpkg.json | 2 ++ ports/gdk-pixbuf/portfile.cmake | 23 ++++++++++----------- ports/gdk-pixbuf/vcpkg.json | 5 +++-- ports/glib/portfile.cmake | 36 +++++++++++++++------------------ ports/glib/vcpkg.json | 3 ++- versions/a-/atk.json | 5 +++++ versions/baseline.json | 6 +++--- versions/g-/gdk-pixbuf.json | 5 +++++ versions/g-/glib.json | 5 +++++ 10 files changed, 61 insertions(+), 50 deletions(-) diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index 1aac1f0a3e570d..952f2075fdbdc5 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -2,24 +2,21 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) set(ATK_VERSION 2.38.0) -vcpkg_download_distfile(ARCHIVE - URLS "https://gitlab.gnome.org/GNOME/atk/-/archive/${ATK_VERSION}/atk-${ATK_VERSION}.tar.gz" - FILENAME "atk-${ATK_VERSION}.tar.gz" - SHA512 f31951ecbdace6a18fb9f772616137cb8732163b37448fef4daf1af60ba8479c94d498dcdaf4880468c80012c77a446da585926a99704a9a940b80e546080cf3 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES + REPO GNOME/atk + REF "${ATK_VERSION}" + HEAD_REF master + SHA512 f31951ecbdace6a18fb9f772616137cb8732163b37448fef4daf1af60ba8479c94d498dcdaf4880468c80012c77a446da585926a99704a9a940b80e546080cf3 ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dintrospection=false ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ) vcpkg_install_meson() @@ -28,4 +25,4 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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) diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index 37b590e8c5d2cd..c04346e202a99b 100644 --- a/ports/atk/vcpkg.json +++ b/ports/atk/vcpkg.json @@ -1,8 +1,10 @@ { "name": "atk", "version": "2.38.0", + "port-version": 1, "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", + "license": "GPL-2.0-only", "supports": "!arm", "dependencies": [ "gettext", diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index c097c84dd24732..64d541833ca020 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -1,23 +1,22 @@ set(GDK_PIXBUF_VERSION 2.42) set(GDK_PIXBUF_PATCH 8) -vcpkg_download_distfile(ARCHIVE - URLS "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/archive/${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.gz" - FILENAME "gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.gz" - SHA512 ea3b7d47f2ef3dbb88f640629e03eb4fab4a371da2545c199274d75b993b176af0c69ea72b46d5fadf58f82dff9a809fe1e0a4802ad1f1f13eaa9d757ebfeb4c -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + REPO GNOME/gdk-pixbuf + REF "${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}" + SHA512 ea3b7d47f2ef3dbb88f640629e03eb4fab4a371da2545c199274d75b993b176af0c69ea72b46d5fadf58f82dff9a809fe1e0a4802ad1f1f13eaa9d757ebfeb4c + HEAD_REF master PATCHES fix_build_error_windows.patch ) + if(VCPKG_TARGET_IS_WINDOWS) #list(APPEND OPTIONS -Dnative_windows_loaders=true) # Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff. To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option endif() vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dman=false # Whether to generate man pages (requires xlstproc) -Dgtk_doc=false # Whether to generate the API reference (requires GTK-Doc) @@ -29,7 +28,7 @@ vcpkg_configure_meson( -Drelocatable=true # Whether to enable application bundle relocation support -Dinstalled_tests=false -Dgio_sniffing=false # Perform file type detection using GIO (Unused on MacOS and Windows) - -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located; + -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located; # Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources' glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' @@ -40,7 +39,7 @@ vcpkg_configure_meson( ) vcpkg_install_meson(ADD_BIN_TO_PATH) -# Fix paths in pc file. +# Fix paths in pc file. set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdk-pixbuf-2.0.pc") if(EXISTS "${_file}") file(READ "${_file}" _contents) @@ -67,6 +66,6 @@ endif() vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) -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) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index ad6fe21e002e9d..8151baa5ffe686 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,9 +1,10 @@ { "name": "gdk-pixbuf", "version": "2.42.8", - "port-version": 1, + "port-version": 2, "description": "Image loading library.", - "homepage": "https://developer.gnome.org/gdk-pixbuf/", + "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", + "license": "LGPL-2.1-only", "dependencies": [ "gettext", "glib", diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index c0e4b526657e10..945b2783b2a224 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -6,21 +6,17 @@ endif() set(GLIB_MAJOR_MINOR 2.70) set(GLIB_PATCH 5) -vcpkg_download_distfile(ARCHIVE - URLS "https://gitlab.gnome.org/GNOME/glib/-/archive/${GLIB_MAJOR_MINOR}.${GLIB_PATCH}/glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.gz" - FILENAME "glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.gz" - SHA512 69c032358e0a0d88414a97e0bc898b5ce2797839a432b95790d03f108e55a79eee2d51bab5e281cc9469e2a57accc0d2c9bbaa80f9369050534387d1a215dd98) - -vcpkg_extract_source_archive_ex( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${GLIB_VERSION} + REPO GNOME/glib + REF "${GLIB_MAJOR_MINOR}.${GLIB_PATCH}" + SHA512 69c032358e0a0d88414a97e0bc898b5ce2797839a432b95790d03f108e55a79eee2d51bab5e281cc9469e2a57accc0d2c9bbaa80f9369050534387d1a215dd98 PATCHES use-libiconv-on-windows.patch libintl.patch ) - if (selinux IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "/usr/include/selinux") message("Selinux was not found in its typical system location. Your build may fail. You can install Selinux with \"apt-get install selinux\".") @@ -41,7 +37,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dinstalled_tests=false ${OPTIONS} @@ -54,15 +50,15 @@ vcpkg_install_meson(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() -set(GLIB_TOOLS gdbus - gio - gio-querymodules - glib-compile-resources - glib-compile-schemas - gobject-query - gresource - gsettings - ) +set(GLIB_TOOLS gdbus + gio + gio-querymodules + glib-compile-resources + glib-compile-schemas + gobject-query + gresource + gsettings + ) if(NOT VCPKG_TARGET_IS_WINDOWS) if(NOT VCPKG_TARGET_IS_OSX) @@ -111,7 +107,7 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc") endif() vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES}) -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) # Fix python scripts set(_file "${CURRENT_PACKAGES_DIR}/tools/${PORT}/gdbus-codegen") diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index fa88feecc5e3f7..b431aa6e45c863 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,9 +1,10 @@ { "name": "glib", "version": "2.70.5", - "port-version": 1, + "port-version": 2, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", + "license": "LGPL-2.1-only", "supports": "!uwp & !(windows & static)", "dependencies": [ "dirent", diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 705a9d0a1e4081..119e22c2d303ef 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4034b57da4c9eeb30d6904339be721b7e45f8a89", + "version": "2.38.0", + "port-version": 1 + }, { "git-tree": "9e43338e95e4bfeb688d23ade7792fb45b185356", "version": "2.38.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8dd226218e4d96..fdee5e62d9a031 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -206,7 +206,7 @@ }, "atk": { "baseline": "2.38.0", - "port-version": 0 + "port-version": 1 }, "atkmm": { "baseline": "2.36.1", @@ -2442,7 +2442,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.8", - "port-version": 1 + "port-version": 2 }, "gemmlowp": { "baseline": "2021-09-28", @@ -2538,7 +2538,7 @@ }, "glib": { "baseline": "2.70.5", - "port-version": 1 + "port-version": 2 }, "glibmm": { "baseline": "2.70.0", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index 5cadc3c3746cac..38fea4b466be6f 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e82cf35eb436a674fdbdfa12cce69e629c83bf4", + "version": "2.42.8", + "port-version": 2 + }, { "git-tree": "d1c32f1df7acf96c17689e559b2e1edeb947de38", "version": "2.42.8", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index bf0260aef3f7f0..d1eb2e214466d5 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fc7533aba85394460293d7ba61abc3170323f1d", + "version": "2.70.5", + "port-version": 2 + }, { "git-tree": "23fe84cc74f69a066a1e2a2629a527b9c8d058ad", "version": "2.70.5", From d331773973f6be4c10524daae5e8f63455e45158 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 7 May 2022 02:44:41 +0800 Subject: [PATCH 190/383] [cpp-httplib] update to v0.10.7 (#24571) * [cpp-httplib] update to v0.10.7 * update version --- ports/cpp-httplib/portfile.cmake | 4 ++-- ports/cpp-httplib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-httplib.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index 349a0d68553ea7..fe22c0e76a8b74 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib - REF d73395e1dc652465fa9524266cd26ad57365491f #v0.10.3 - SHA512 cace318611a1e306b774b4bb08e0312ad06fc10acb829b1df6d5cef9c1d6b018c0c5ebb8e3859fa2bee974dbd51fc5df90a43aa81107c97377d55bb36595b67d + REF 9452c0a4b69c5e4e31169ed32e961d330695122c #v0.10.7 + SHA512 23c4ca159ed4ddf29c3911436436502df76420d8bc8b202f290627de96ee6a741b74409a90f943f3fbbb59af1975bd8c36a94bd4c5eff3981f4514feb326e110 HEAD_REF master ) diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index ebbccb3f1d22b9..9c06a6f6544e72 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-httplib", - "version": "0.10.3", + "version": "0.10.7", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", "homepage": "https://github.com/yhirose/cpp-httplib", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index fdee5e62d9a031..574ac819265af8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1557,7 +1557,7 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.10.3", + "baseline": "0.10.7", "port-version": 0 }, "cpp-ipc": { diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index 3f00794b6cb3ff..cd1162b97c422a 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48c366ec15c570dbd1968b288649d2c33ce6ca08", + "version": "0.10.7", + "port-version": 0 + }, { "git-tree": "55de9c78120ee08fc96d9a6badab8e1d137ab36a", "version": "0.10.3", From aec505b36bd47041ecec5e8ad2e36248d99a4625 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Fri, 6 May 2022 17:57:49 -0400 Subject: [PATCH 191/383] [wxwidgets] update to 3.1.6 (#24483) * [wxwidgets] update to 3.1.6 * Revise nanosvg * Add feature control and dependencies for sound * Add descripton for feature sound * Update versions * Update ports/wxwidgets/vcpkg.json Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> * Fix spacing and version * Remove cmake push/pop * Bump version * Undo change in wrapper * bump version * restore newline * bump version Co-authored-by: Kai Pastor Co-authored-by: Billy Robert O'Neal Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> --- ports/nanosvg/CMakeLists.txt | 16 +++++++ ports/nanosvg/portfile.cmake | 15 ++++++ ports/nanosvg/vcpkg.json | 13 ++++++ ports/wxwidgets/fix-build.patch | 13 ------ ports/wxwidgets/fix-libs-export.patch | 57 +++++++++-------------- ports/wxwidgets/fix-linux-configure.patch | 15 ------ ports/wxwidgets/install-layout.patch | 51 ++++++++++---------- ports/wxwidgets/nanosvg-ext-depend.patch | 35 ++++++++++++++ ports/wxwidgets/portfile.cmake | 19 +++++--- ports/wxwidgets/vcpkg.json | 18 ++++++- versions/baseline.json | 8 +++- versions/n-/nanosvg.json | 9 ++++ versions/w-/wxwidgets.json | 5 ++ 13 files changed, 173 insertions(+), 101 deletions(-) create mode 100644 ports/nanosvg/CMakeLists.txt create mode 100644 ports/nanosvg/portfile.cmake create mode 100644 ports/nanosvg/vcpkg.json delete mode 100644 ports/wxwidgets/fix-build.patch delete mode 100644 ports/wxwidgets/fix-linux-configure.patch create mode 100644 ports/wxwidgets/nanosvg-ext-depend.patch create mode 100644 versions/n-/nanosvg.json diff --git a/ports/nanosvg/CMakeLists.txt b/ports/nanosvg/CMakeLists.txt new file mode 100644 index 00000000000000..6af85e67597546 --- /dev/null +++ b/ports/nanosvg/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.11) +project(nanosvg NONE) + +set(NANOSVG_HEADERS src/nanosvg.h src/nanosvgrast.h) +add_library(nanosvg INTERFACE) + +set_target_properties(nanosvg PROPERTIES PUBLIC_HEADER "${NANOSVG_HEADERS}") + +install(TARGETS nanosvg + EXPORT nanosvgTargets + PUBLIC_HEADER DESTINATION include) + +install(EXPORT nanosvgTargets + FILE unofficial-nanosvg-config.cmake + NAMESPACE unofficial::nanosvg:: + DESTINATION share/unofficial-nanosvg) diff --git a/ports/nanosvg/portfile.cmake b/ports/nanosvg/portfile.cmake new file mode 100644 index 00000000000000..b10bcb3c915b4c --- /dev/null +++ b/ports/nanosvg/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO memononen/nanosvg + REF 03042a6297399379198f98eb625ff8902bd84784 + SHA512 163f205e81e830e8b2512ec1faa15ebaf82138fc8bd881ccfc5f19896df75e8cf77ccd20892fccd0fd3e5d6358438e6f3075fd4e6a4c4b064107451265c9f874 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +set(VCPKG_BUILD_TYPE "release") # header-only +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nanosvg/vcpkg.json b/ports/nanosvg/vcpkg.json new file mode 100644 index 00000000000000..42d3831931c4c1 --- /dev/null +++ b/ports/nanosvg/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "nanosvg", + "version-date": "2022-04-29", + "description": "NanoSVG is a simple stupid single-header-file SVG parse. The output of the parser is a list of cubic bezier shapes..", + "homepage": "https://github.com/memononen/nanosvg", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/wxwidgets/fix-build.patch b/ports/wxwidgets/fix-build.patch deleted file mode 100644 index e47bc97e601572..00000000000000 --- a/ports/wxwidgets/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index 06116384c7..f82ff941bb 100644 ---- a/build/cmake/functions.cmake -+++ b/build/cmake/functions.cmake -@@ -383,7 +383,7 @@ endmacro() - # Enable cotire for target, use optional second argument for prec. header - macro(wx_target_enable_precomp target_name) - target_compile_definitions(${target_name} PRIVATE WX_PRECOMP) -- if(NOT ${ARGV1} STREQUAL "") -+ if(${ARGC} GREATER 1 AND NOT ${ARGV1} STREQUAL "") - set_target_properties(${target_name} PROPERTIES - COTIRE_CXX_PREFIX_HEADER_INIT ${ARGV1}) - endif() diff --git a/ports/wxwidgets/fix-libs-export.patch b/ports/wxwidgets/fix-libs-export.patch index 35e1379ff01fea..a334be306a6df3 100644 --- a/ports/wxwidgets/fix-libs-export.patch +++ b/ports/wxwidgets/fix-libs-export.patch @@ -1,36 +1,21 @@ -diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake -index 91d11ac..2791466 100644 ---- a/build/cmake/config.cmake -+++ b/build/cmake/config.cmake -@@ -41,7 +41,30 @@ macro(wx_get_dependencies var lib) - endif() - set(dep_name "-l${dep_name}") - else() -- get_filename_component(dep_name ${dep} NAME) -+ # For the value like $<$:LIB_PATH> -+ # Or $<$>:LIB_PATH> -+ if(dep MATCHES "^(.+>):(.+)>$") -+ if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_MATCH_1 STREQUAL [[$<$>]]) -+ continue() -+ elseif(CMAKE_BUILD_TYPE STREQUAL "Release" AND CMAKE_MATCH_1 STREQUAL [[$<$]]) -+ continue() -+ endif() -+ set(dep_name "${CMAKE_MATCH_2}") -+ else() -+ set(dep_name ${dep}) -+ endif() -+ endif() -+ if(dep_name STREQUAL "libc.so") -+ continue() # don't include this library -+ elseif(dep_name MATCHES "^-") # -l, -framework, -weak_framework -+ # ok -+ elseif(dep_name MATCHES "^lib(.*)(.so|.dylib|.tbd|.a)$") -+ set(dep_name "-l${CMAKE_MATCH_1} ") -+ elseif(dep_name) -+ get_filename_component(abs_path ${dep_name} PATH) -+ if (NOT abs_path) -+ set(dep_name "-l${dep_name} ") -+ endif() - endif() - wx_string_append(${var} "${dep_name} ") - endforeach() +diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake +index 52ae69d3f6..f261d5d262 100644 +--- a/build/cmake/config.cmake ++++ b/build/cmake/config.cmake +@@ -39,8 +39,14 @@ macro(wx_get_dependencies var lib) + else() + # For the value like $<$:LIB_PATH> + # Or $<$>:LIB_PATH> +- string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_name ${dep}) +- if (NOT dep_name) ++ if(dep MATCHES "^(.+>):(.+)>$") ++ if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_MATCH_1 STREQUAL [[$<$>]]) ++ continue() ++ elseif(CMAKE_BUILD_TYPE STREQUAL "Release" AND CMAKE_MATCH_1 STREQUAL [[$<$]]) ++ continue() ++ endif() ++ set(dep_name "${CMAKE_MATCH_2}") ++ else() + set(dep_name ${dep}) + endif() + endif() diff --git a/ports/wxwidgets/fix-linux-configure.patch b/ports/wxwidgets/fix-linux-configure.patch deleted file mode 100644 index 0fc85bf0802af9..00000000000000 --- a/ports/wxwidgets/fix-linux-configure.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/build/cmake/modules/cotire.cmake b/build/cmake/modules/cotire.cmake -index bb69643..09b52a6 100644 ---- a/build/cmake/modules/cotire.cmake -+++ b/build/cmake/modules/cotire.cmake -@@ -2316,6 +2316,10 @@ function (cotire_generate_target_script _language _configurations _target _targe - "${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_DEFINITIONS_${_upperConfig}) - cotire_get_target_compiler_flags( - "${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}) -+ string(REPLACE -+ "" "" -+ COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig} "${COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}}" -+ ) - cotire_get_source_files_compile_definitions( - "${_config}" "${_language}" COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig} ${_targetSources}) - endforeach() diff --git a/ports/wxwidgets/install-layout.patch b/ports/wxwidgets/install-layout.patch index bb99dd0071ead8..a0676bcb330fa5 100644 --- a/ports/wxwidgets/install-layout.patch +++ b/ports/wxwidgets/install-layout.patch @@ -1,34 +1,33 @@ diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index 902b7c5..dba3d07 100644 ---- a/build/cmake/functions.cmake -+++ b/build/cmake/functions.cmake -@@ -374,7 +374,7 @@ macro(wx_add_library name) - wx_install(TARGETS ${name} - LIBRARY DESTINATION "lib${wxPLATFORM_LIB_DIR}" - ARCHIVE DESTINATION "lib${wxPLATFORM_LIB_DIR}" -- RUNTIME DESTINATION "lib${wxPLATFORM_LIB_DIR}" -+ RUNTIME DESTINATION "bin" - BUNDLE DESTINATION Applications/wxWidgets - ) - endif() -diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index 0bc4f93..65fe3b8 100644 +index b5175236e2..8c9275974f 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake -@@ -149,7 +149,7 @@ else() - set(wxCOMPILER_PREFIX) +@@ -146,7 +146,7 @@ if(WIN32) + endif() endif() --if(MSVC) -+if(MSVC AND NOT wxBUILD_DISABLE_PLATFORM_LIB_DIR) +-if(WIN32_MSVC_NAMING) ++if(WIN32_MSVC_NAMING AND NOT wxBUILD_DISABLE_PLATFORM_LIB_DIR) if(wxBUILD_SHARED) - set(lib_suffix "dll") + set(lib_suffix "_dll") else() +index 9e6aafa900..defd196d2e 100644 +--- a/build/cmake/functions.cmake ++++ b/build/cmake/functions.cmake +@@ -417,7 +417,7 @@ macro(wx_add_library name) + + # Setup install + set(runtime_dir "lib") +- if(WIN32 AND NOT WIN32_MSVC_NAMING) ++ if(VCPKG_TOOLCHAIN OR (WIN32 AND NOT WIN32_MSVC_NAMING)) + # configure puts the .dll in the bin directory + set(runtime_dir "bin") + endif() diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake -index 968dff8..5b4fda9 100644 +index 7902646ef4..04ccd1aba7 100644 --- a/build/cmake/install.cmake +++ b/build/cmake/install.cmake -@@ -45,7 +45,7 @@ else() +@@ -48,7 +48,7 @@ else() install(DIRECTORY DESTINATION "bin") install(CODE "execute_process( \ @@ -38,15 +37,15 @@ index 968dff8..5b4fda9 100644 ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ )" diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt -index 4108d6a..19d730e 100644 +index 2b3a22834d..e0e964db9d 100644 --- a/build/cmake/utils/CMakeLists.txt +++ b/build/cmake/utils/CMakeLists.txt -@@ -39,7 +39,7 @@ if(wxUSE_XRC) - )" - ) +@@ -41,7 +41,7 @@ if(wxUSE_XRC) + endif() + install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ + COMMAND ${CMAKE_COMMAND} -E copy \ - ${CMAKE_INSTALL_PREFIX}/bin/wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \ + ${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \ ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \ )" diff --git a/ports/wxwidgets/nanosvg-ext-depend.patch b/ports/wxwidgets/nanosvg-ext-depend.patch new file mode 100644 index 00000000000000..d9d96639f3f179 --- /dev/null +++ b/ports/wxwidgets/nanosvg-ext-depend.patch @@ -0,0 +1,35 @@ +diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake +index 8c9275974f..3758261299 100644 +--- a/build/cmake/init.cmake ++++ b/build/cmake/init.cmake +@@ -615,3 +615,6 @@ if(wxBUILD_PRECOMP) + wx_option_force_value(wxBUILD_PRECOMP OFF) + endif() + endif(wxBUILD_PRECOMP) ++ ++find_package(unofficial-nanosvg CONFIG REQUIRED) ++list(APPEND wxTOOLKIT_LIBRARIES unofficial::nanosvg::nanosvg) +diff --git a/src/generic/bmpsvg.cpp b/src/generic/bmpsvg.cpp +index 76f20dce4c..7a7c24b4dd 100644 +--- a/src/generic/bmpsvg.cpp ++++ b/src/generic/bmpsvg.cpp +@@ -26,7 +26,7 @@ + // your source tree doesn't contain 3rdparty/nanosvg and you should initialize + // and update the corresponding submodule. + #ifdef __has_include +- #if ! __has_include("../../3rdparty/nanosvg/src/nanosvg.h") ++ #if 0 + #error You need to run "git submodule update --init 3rdparty/nanosvg". + #undef wxHAS_SVG + #endif +@@ -60,8 +60,8 @@ + #define NANOSVG_IMPLEMENTATION + #define NANOSVGRAST_IMPLEMENTATION + #define NANOSVG_ALL_COLOR_KEYWORDS +-#include "../../3rdparty/nanosvg/src/nanosvg.h" +-#include "../../3rdparty/nanosvg/src/nanosvgrast.h" ++#include ++#include + + #ifdef __VISUALC__ + #pragma warning(pop) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 12aa21a1716a03..583bfbb5a9f085 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -1,16 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets - REF 9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1 #v3.1.5 - SHA512 33817f766b36d24e5e6f4eb7666f2e4c1ec305063cb26190001e0fc82ce73decc18697e8005da990a1c99dc1ccdac9b45bb2bbe5ba73e6e2aa860c768583314c + REF 35a6d7b15fedfdb5198bb6c28b31cda33b2c2a76 #v3.1.6-final + SHA512 f42b97a695e037130da9935e3abf117c0720325f194fcdabace95fa16a5ca06d49e35db9616bb0ef16600044397739459551a6276f3c239bd4fc160ecb6cdc16 HEAD_REF master PATCHES install-layout.patch - mingw-output-name.patch - fix-build.patch - fix-linux-configure.patch # Remove this patch in the next update - fix-libs-export.patch relocatable-wx-config.patch + nanosvg-ext-depend.patch + fix-libs-export.patch ) if(VCPKG_TARGET_IS_LINUX) @@ -31,6 +29,12 @@ These development packages can be installed on Ubuntu systems via endforeach() endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sound wxUSE_SOUND +) + set(OPTIONS "") if(VCPKG_TARGET_IS_OSX) list(APPEND OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) @@ -75,7 +79,8 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DwxUSE_REGEX=builtin + ${FEATURE_OPTIONS} + -DwxUSE_REGEX=sys -DwxUSE_ZLIB=sys -DwxUSE_EXPAT=sys -DwxUSE_LIBJPEG=sys diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 634fa57f187429..3c4398508636df 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wxwidgets", - "version-semver": "3.1.5", - "port-version": 11, + "version": "3.1.6", "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", @@ -19,6 +18,8 @@ "expat", "libjpeg-turbo", "libpng", + "nanosvg", + "pcre2", "tiff", { "name": "vcpkg-cmake", @@ -30,9 +31,22 @@ }, "zlib" ], + "default-features": [ + "sound" + ], "features": { "example": { "description": "Example source code and CMake project" + }, + "sound": { + "description": "Build wxSound support", + "dependencies": [ + { + "name": "sdl2", + "default-features": false, + "platform": "!windows & !osx" + } + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 574ac819265af8..fe3303feade32c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4776,6 +4776,10 @@ "baseline": "2019-08-20", "port-version": 2 }, + "nanosvg": { + "baseline": "2022-04-29", + "port-version": 0 + }, "nanovg": { "baseline": "2019-08-30", "port-version": 5 @@ -7533,8 +7537,8 @@ "port-version": 0 }, "wxwidgets": { - "baseline": "3.1.5", - "port-version": 11 + "baseline": "3.1.6", + "port-version": 0 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/n-/nanosvg.json b/versions/n-/nanosvg.json new file mode 100644 index 00000000000000..9a303837479fce --- /dev/null +++ b/versions/n-/nanosvg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "827223ed18553b608489e328101549261d0c9d5a", + "version-date": "2022-04-29", + "port-version": 0 + } + ] +} diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 2994bc67a749aa..ea2a00e9bcb64f 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16d9f0aabf4f0df68bebd7b42ff6005d952f9392", + "version": "3.1.6", + "port-version": 0 + }, { "git-tree": "3f891e383d71c7665ba49dcc254d8b2094c00c2b", "version-semver": "3.1.5", From f7866c66d2a4717824cde89786692648c07be01f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 7 May 2022 00:12:11 +0200 Subject: [PATCH 192/383] [vcpkg-cmake|cmake buildsystem] synchronize and sanitize scripts. (#23259) * synchronize cmake build scripts. * version stuff * fix REMOVE_ITEM and add license * format manifest * update version * use LOGFILE_BASE * version update * readd PREFER_NINJA and print a warning that it is deprecated for vcpkg_cmake_configure * version stuff * sync build_cmake * only turn off ninja on windows * add Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE * use z_vcpkg_select_default_vcpkg_chainload_toolchain in meson * remove VCPKG_CMAKE_GENERATOR * version stuff * reduce error to warning * remove VCPKG_CMAKE_GENERATOR form configure_cmake * version stuff * version stuff * use build_dir_ * version stuff * use ninja variable insead of pure ninja cmd * version bump * use ninja variable instead of calling ninja directly * acquire ninja * move the acquire. * remove setting of cmake_prefix_path * version stuff * bump version date * version stuff * bump ashes baseline * remove VCPKG_CMAKE_GENERATOR reference * fix wrong variable reference due to refactor * version stuff Co-authored-by: Alexander Neumann Co-authored-by: Billy Robert O'Neal --- ports/ashes/portfile.cmake | 1 - ports/ashes/vcpkg.json | 1 + ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_build.cmake | 85 ++++++----- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 141 ++++++++---------- scripts/cmake/vcpkg_build_cmake.cmake | 7 + scripts/cmake/vcpkg_configure_cmake.cmake | 38 +++-- versions/a-/ashes.json | 5 + versions/baseline.json | 4 +- versions/v-/vcpkg-cmake.json | 5 + 10 files changed, 152 insertions(+), 137 deletions(-) diff --git a/ports/ashes/portfile.cmake b/ports/ashes/portfile.cmake index 438c62bc916c7d..7e16bebac22b0e 100644 --- a/ports/ashes/portfile.cmake +++ b/ports/ashes/portfile.cmake @@ -22,7 +22,6 @@ file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DCMAKE_INSTALL_PREFIX=${CURRENT_INSTALLED_DIR} -DVCPKG_PACKAGE_BUILD=ON -DASHES_BUILD_TEMPLATES=OFF -DASHES_BUILD_TESTS=OFF diff --git a/ports/ashes/vcpkg.json b/ports/ashes/vcpkg.json index 0cee851d91bf88..cb4e0f250a1c0b 100644 --- a/ports/ashes/vcpkg.json +++ b/ports/ashes/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ashes", "version-date": "2022-04-03", + "port-version": 1, "description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.", "homepage": "https://github.com/DragonJoker/Ashes", "license": "MIT", diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index db0c74d719c46a..c888fc8729a5a6 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-04-21", + "version-date": "2022-05-05", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake index 5520f0de318e3c..bb66a7800c5b1a 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake @@ -47,77 +47,82 @@ function(vcpkg_cmake_build) if(NOT DEFINED arg_LOGFILE_BASE) set(arg_LOGFILE_BASE "build") endif() - - set(build_args "") - set(target_args "") - set(parallel_args "") - set(no_parallel_args "") - - if(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Ninja") - set(build_args "-v") # verbose output - set(parallel_args "-j${VCPKG_CONCURRENCY}") - set(no_parallel_args "-j1") - elseif(Z_VCPKG_CMAKE_GENERATOR MATCHES "^Visual Studio") - set(build_args + vcpkg_list(SET build_param) + vcpkg_list(SET parallel_param) + vcpkg_list(SET no_parallel_param) + + if("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "Ninja") + vcpkg_list(SET build_param "-v") # verbose output + vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param "-j1") + elseif("${Z_VCPKG_CMAKE_GENERATOR}" MATCHES "^Visual Studio") + vcpkg_list(SET build_param "/p:VCPkgLocalAppDataDisabled=true" "/p:UseIntelMKL=No" ) - set(parallel_args "/m") - elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "NMake Makefiles") + vcpkg_list(SET parallel_param "/m") + elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") # No options are currently added for nmake builds elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") - set(build_args "VERBOSE=1") - set(parallel_args "-j${VCPKG_CONCURRENCY}") - set(no_parallel_args "") + vcpkg_list(SET build_args "VERBOSE=1") + vcpkg_list(SET parallel_args "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args "") elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") - list(APPEND parallel_args -jobs "${VCPKG_CONCURRENCY}") - list(APPEND no_parallel_args -jobs 1) + vcpkg_list(SET parallel_args -jobs "${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args -jobs 1) else() message(WARNING "Unrecognized GENERATOR setting from vcpkg_cmake_configure().") endif() - if(DEFINED arg_TARGET) - set(target_args "--target" "${arg_TARGET}") + vcpkg_list(SET target_param) + if(arg_TARGET) + vcpkg_list(SET target_param "--target" "${arg_TARGET}") endif() - foreach(buildtype IN ITEMS debug release) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL buildtype) - if(buildtype STREQUAL "debug") - set(short_buildtype "dbg") - set(cmake_config "Debug") + foreach(build_type IN ITEMS debug release) + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "${build_type}") + if("${build_type}" STREQUAL "debug") + set(short_build_type "dbg") + set(config "Debug") else() - set(short_buildtype "rel") - set(cmake_config "Release") + set(short_build_type "rel") + set(config "Release") endif() - message(STATUS "Building ${TARGET_TRIPLET}-${short_buildtype}") + message(STATUS "Building ${TARGET_TRIPLET}-${short_build_type}") if(arg_ADD_BIN_TO_PATH) - set(env_path_backup "$ENV{PATH}") - if(buildtype STREQUAL "debug") + vcpkg_backup_env_variables(VARS PATH) + if("${build_type}" STREQUAL "debug") vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") else() vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") endif() endif() - if (arg_DISABLE_PARALLEL) + if(arg_DISABLE_PARALLEL) vcpkg_execute_build_process( - COMMAND "${CMAKE_COMMAND}" --build . --config "${cmake_config}" ${target_args} -- ${build_args} ${no_parallel_args} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_buildtype}" - LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_buildtype}" + COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${no_parallel_param} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" + LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_build_type}" ) else() vcpkg_execute_build_process( - COMMAND "${CMAKE_COMMAND}" --build . --config "${cmake_config}" ${target_args} -- ${build_args} ${parallel_args} - NO_PARALLEL_COMMAND "${CMAKE_COMMAND}" --build . --config "${cmake_config}" ${target_args} -- ${build_args} ${no_parallel_args} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_buildtype}" - LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_buildtype}" + COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${parallel_param} + NO_PARALLEL_COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${no_parallel_param} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" + LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_build_type}" ) endif() if(arg_ADD_BIN_TO_PATH) - set(ENV{PATH} "${env_path_backup}") + vcpkg_restore_env_variables(VARS PATH) endif() endif() endforeach() diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 02d3fb095c6ee6..fcb6f6f15a5fc4 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -109,12 +109,16 @@ function(vcpkg_cmake_configure) ) if(NOT arg_Z_CMAKE_GET_VARS_USAGE AND DEFINED CACHE{Z_VCPKG_CMAKE_GENERATOR}) - message(WARNING "vcpkg_cmake_configure already called; this function should only be called once.") + message(WARNING "${CMAKE_CURRENT_FUNCTION} already called; this function should only be called once.") + endif() + if(arg_PREFER_NINJA) + message(WARNING "PREFER_NINJA has been deprecated in ${CMAKE_CURRENT_FUNCTION}. Please remove it from the portfile!") endif() if(DEFINED arg_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "vcpkg_cmake_buildsystem_build was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() + if(NOT DEFINED arg_SOURCE_PATH) message(FATAL_ERROR "SOURCE_PATH must be set") endif() @@ -130,12 +134,14 @@ function(vcpkg_cmake_configure) set(configuring_message "Configuring ${TARGET_TRIPLET}") foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) - if(option MATCHES "^-D([^:=]*)[:=]") - list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") + if("${option}" MATCHES "^-D([^:=]*)[:=]") + vcpkg_list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") endif() endforeach() - list(REMOVE_DUPLICATES manually_specified_variables) - list(REMOVE_ITEM manually_specified_variables ${arg_MAYBE_UNUSED_VARIABLES}) + vcpkg_list(REMOVE_DUPLICATES manually_specified_variables) + foreach(maybe_unused_var IN LISTS arg_MAYBE_UNUSED_VARIABLES) + vcpkg_list(REMOVE_ITEM manually_specified_variables "${maybe_unused_var}") + endforeach() debug_message("manually specified variables: ${manually_specified_variables}") endif() @@ -178,7 +184,7 @@ function(vcpkg_cmake_configure) vcpkg_find_acquire_program(NINJA) get_filename_component(ninja_path "${NINJA}" DIRECTORY) vcpkg_add_to_path("${ninja_path}") - list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") endif() set(build_dir_release "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") @@ -192,7 +198,7 @@ function(vcpkg_cmake_configure) endif() if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) - list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") if(VCPKG_TARGET_IS_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) elseif(VCPKG_TARGET_IS_ANDROID AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) @@ -201,13 +207,13 @@ function(vcpkg_cmake_configure) endif() if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) - list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=ON") + vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=ON") elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=OFF") + vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=OFF") else() message(FATAL_ERROR "Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\". " @@ -227,9 +233,8 @@ function(vcpkg_cmake_configure) z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() - list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecture_string) - list(APPEND arg_OPTIONS + vcpkg_list(APPEND arg_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}" @@ -260,34 +265,45 @@ function(vcpkg_cmake_configure) "-DVCPKG_MANIFEST_INSTALL=OFF" ) - if(DEFINED arch) - list(APPEND arg_OPTIONS "-A${arch}") + if(DEFINED arch AND NOT arch STREQUAL "") + vcpkg_list(APPEND arg_OPTIONS "-A${arch}") endif() # Sets configuration variables for macOS builds foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) if(DEFINED VCPKG_${config_var}) - list(JOIN VCPKG_${config_var} "\;" config_var_value) - list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}") endif() endforeach() # Allow overrides / additional configuration variables from triplets if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS) - list(APPEND arg_OPTIONS "${VCPKG_CMAKE_CONFIGURE_OPTIONS}") + vcpkg_list(APPEND arg_OPTIONS "${VCPKG_CMAKE_CONFIGURE_OPTIONS}") endif() if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE) - list(APPEND arg_OPTIONS_RELEASE "${VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE "${VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE}") endif() if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG) - list(APPEND arg_OPTIONS_DEBUG "${VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_DEBUG "${VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG}") endif() + vcpkg_list(SET rel_command + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" + -G "${generator}" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" + ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) + vcpkg_list(SET dbg_command + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" + -G "${generator}" + "-DCMAKE_BUILD_TYPE=Debug" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" + ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) + if(ninja_host AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) - list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") vcpkg_find_acquire_program(NINJA) - if(NOT DEFINED ninja_path) # if ninja_path was defined above, we've already done this get_filename_component(ninja_path "${NINJA}" DIRECTORY) @@ -295,92 +311,53 @@ function(vcpkg_cmake_configure) endif() #parallelize the configure step - set(parallel_configure_contents - "rule CreateProcess\n command = $process\n\n" + set(ninja_configure_contents + "rule CreateProcess\n command = \$process\n\n" ) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(line "build ../CMakeCache.txt: CreateProcess\n ") - string(APPEND line "process = \"${CMAKE_COMMAND}\" -E chdir \"${build_dir_release}\" ") - string(APPEND line "\"${CMAKE_COMMAND}\" -S \"${arg_SOURCE_PATH}\" ") - - if(DEFINED arg_OPTIONS AND NOT arg_OPTIONS STREQUAL "") - list(JOIN arg_OPTIONS "\" \"" options) - string(APPEND line "\"${options}\" ") - endif() - if(DEFINED arg_OPTIONS_RELEASE AND NOT arg_OPTIONS_RELEASE STREQUAL "") - list(JOIN arg_OPTIONS_RELEASE "\" \"" options_rel) - string(APPEND line "\"${options_rel}\" ") - endif() - string(APPEND line "-G \"${generator}\" ") - string(APPEND line "\"-DCMAKE_BUILD_TYPE=Release\" ") - string(APPEND line "\"-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}\"") - string(APPEND parallel_configure_contents "${line}\n\n") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") + z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents ".." "rel") endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(line "build ../../${TARGET_TRIPLET}-dbg/CMakeCache.txt: CreateProcess\n ") - string(APPEND line "process = \"${CMAKE_COMMAND}\" -E chdir \"${build_dir_debug}\" ") - string(APPEND line "\"${CMAKE_COMMAND}\" -S \"${arg_SOURCE_PATH}\" ") - - if(DEFINED arg_OPTIONS AND NOT arg_OPTIONS STREQUAL "") - list(JOIN arg_OPTIONS "\" \"" options) - string(APPEND line "\"${options}\" ") - endif() - if(DEFINED arg_OPTIONS_DEBUG AND NOT arg_OPTIONS_DEBUG STREQUAL "") - list(JOIN arg_OPTIONS_DEBUG "\" \"" options_dbg) - string(APPEND line "\"${options_dbg}\" ") - endif() - string(APPEND line "-G \"${generator}\" ") - string(APPEND line "\"-DCMAKE_BUILD_TYPE=Debug\" ") - string(APPEND line "\"-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug\"") - string(APPEND parallel_configure_contents "${line}\n\n") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") + z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents "../../${TARGET_TRIPLET}-dbg" "dbg") endif() file(MAKE_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure") - file(WRITE "${build_dir_release}/vcpkg-parallel-configure/build.ninja" "${parallel_configure_contents}") + file(WRITE + "${build_dir_release}/vcpkg-parallel-configure/build.ninja" + "${ninja_configure_contents}") message(STATUS "${configuring_message}") vcpkg_execute_required_process( - COMMAND ninja -v + COMMAND "${NINJA}" -v WORKING_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure" LOGNAME "${arg_LOGFILE_BASE}" ) - list(APPEND config_logs + + vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-err.log") else() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") message(STATUS "${configuring_message}-dbg") vcpkg_execute_required_process( - COMMAND - "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" - ${arg_OPTIONS} - ${arg_OPTIONS_DEBUG} - -G "${generator}" - "-DCMAKE_BUILD_TYPE=Debug" - "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" + COMMAND ${dbg_command} WORKING_DIRECTORY "${build_dir_debug}" LOGNAME "${arg_LOGFILE_BASE}-dbg" ) - list(APPEND config_logs + vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-err.log") endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") message(STATUS "${configuring_message}-rel") vcpkg_execute_required_process( - COMMAND - "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" - ${arg_OPTIONS} - ${arg_OPTIONS_RELEASE} - -G "${generator}" - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" + COMMAND ${rel_command} WORKING_DIRECTORY "${build_dir_release}" LOGNAME "${arg_LOGFILE_BASE}-rel" ) - list(APPEND config_logs + vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-err.log") endif() @@ -402,7 +379,7 @@ function(vcpkg_cmake_configure) foreach(unused_variable IN LISTS unused_variables) if(unused_variable IN_LIST manually_specified_variables) debug_message("manually specified unused variable: ${unused_variable}") - list(APPEND all_unused_variables "${unused_variable}") + vcpkg_list(APPEND all_unused_variables "${unused_variable}") else() debug_message("unused variable (not manually specified): ${unused_variable}") endif() @@ -410,8 +387,8 @@ function(vcpkg_cmake_configure) endforeach() if(DEFINED all_unused_variables) - list(REMOVE_DUPLICATES all_unused_variables) - list(JOIN all_unused_variables "\n " all_unused_variables) + vcpkg_list(REMOVE_DUPLICATES all_unused_variables) + vcpkg_list(JOIN all_unused_variables "\n " all_unused_variables) message(WARNING "The following variables are not used in CMakeLists.txt: ${all_unused_variables} Please recheck them and remove the unnecessary options from the `vcpkg_cmake_configure` call. diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake index b3015ae29e8865..cd8952f5df395e 100644 --- a/scripts/cmake/vcpkg_build_cmake.cmake +++ b/scripts/cmake/vcpkg_build_cmake.cmake @@ -64,6 +64,13 @@ function(vcpkg_build_cmake) vcpkg_list(SET parallel_param "/m") elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") # No options are currently added for nmake builds + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") + vcpkg_list(SET build_args "VERBOSE=1") + vcpkg_list(SET parallel_args "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args "") + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") + vcpkg_list(SET parallel_args -jobs "${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args -jobs 1) else() message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles") endif() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index e0d751d99d6854..69e2abf9e5e6d9 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -240,8 +240,8 @@ function(vcpkg_configure_cmake) # If we use Ninja, make sure it's on PATH if("${generator}" STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) vcpkg_find_acquire_program(NINJA) - get_filename_component(NINJA_PATH "${NINJA}" DIRECTORY) - vcpkg_add_to_path("${NINJA_PATH}") + get_filename_component(ninja_path "${NINJA}" DIRECTORY) + vcpkg_add_to_path("${ninja_path}") vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") endif() @@ -328,23 +328,39 @@ function(vcpkg_configure_cmake) endif() endforeach() + # Allow overrides / additional configuration variables from triplets + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS) + vcpkg_list(APPEND arg_OPTIONS "${VCPKG_CMAKE_CONFIGURE_OPTIONS}") + endif() + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE "${VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE}") + endif() + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG "${VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG}") + endif() + vcpkg_list(SET rel_command - "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" ${arg_OPTIONS} ${arg_OPTIONS_RELEASE} + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" -G "${generator}" - -DCMAKE_BUILD_TYPE=Release - "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}") + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" + ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) vcpkg_list(SET dbg_command - "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" ${arg_OPTIONS} ${arg_OPTIONS_DEBUG} + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" -G "${generator}" - -DCMAKE_BUILD_TYPE=Debug - "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug") + "-DCMAKE_BUILD_TYPE=Debug" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" + ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) if(ninja_host AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") vcpkg_find_acquire_program(NINJA) - get_filename_component(NINJA_PATH "${NINJA}" DIRECTORY) - vcpkg_add_to_path("${NINJA_PATH}") + if(NOT DEFINED ninja_path) + # if ninja_path was defined above, we've already done this + get_filename_component(ninja_path "${NINJA}" DIRECTORY) + vcpkg_add_to_path("${ninja_path}") + endif() #parallelize the configure step set(ninja_configure_contents @@ -365,7 +381,7 @@ function(vcpkg_configure_cmake) message(STATUS "${configuring_message}") vcpkg_execute_required_process( - COMMAND ninja -v + COMMAND "${NINJA}" -v WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure" LOGNAME "${arg_LOGNAME}" ) diff --git a/versions/a-/ashes.json b/versions/a-/ashes.json index 62c56ba6454729..2bc400a20e67a9 100644 --- a/versions/a-/ashes.json +++ b/versions/a-/ashes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96b165dc0ea6c62aeabea274f6833c55feaccdd1", + "version-date": "2022-04-03", + "port-version": 1 + }, { "git-tree": "365d042da082df035fb7dba0a53e1a4ac306f469", "version-date": "2022-04-03", diff --git a/versions/baseline.json b/versions/baseline.json index fe3303feade32c..cd323c1e1caa4e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -174,7 +174,7 @@ }, "ashes": { "baseline": "2022-04-03", - "port-version": 0 + "port-version": 1 }, "asio": { "baseline": "1.22.1", @@ -7317,7 +7317,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-21", + "baseline": "2022-05-05", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 6643af5d0fffd9..bb8b094fabf7c5 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecfb2282f599a9c1f3a9ad98eac9d2b35690850f", + "version-date": "2022-05-05", + "port-version": 0 + }, { "git-tree": "8273918a04a5822ad7cc21ea5249402f2e999a7a", "version-date": "2022-04-21", From 5776846578e9eae5d147b14c295dc3005c666a77 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 7 May 2022 07:29:05 +0800 Subject: [PATCH 193/383] [ixwebsocket] Fix target ZLIB::ZLIB not found (#24078) * [ixwebsocket] Fix unable link target ZLIB::ZLIB * update version to 11.4.2 * remove incorrect records in json file Co-authored-by: Cheney-Wang --- ports/ixwebsocket/portfile.cmake | 17 ++++++++++------- ports/ixwebsocket/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/ixwebsocket.json | 5 +++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/ixwebsocket/portfile.cmake b/ports/ixwebsocket/portfile.cmake index 3287accd2fc4c0..83ebf1bd1e032d 100644 --- a/ports/ixwebsocket/portfile.cmake +++ b/ports/ixwebsocket/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO machinezone/IXWebSocket - REF f7eb3688ddcb7d555df91e97ce8804421378e3b4 #v11.3.3 - SHA512 78eddce7d3f817632b2f48b7f7c8e767fe1995d6a91d9156b0683fafd89c00e898b09fdcaa40559df333fc63c9160fe03b2770e5e9afcfcf489e89871e12fb1c + REF 2f560ff4c07e5446f2539505cb4f64f80b54ca8e #v11.4.2 + SHA512 afa19cc161b9e49eafacc113583bbf68a34d83a9535c5c4f1f1cd57f943a5ad91c3117c0e2b47b2975a65f0284aec1200f6f8f5768afa7d6aebcbb823934036a ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -19,16 +19,19 @@ if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} - -DUSE_TLS=1 + ${FEATURE_OPTIONS} + -DUSE_TLS=1 + MAYBE_UNUSED_VARIABLES + USE_SECURE_TRANSPORT ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ixwebsocket) +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ixwebsocket/vcpkg.json b/ports/ixwebsocket/vcpkg.json index d09b3d9a6a5af7..870cf5ddff9076 100644 --- a/ports/ixwebsocket/vcpkg.json +++ b/ports/ixwebsocket/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ixwebsocket", - "version-semver": "11.3.3", + "version-semver": "11.4.2", "description": "Lightweight WebSocket Client and Server + HTTP Client and Server", "homepage": "https://github.com/machinezone/IXWebSocket", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index cd323c1e1caa4e..87644ad073563f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3005,7 +3005,7 @@ "port-version": 8 }, "ixwebsocket": { - "baseline": "11.3.3", + "baseline": "11.4.2", "port-version": 0 }, "jack2": { diff --git a/versions/i-/ixwebsocket.json b/versions/i-/ixwebsocket.json index 7db4ef058a5afb..622ecc16151c36 100644 --- a/versions/i-/ixwebsocket.json +++ b/versions/i-/ixwebsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35c2086eecc92cd95482b875fd1ec843eb233f94", + "version-semver": "11.4.2", + "port-version": 0 + }, { "git-tree": "59a791c16bb7cf163c801d50013cafd8ae9b94a7", "version-semver": "11.3.3", From 465dfc5e0f272f0f81719a5ace3923deff456580 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 7 May 2022 01:30:21 +0200 Subject: [PATCH 194/383] [pdal] Update to 2.4.0 (#24355) * Update to 2.4.0 * Update versions * Use check, not patch, for C++17 filesystem support * Update versions * Update license * De-vendor nanoflann and nlohmann-json * Update versions * Fix nlohmann de-vendoring * Update versions --- ports/pdal/0002-no-source-dir-writes.patch | 21 ------ ports/pdal/0003-fix-copy-vendor.patch | 20 ------ ports/pdal/cmake-project-include.cmake | 6 ++ ports/pdal/fix-dependency.patch | 8 +-- ports/pdal/fix-find-library-suffix.patch | 19 ++---- ports/pdal/portfile.cmake | 74 +++++++++++++++++----- ports/pdal/use-vcpkg-boost.patch | 66 ------------------- ports/pdal/vcpkg.json | 12 ++-- versions/baseline.json | 2 +- versions/p-/pdal.json | 5 ++ 10 files changed, 86 insertions(+), 147 deletions(-) delete mode 100644 ports/pdal/0002-no-source-dir-writes.patch delete mode 100644 ports/pdal/0003-fix-copy-vendor.patch create mode 100644 ports/pdal/cmake-project-include.cmake delete mode 100644 ports/pdal/use-vcpkg-boost.patch diff --git a/ports/pdal/0002-no-source-dir-writes.patch b/ports/pdal/0002-no-source-dir-writes.patch deleted file mode 100644 index f739cdf7dc794f..00000000000000 --- a/ports/pdal/0002-no-source-dir-writes.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc146d1..9b82544 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -140,7 +140,7 @@ get_git_head_revision(GIT_REFSPEC GIT_SHA1) - - configure_file( - "${PROJECT_SOURCE_DIR}/gitsha.cpp.in" -- "${PROJECT_SOURCE_DIR}/pdal/gitsha.cpp") -+ "${PROJECT_BINARY_DIR}/pdal/gitsha.cpp") - - # needs to come before configuration of pdal_features - if(APPLE) -@@ -201,6 +201,7 @@ file(GLOB BASE_SRCS - ${PDAL_IO_DIR}/*.cpp - ${PDAL_KERNELS_DIR}/*.cpp - ${PDAL_SRC_DIR}/*.cpp -+ ${PROJECT_BINARY_DIR}/pdal/gitsha.cpp - ${PDAL_SRC_DIR}/compression/*.cpp) - file(GLOB_RECURSE PRIVATE_SRCS - ${PDAL_FILTERS_DIR}/private/*.cpp diff --git a/ports/pdal/0003-fix-copy-vendor.patch b/ports/pdal/0003-fix-copy-vendor.patch deleted file mode 100644 index 092c4651fcf7e6..00000000000000 --- a/ports/pdal/0003-fix-copy-vendor.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e918a3e..a3f9a03 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -375,6 +375,15 @@ install(DIRECTORY ${PDAL_FILTERS_DIR} - install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp} - DESTINATION include/pdal - ) -+# Instaqll vendor headers -+install(DIRECTORY -+ ${PDAL_VENDOR_DIR}/arbiter -+ ${PDAL_VENDOR_DIR}/kazhdan -+ ${PDAL_VENDOR_DIR}/nanoflann -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.hpp" PATTERN PATTERN "*.h" -+ PATTERN "private" EXCLUDE -+) - - # - # CPACK diff --git a/ports/pdal/cmake-project-include.cmake b/ports/pdal/cmake-project-include.cmake new file mode 100644 index 00000000000000..37fd8c2bd976bd --- /dev/null +++ b/ports/pdal/cmake-project-include.cmake @@ -0,0 +1,6 @@ +include(CheckIncludeFileCXX) + +check_include_file_cxx("filesystem" HAVE_CXX17_FILESYSTEM) +if(NOT HAVE_CXX17_FILESYSTEM) + message(FATAL_ERROR "Unable to find header. PDAL requires full C++17 compiler support.") +endif() diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index 8e794946436c81..1c29b56898fdba 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -6,22 +6,22 @@ index 42cca1e..43b0ced 100644 target_link_libraries(${PDAL_BASE_LIB_NAME} PRIVATE ${CMAKE_THREAD_LIBS_INIT} + ${CMAKE_DL_LIBS} - ${GDAL_LIBRARY} + ${GDAL_LIBRARIES} ${GEOTIFF_LIBRARY} - ${LASZIP_LIBRARY} ${LIBXML2_LIBRARIES} + ${ZLIB_LIBRARIES} diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake index bfaa5b2..e73ec9e 100644 --- a/cmake/zstd.cmake +++ b/cmake/zstd.cmake -@@ -4,7 +4,15 @@ +@@ -4,7 +4,14 @@ option(WITH_ZSTD "Build support for compression/decompression with Zstd." TRUE) if (WITH_ZSTD) - find_package(ZSTD QUIET) -+ find_package(zstd CONFIG REQUIRED) -+ set(ZSTD_FOUND TRUE) ++ find_package(ZSTD NAMES zstd REQUIRED) + set(ZSTD_INCLUDE_DIRS "") + if(TARGET zstd::libzstd_static) + set(ZSTD_LIBRARIES zstd::libzstd_static) diff --git a/ports/pdal/fix-find-library-suffix.patch b/ports/pdal/fix-find-library-suffix.patch index 53eefb68d12f6e..be3cd71eef6ca0 100644 --- a/ports/pdal/fix-find-library-suffix.patch +++ b/ports/pdal/fix-find-library-suffix.patch @@ -1,16 +1,11 @@ diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake -index dae98ea..edab055 100644 +index 665bc53..fcdcf2c 100644 --- a/cmake/libraries.cmake +++ b/cmake/libraries.cmake -@@ -3,11 +3,7 @@ - option(PDAL_BUILD_STATIC "Build PDAL as a static library" OFF) - if (PDAL_BUILD_STATIC) - set(PDAL_LIB_TYPE "STATIC") -- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX}) - else () - set(PDAL_LIB_TYPE "SHARED") -- if (WIN32) +@@ -1,6 +1,3 @@ + # Build shared libraries by default. + + set(PDAL_LIB_TYPE "SHARED") +-if (WIN32) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX}) -- endif() - endif() - mark_as_advanced(PDAL_BUILD_STATIC) +-endif() diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index dda2aead16c1bb..1a297c56c5f552 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -3,37 +3,43 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PDAL/PDAL - REF 2.3.0 - SHA512 898ea54c8c8e0a9bb8aed8d7f542da5a44b02c8656273783366d711b5b3f50b547438aa1cb4d41b490d187dae7bef20fe3b6c64dcb87c06e6f4cb91a8f79ac59 + REF 2.4.0 + SHA512 fd1314058404a1d15e308cee5682dcf3f1c6277884f200069b293b929ddfcd1d0d29bc74353bb08b1d163d3e776c8b036ba62d7c8599470b755128dacfe2f032 HEAD_REF master PATCHES - 0002-no-source-dir-writes.patch - 0003-fix-copy-vendor.patch fix-dependency.patch - use-vcpkg-boost.patch fix-unix-compiler-options.patch fix-find-library-suffix.patch no-pkgconfig-requires.patch no-rpath.patch ) -file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") -file(REMOVE_RECURSE "${SOURCE_PATH}/vendor/pdalboost/boost" "${SOURCE_PATH}/vendor/pdalboost/libs") - # Prefer pristine CMake find modules + wrappers and config files from vcpkg. -foreach(package IN ITEMS Curl GeoTIFF ICONV PostgreSQL ZSTD) +foreach(package IN ITEMS Curl GeoTIFF ICONV ZSTD) file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake") endforeach() +# De-vendoring +file(REMOVE_RECURSE + "${SOURCE_PATH}/vendor/nanoflann" + "${SOURCE_PATH}/vendor/nlohmann" +) +file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nanoflann.hpp" DESTINATION "${SOURCE_PATH}/vendor/nanoflann") +file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nlohmann/json.hpp" DESTINATION "${SOURCE_PATH}/vendor/nlohmann/nlohmann") +file(APPEND "${SOURCE_PATH}/vendor/nlohmann/nlohmann/json.hpp" "namespace NL = nlohmann;\n") + unset(ENV{OSGEO4W_HOME}) +if("laszip" IN_LIST FEATURES) + message(WARNING "The 'laszip' feature is obsolete and will be removed in the future.") +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES draco BUILD_PLUGIN_DRACO e57 BUILD_PLUGIN_E57 hdf5 BUILD_PLUGIN_HDF i3s BUILD_PLUGIN_I3S - laszip WITH_LASZIP lzma WITH_LZMA pgpointcloud BUILD_PLUGIN_PGPOINTCLOUD zstd WITH_ZSTD @@ -45,17 +51,14 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DPDAL_PLUGIN_INSTALL_PATH=. "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" - -DPOSTGRESQL_LIBRARIES=PostgreSQL::PostgreSQL -DWITH_TESTS:BOOL=OFF -DWITH_COMPLETION:BOOL=OFF - -DWITH_LAZPERF:BOOL=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Libexecinfo:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libunwind:BOOL=ON ${FEATURE_OPTIONS} - MAYBE_UNUSED_VARIABLES - POSTGRESQL_LIBRARIES ) vcpkg_cmake_install() @@ -83,4 +86,45 @@ file(REMOVE_RECURSE ) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(READ "${SOURCE_PATH}/LICENSE.txt" pdal_license) +file(READ "${SOURCE_PATH}/vendor/arbiter/LICENSE" arbiter_license) +file(READ "${SOURCE_PATH}/vendor/kazhdan/PoissonRecon.h" kazhdan_license) +string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" kazhdan_license "${kazhdan_license}") +file(READ "${SOURCE_PATH}/vendor/lazperf/lazperf.hpp" lazperf_license) +string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" lazperf_license "${lazperf_license}") +file(READ "${SOURCE_PATH}/vendor/lazperf/detail/field_xyz.hpp" lazperf_detail_license) +string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" lazperf_detail_license "${lazperf_detail_license}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" +"${pdal_license} +--- + +Files in vendor/arbiter/: + +${arbiter_license} +--- + +Files in vendor/kazhdan/: + +${kazhdan_license} +--- + +Files in vendor/lazperf/: + +${lazperf_license} +--- + +Files in vendor/lazperf/detail/: + +${lazperf_detail_license} +--- + +Files in vendor/eigen: + +Most Eigen source code is subject to the terms of the Mozilla Public License +v. 2.0. You can obtain a copy the MPL 2.0 at http://mozilla.org/MPL/2.0/. + +Some files included in Eigen are under of the following licenses: + - Apache License, Version 2.0 + - BSD 3-Clause \"New\" or \"Revised\" License +") diff --git a/ports/pdal/use-vcpkg-boost.patch b/ports/pdal/use-vcpkg-boost.patch deleted file mode 100644 index d07bf6eea54ccc..00000000000000 --- a/ports/pdal/use-vcpkg-boost.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83a396b..7ebcc3b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -67,7 +67,8 @@ else() - endif() - set(PDAL_LIB_NAME pdalcpp) - set(PDAL_UTIL_LIB_NAME pdal_util) --set(PDAL_BOOST_LIB_NAME pdal_boost) -+find_package(Boost COMPONENTS filesystem system REQUIRED) -+set(PDAL_BOOST_LIB_NAME Boost::filesystem Boost::system) - set(PDAL_KAZHDAN_LIB_NAME pdal_kazhdan) - set(PDAL_TEST_SUPPORT_OBJS pdal_test_support) - -@@ -179,13 +180,11 @@ endif() - - add_subdirectory(plugins) - --#include_directories(vendor/pdalboost) - if (WITH_TESTS) - include (${PDAL_CMAKE_DIR}/gtest.cmake) - add_subdirectory(test) - endif() - add_subdirectory(dimbuilder) --add_subdirectory(vendor/pdalboost) - add_subdirectory(vendor/arbiter) - add_subdirectory(vendor/kazhdan) - add_subdirectory(pdal/util) -@@ -269,7 +268,6 @@ target_include_directories(${PDAL_BASE_LIB_NAME} - ${PROJECT_BINARY_DIR}/include - ${PDAL_VENDOR_DIR} - ${PDAL_VENDOR_DIR}/eigen -- ${PDAL_VENDOR_DIR}/pdalboost - ${LIBXML2_INCLUDE_DIR} - ${ZSTD_INCLUDE_DIRS} - ${NLOHMANN_INCLUDE_DIR} -diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt -index 6b3e889..8a42122 100644 ---- a/pdal/util/CMakeLists.txt -+++ b/pdal/util/CMakeLists.txt -@@ -40,8 +40,6 @@ target_link_libraries(${PDAL_UTIL_LIB_NAME} - ${CMAKE_DL_LIBS} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE -- ${PDAL_VENDOR_DIR}/pdalboost) - - set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES - VERSION "${PDAL_BUILD_VERSION}" -diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp -index ee47b55..4a57268 100644 ---- a/pdal/util/FileUtils.cpp -+++ b/pdal/util/FileUtils.cpp -@@ -98,6 +98,12 @@ inline std::string const& toNative(std::string const& in) { return in; } - - } // unnamed namespace - -+namespace pdalboost -+{ -+ namespace filesystem = boost::filesystem; -+ namespace system = boost::system; -+} -+ - namespace FileUtils - { - diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index b4f2a01dde978d..2dc6a4e36b441e 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,12 +1,11 @@ { "name": "pdal", - "version": "2.3.0", + "version": "2.4.0", "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", + "license": null, "supports": "!(windows & staticcrt)", "dependencies": [ - "boost-filesystem", - "boost-system", { "name": "curl", "default-features": false @@ -17,6 +16,7 @@ }, "libgeotiff", "libxml2", + "nanoflann", { "name": "vcpkg-cmake", "host": true @@ -27,7 +27,6 @@ } ], "default-features": [ - "laszip", "supported-plugins" ], "features": { @@ -59,10 +58,7 @@ ] }, "laszip": { - "description": "LASzip support", - "dependencies": [ - "laszip" - ] + "description": "Obsolete. PDAL includes LAZperf." }, "liblzma": { "description": "Support for compression/decompression with LZMA", diff --git a/versions/baseline.json b/versions/baseline.json index 87644ad073563f..3242c26135bde5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5349,7 +5349,7 @@ "port-version": 0 }, "pdal": { - "baseline": "2.3.0", + "baseline": "2.4.0", "port-version": 0 }, "pdal-c": { diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index d9f41bdfc13457..8e3fa6214ff164 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "674fea8cc4044272fef94a061252c4aeb4e6373c", + "version": "2.4.0", + "port-version": 0 + }, { "git-tree": "408d14a540c0a1e217efec2deea453594d9d1bde", "version": "2.3.0", From bd77d65ebf5574b8e4d097833e11bfd131044aed Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 7 May 2022 07:41:36 +0800 Subject: [PATCH 195/383] [daw-json-link] update to v2.14.0 (#24550) * [daw-json-link] update to v2.14.0 * UPDATE VERSION * Add license * update version --- ports/daw-header-libraries/portfile.cmake | 4 ++-- ports/daw-header-libraries/vcpkg.json | 3 ++- ports/daw-json-link/portfile.cmake | 4 ++-- ports/daw-json-link/vcpkg.json | 3 ++- ports/daw-utf-range/portfile.cmake | 4 ++-- ports/daw-utf-range/vcpkg.json | 3 ++- versions/baseline.json | 6 +++--- versions/d-/daw-header-libraries.json | 5 +++++ versions/d-/daw-json-link.json | 5 +++++ versions/d-/daw-utf-range.json | 5 +++++ 10 files changed, 30 insertions(+), 12 deletions(-) diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index 5bd908cebe8a01..da89659fb64598 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries - REF bd372e81e04e256a6ba88217c4b99a3601fb5ef7 #v1.29.7 - SHA512 7aad017e70e79c3244011cbcb719afb385a639e1e4d37955be074bd1d2f501052dcae9347d094a8ef970f3762ebdfe33c90318b2e6891f4b354e823acfee7188 + REF 7115af99360fec13278b54662fd07f43675a78ae #v2.46.0 + SHA512 0a760e6adb4e10ecc8f14cf83f2fd8f85ec554647b9f4eb6c35b84aa068ed4bba71fdd02bffef78e889c07f5a8589f10fbc6c71e5fe8f5d05ef8fc6e4511b5d0 HEAD_REF master ) diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json index d203e9597fb968..3c0a1bf69b71fd 100644 --- a/ports/daw-header-libraries/vcpkg.json +++ b/ports/daw-header-libraries/vcpkg.json @@ -1,8 +1,9 @@ { "name": "daw-header-libraries", - "version-semver": "1.29.7", + "version": "2.46.0", "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", "homepage": "https://github.com/beached/header_libraries", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake index c9f417ef89ada4..e9a330ebf4b675 100644 --- a/ports/daw-json-link/portfile.cmake +++ b/ports/daw-json-link/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/daw_json_link - REF 828565f48bd077e776fcef322457186d8f01e7eb #v2.10.2 - SHA512 8c870d778c9abb295d323ae913d9e2bb0255f176c7e4f1d8cdf424af9bbe4c5eb650436065bb47e3e8745ff1c12234959526c8dcdf2c169ab55af4b150e6b477 + REF b90116a13ca3e2ce37e6890b309d1fd2c1979ae3 #v2.14.0 + SHA512 d185e0849592d5a871d453a8a27a265c51d5aafb6284b03c64400a9e316afa3f502bd9a1983aed5cfd58509a212e2eb1293887dd672523e71c89c2ec089235ce HEAD_REF master ) diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json index c9470ecc86eecc..e00baf48d57098 100644 --- a/ports/daw-json-link/vcpkg.json +++ b/ports/daw-json-link/vcpkg.json @@ -1,8 +1,9 @@ { "name": "daw-json-link", - "version-semver": "2.10.2", + "version": "2.14.0", "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", "homepage": "https://github.com/beached/daw_json_link", + "license": "BSL-1.0", "dependencies": [ "daw-utf-range", { diff --git a/ports/daw-utf-range/portfile.cmake b/ports/daw-utf-range/portfile.cmake index cabdf720be05c4..ba75d4facb5de4 100644 --- a/ports/daw-utf-range/portfile.cmake +++ b/ports/daw-utf-range/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/utf_range - REF cd45b91a1530a68ce019b876a32b1694b4031613 #v2.2.0 - SHA512 21943b488b4efb8696bfe95f80c8043beed8f5f3cc9a34cfb95d34186d6a0ac2354943ebfd767bd6df42837c29e3c467a107d2f8556a7f719833d43f566afa40 + REF 105862ffe283e96ae514d4a6ec98d6ea16b25827 #v2.2.2 + SHA512 49772c7450ec432925b44ecddaee594ecec01afa4cc49db88e798347d6e5df51b7acf2bea7e11951b7de42a0a4d5a6c9046d5cb101a65e7da68b7d7242ad5b1c HEAD_REF master ) diff --git a/ports/daw-utf-range/vcpkg.json b/ports/daw-utf-range/vcpkg.json index 60581e13dc3942..5a2708850799e4 100644 --- a/ports/daw-utf-range/vcpkg.json +++ b/ports/daw-utf-range/vcpkg.json @@ -1,8 +1,9 @@ { "name": "daw-utf-range", - "version-semver": "2.2.0", + "version": "2.2.2", "description": "Header-only utf8 string range used by daw-json-link. Includes a constexpr/noexcept modified version of utfcpp.", "homepage": "https://github.com/beached/header_libraries", + "license": "BSL-1.0", "dependencies": [ "daw-header-libraries", { diff --git a/versions/baseline.json b/versions/baseline.json index 3242c26135bde5..a8d2487d288a69 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1801,15 +1801,15 @@ "port-version": 0 }, "daw-header-libraries": { - "baseline": "1.29.7", + "baseline": "2.46.0", "port-version": 0 }, "daw-json-link": { - "baseline": "2.10.2", + "baseline": "2.14.0", "port-version": 0 }, "daw-utf-range": { - "baseline": "2.2.0", + "baseline": "2.2.2", "port-version": 0 }, "dbg-macro": { diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index 14d5e66afe73e3..3cac9f38e59e14 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a57c2a8a8ba7fb8017df838e23547eb1933e26b9", + "version": "2.46.0", + "port-version": 0 + }, { "git-tree": "29ed87ad6aee595ac4a0972c09a1ddf34d13a857", "version-semver": "1.29.7", diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index fdf392f941a0f0..5cfb663126b2c0 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9020ee8ee80ac4543a61adb46a83b6b49f6562d4", + "version": "2.14.0", + "port-version": 0 + }, { "git-tree": "1c7cf1d126f7f7c1bb3759ff5bcf30c585b90d94", "version-semver": "2.10.2", diff --git a/versions/d-/daw-utf-range.json b/versions/d-/daw-utf-range.json index afebad6ee3380e..d91448a9efd87c 100644 --- a/versions/d-/daw-utf-range.json +++ b/versions/d-/daw-utf-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de67e1228f3effe508a68cf6080c6ba6e3343fb0", + "version": "2.2.2", + "port-version": 0 + }, { "git-tree": "aae578a84f804d65b63483335d1b74325906cb01", "version-semver": "2.2.0", From 8b63797138a2d4305e57b2952ada520966f99898 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 7 May 2022 07:54:57 +0800 Subject: [PATCH 196/383] [live555/guilite/polymorphic-value] Update version (#24555) * [live555/guilite] Update version * [polymorphic-value] Update version Co-authored-by: Cheney-Wang --- ports/guilite/portfile.cmake | 7 ++-- ports/guilite/vcpkg.json | 5 +-- ports/live555/portfile.cmake | 6 ++-- ports/live555/vcpkg.json | 3 +- .../001_no_catch_submodule.patch | 33 ------------------- .../polymorphic-value/002_fixed_config.patch | 14 -------- ports/polymorphic-value/portfile.cmake | 33 +++++++------------ ports/polymorphic-value/vcpkg.json | 17 ++++++++-- versions/baseline.json | 6 ++-- versions/g-/guilite.json | 5 +++ versions/l-/live555.json | 5 +++ versions/p-/polymorphic-value.json | 5 +++ 12 files changed, 56 insertions(+), 83 deletions(-) delete mode 100644 ports/polymorphic-value/001_no_catch_submodule.patch delete mode 100644 ports/polymorphic-value/002_fixed_config.patch diff --git a/ports/guilite/portfile.cmake b/ports/guilite/portfile.cmake index 70189fd6112238..ff509f9bcb0f0f 100644 --- a/ports/guilite/portfile.cmake +++ b/ports/guilite/portfile.cmake @@ -1,8 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO "idea4good/GuiLite" - SHA512 "9132f854f2e0d517797a3b30458ac692b509cb5a2fea2bff606b6b84b60a5760311f488c77f2dc21e954a14378e8d803d555750f90d00d5655e216a2a0c83ce8" - REF "master" + REPO idea4good/GuiLite + REF 61d1bd94cbc35da74c0f3c40422a7d783c04d40b + SHA512 b428e9bfc62fabb4d23d4c39b78d521aa13eb52e571a5aaab7609a03bb88e6f2184587885cd4df950eb5f48dece2b8fbff2264f158251ed06c6a6415b9b59f1a + HEAD_REF master ) file(INSTALL "${SOURCE_PATH}/GuiLite.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") diff --git a/ports/guilite/vcpkg.json b/ports/guilite/vcpkg.json index 6cbda897a3870a..630d5c6cd45d58 100644 --- a/ports/guilite/vcpkg.json +++ b/ports/guilite/vcpkg.json @@ -1,6 +1,7 @@ { "name": "guilite", - "version-date": "2021-07-31", + "version-date": "2022-05-05", "description": "The smallest header-only GUI library (4 KLOC) for all platforms.", - "homepage": "https://github.com/idea4good/GuiLite" + "homepage": "https://github.com/idea4good/GuiLite", + "license": "Apache-2.0" } diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index 2897dd9502cb94..b11e4d076bbb8f 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://www.live555.com/liveMedia/public/live.2021.12.18.tar.gz" - FILENAME "live.2021.12.18.tar.gz" - SHA512 072ae92a1a63687e33c659627fbf562e6f2cdf73cf1c3199959aa3a713636ccd4113d56270c4793c86b42338000f180e16a7b2cf3d893402226a04360f8b2e97 + URLS "http://www.live555.com/liveMedia/public/live.2022.04.26.tar.gz" + FILENAME "live.2022.04.26.tar.gz" + SHA512 0226a451129df1d47d10bc96ef2a9ab8ffb0116fd0daac8b16a1dd57b319b9058b587955a01bc4a939c3f64659915815fe182c8c7b02cb286313ff132dcbe144 ) vcpkg_extract_source_archive_ex( diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index 96a92764497dc9..cff25183839e91 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,8 +1,9 @@ { "name": "live555", - "version-date": "2021-12-18", + "version-date": "2022-05-05", "description": "A complete RTSP server application", "homepage": "https://www.live555.com/liveMedia", + "license": "GPL-3.0-or-later", "dependencies": [ "openssl", { diff --git a/ports/polymorphic-value/001_no_catch_submodule.patch b/ports/polymorphic-value/001_no_catch_submodule.patch deleted file mode 100644 index 8fec58a76a080c..00000000000000 --- a/ports/polymorphic-value/001_no_catch_submodule.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git C:/Users/Charles Barto/Source/vcpkg/buildtrees/polymorphic-value/src/1.3.0-33dc249788/CMakeLists.txt C:/Users/Charles Barto/patched_list.txt -index 2819bf6a4..0ee5fba76 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,9 +9,9 @@ set(POLYMOPHIC_VALUE_VERSION "1.3.0") # Revision 3, see paper p0201r3 - project(polymorphic_value VERSION ${POLYMOPHIC_VALUE_VERSION}) - - option(ENABLE_SANITIZERS "Enable Address Sanitizer and Undefined Behaviour Sanitizer if available" OFF) -- -+if(BUILD_TESTING) - add_subdirectory(externals/catch) -- -+endif() - add_library(polymorphic_value INTERFACE) - target_include_directories(polymorphic_value - INTERFACE -@@ -45,6 +45,7 @@ target_compile_features(polymorphic_value - add_library(polymorphic_value::polymorphic_value ALIAS polymorphic_value) - - if(POLYMORPHIC_IS_NOT_SUBPROJECT) -+ if(BUILD_TESTING) - add_executable(test_polymorphic_value test_polymorphic_value.cpp) - target_link_libraries(test_polymorphic_value - PRIVATE -@@ -107,7 +108,7 @@ if(POLYMORPHIC_IS_NOT_SUBPROJECT) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/externals/catch/contrib) - include(Catch) - catch_discover_tests(test_polymorphic_value) -- -+ endif() - install( - FILES - "${CMAKE_CURRENT_SOURCE_DIR}/polymorphic_value.h" diff --git a/ports/polymorphic-value/002_fixed_config.patch b/ports/polymorphic-value/002_fixed_config.patch deleted file mode 100644 index 77a99b058681dd..00000000000000 --- a/ports/polymorphic-value/002_fixed_config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/./broken_config.cmake.in b/./fixed_config.cmake.in -index e64f8a20f..38c441451 100644 ---- a/polymorphic_value-config.cmake.in -+++ b/polymorphic_value-config.cmake.in -@@ -1,5 +1,7 @@ - @PACKAGE_INIT@ - --set_and_check(POLYMORPHIC_VALUE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") - --check_required_components(Foo) -+ -+check_required_components(polymorphic_value) -+ -+include(${CMAKE_CURRENT_LIST_DIR}/polymorphic_value-target.cmake) diff --git a/ports/polymorphic-value/portfile.cmake b/ports/polymorphic-value/portfile.cmake index 5a03c827b810dd..56c665a55a91f2 100644 --- a/ports/polymorphic-value/portfile.cmake +++ b/ports/polymorphic-value/portfile.cmake @@ -1,32 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jbcoe/polymorphic_value - REF 1.3.0 - SHA512 67d49933c46d2a2bccb68c65c6f28b92603e193c68ff434b2c6b1602a573855a176fc98227d85cd24a64ae9299461adb42e792b4f165482bb250488620161742 - HEAD_REF master - PATCHES 001_no_catch_submodule.patch - 002_fixed_config.patch + REF 8b386a006c68c25c8f8c119c1f9620a916fb5afc #v1.3.0 + SHA512 4b131b5d7c86d589418d85f25afcee70ceb48c11d2ea807ef0e97667ba273ee27659ebf95a2a7aefb6379e43bb8e5f3c25d7921cfa348ca53db4b56a5336933c + HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -if(VCPKG_HEAD_VERSION) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/polymorphic_value TARGET_PATH share/polymorphic_value) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -else() - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/polymorphic_value) - file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE.txt") -endif() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/polymorphic_value) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file( - INSTALL ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/polymorphic-value/vcpkg.json b/ports/polymorphic-value/vcpkg.json index a47f482943f5cf..8604b740053204 100644 --- a/ports/polymorphic-value/vcpkg.json +++ b/ports/polymorphic-value/vcpkg.json @@ -1,7 +1,18 @@ { "name": "polymorphic-value", - "version-string": "1.3.0", - "port-version": 2, + "version": "1.3.0", + "port-version": 3, "description": "A polymorphic value-type for C++", - "homepage": "https://github.com/jbcoe/polymorphic_value" + "homepage": "https://github.com/jbcoe/polymorphic_value", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a8d2487d288a69..77ad9a11d5dfe9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2697,7 +2697,7 @@ "port-version": 2 }, "guilite": { - "baseline": "2021-07-31", + "baseline": "2022-05-05", "port-version": 0 }, "gumbo": { @@ -4249,7 +4249,7 @@ "port-version": 0 }, "live555": { - "baseline": "2021-12-18", + "baseline": "2022-05-05", "port-version": 0 }, "llfio": { @@ -5510,7 +5510,7 @@ }, "polymorphic-value": { "baseline": "1.3.0", - "port-version": 2 + "port-version": 3 }, "ponder": { "baseline": "3.0.0", diff --git a/versions/g-/guilite.json b/versions/g-/guilite.json index db73a1105b1d13..c0a80fd208c8f5 100644 --- a/versions/g-/guilite.json +++ b/versions/g-/guilite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43572106c3593ef39db61013f97d37d33c867542", + "version-date": "2022-05-05", + "port-version": 0 + }, { "git-tree": "c68992e6acdc51afc39edfdfe1342ecbd197bee6", "version-date": "2021-07-31", diff --git a/versions/l-/live555.json b/versions/l-/live555.json index 68c898e36cc887..df739954238c97 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7dd605bbfb6b2532b7c127eac435600750b3c601", + "version-date": "2022-05-05", + "port-version": 0 + }, { "git-tree": "d2d9c96e8a0fa3a6af648952b384dc53504bf738", "version-date": "2021-12-18", diff --git a/versions/p-/polymorphic-value.json b/versions/p-/polymorphic-value.json index aa4f3ba72a9680..0def53380eea6e 100644 --- a/versions/p-/polymorphic-value.json +++ b/versions/p-/polymorphic-value.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "439fca88a0bc0bf3bb8639dafe418eed9b21214b", + "version": "1.3.0", + "port-version": 3 + }, { "git-tree": "5eeefe34f5fbc12cbf9c7b1a6cd231bf0c455d6e", "version-string": "1.3.0", From fbd65fb91db45617b9574ce27f09defe08f6fb5e Mon Sep 17 00:00:00 2001 From: EhWhoAmI Date: Sat, 7 May 2022 08:11:14 +0800 Subject: [PATCH 197/383] [entt] Update to 3.10.1 (#24581) * entt: Update port files * entt: updated version files * Update version files --- ports/entt/portfile.cmake | 4 ++-- ports/entt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/entt.json | 10 ++++++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index 63ba1818e98160..d74c5b70b89688 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -8,8 +8,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt - REF v3.10.0 - SHA512 b123ac1909f4062312d872d823846f2476eb8911c40673cdceb6a1480b38c3fb3b86f843173247d0765870cbe87bf1d10f87e076fa2623fa20327743d1d7061b + REF v3.10.1 + SHA512 ce611f8892626d8df2d6be6a0e7c0218683899bae5665b4466f149c6a5b6a4d184b390370262faa3ea822a399ac71a92f4780e9a22438d4a7a14ca5f554e94c4 HEAD_REF master ) endif() diff --git a/ports/entt/vcpkg.json b/ports/entt/vcpkg.json index 92b5a87baee967..d9311239eee71e 100644 --- a/ports/entt/vcpkg.json +++ b/ports/entt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "entt", - "version": "3.10.0", + "version": "3.10.1", "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", "homepage": "https://github.com/skypjack/entt", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 77ad9a11d5dfe9..d033fd20db5458 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2081,7 +2081,7 @@ "port-version": 3 }, "entt": { - "baseline": "3.10.0", + "baseline": "3.10.1", "port-version": 0 }, "epsilon": { diff --git a/versions/e-/entt.json b/versions/e-/entt.json index 4b92e1a9d58f28..0e6c75a8fcf044 100644 --- a/versions/e-/entt.json +++ b/versions/e-/entt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f2c6e6ca727e3e843f0eb07544c81305175dc973", + "version": "3.10.1", + "port-version": 0 + }, + { + "git-tree": "965c440d8611528f1069a2a494f11da420110408", + "version": "3.10.0", + "port-version": 0 + }, { "git-tree": "a871a9d0c7187960052099119854369e854c3e50", "version": "3.10.0", From 24ed115a89212ab8015497e09f1cd62eaf941318 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 7 May 2022 08:11:33 +0800 Subject: [PATCH 198/383] [Catch2] update to 2.13.9 (#24577) * [Catch2] update to 2.13.9 * update version --- ports/catch2/portfile.cmake | 4 ++-- ports/catch2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/catch2.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 231b18160305fb..f4c9abc30ce299 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v2.13.8 - SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e + REF 62fd660583d3ae7a7886930b413c3c570e89786c v2.13.9 + SHA512 70805a37183917bc1534899dec828f786bc5e60c5742364b700b02d4965aba6ac7d03d98218275c07854f963bf80bdf3f0f26f3c90d12882520b078638d5c703 HEAD_REF devel PATCHES fix-install-path.patch diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index a2ea784f672d62..8aa91edf9fc4ad 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "catch2", - "version-semver": "2.13.8", - "port-version": 1, + "version-semver": "2.13.9", "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index d033fd20db5458..cf1acb0048bac9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1269,8 +1269,8 @@ "port-version": 1 }, "catch2": { - "baseline": "2.13.8", - "port-version": 1 + "baseline": "2.13.9", + "port-version": 0 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 27944f37d7e211..faa75d401e3c7a 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6cc0b5f2cef9c98ad5c3152ebfbe85f1b9baceed", + "version-semver": "2.13.9", + "port-version": 0 + }, { "git-tree": "c243585b5ba220e6aebcdb59dc59867afff7af6e", "version-semver": "2.13.8", From 3b8363dd8fb42d1a555f10f7fc0e1c3f49a815e2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 7 May 2022 02:13:42 +0200 Subject: [PATCH 199/383] [gdal] Update to 3.4.3 (#24353) * Update to 3.4.3RC2 * Add control of AWS EC2 detection dependency * Use libtool's DLL_EXPORT for mingw * Move patches to vcpkg_from_github * Update to 3.4.3 * Update versions --- ports/gdal/0006-Fix-mingw-dllexport.patch | 2 +- ports/gdal/portfile.cmake | 31 ++++++++++------------- ports/gdal/vcpkg.json | 12 +++++---- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 ++++ 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/ports/gdal/0006-Fix-mingw-dllexport.patch b/ports/gdal/0006-Fix-mingw-dllexport.patch index a07dc0ec3b2a8e..c1f5245275b8c0 100644 --- a/ports/gdal/0006-Fix-mingw-dllexport.patch +++ b/ports/gdal/0006-Fix-mingw-dllexport.patch @@ -7,7 +7,7 @@ index 98805cf..a6a1846 100644 #ifndef CPL_DLL -#if defined(_MSC_VER) && !defined(CPL_DISABLE_DLL) -+#if defined(WIN32) && !defined(CPL_DISABLE_DLL) ++#if defined(WIN32) && (!defined(CPL_DISABLE_DLL) || defined(DLL_EXPORT)) # ifdef GDAL_COMPILATION # define CPL_DLL __declspec(dllexport) # else diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 5d75c14216a97d..af8fb9731d3bc6 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,24 +1,19 @@ -set(GDAL_PATCHES - 0001-Fix-debug-crt-flags.patch - 0002-Fix-build.patch - 0004-Fix-cfitsio.patch - 0005-Fix-configure.patch - 0007-Control-tools.patch - 0008-Fix-absl-string_view.patch - 0009-atlbase.patch - 0010-symprefix.patch -) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND GDAL_PATCHES 0006-Fix-mingw-dllexport.patch) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF v3.4.2 - SHA512 4dadfaefb4924e17395b2d8b695e185e91e9ad28b4b8666b64f11f40164411974f8ade747592060b515907ee73bf335610698c5e53e56a8937a89ddfffc3d66b + REF v3.4.3 + SHA512 702bcb220abc7cf978e8f70a1b2835a20ce5abe405014b9690cab311c00837e57555bb371ff5e2655f9eed63cfd461d6cec5e654001b276dd79a6d2ec0c21f0b HEAD_REF master - PATCHES ${GDAL_PATCHES} + PATCHES + 0001-Fix-debug-crt-flags.patch + 0002-Fix-build.patch + 0004-Fix-cfitsio.patch + 0005-Fix-configure.patch + 0006-Fix-mingw-dllexport.patch + 0007-Control-tools.patch + 0008-Fix-absl-string_view.patch + 0009-atlbase.patch + 0010-symprefix.patch ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") @@ -54,7 +49,7 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) list(APPEND NMAKE_OPTIONS "SYM_PREFIX=" "EXTRA_LINKER_FLAGS=/APPCONTAINER WindowsApp.lib") endif() - if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + if(NOT "aws-ec2-windows" IN_LIST FEATURES) list(APPEND NMAKE_OPTIONS "HAVE_ATLBASE_H=NO") endif() diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 766fe35a82a84a..910c80da5e4a85 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,14 +1,10 @@ { "name": "gdal", - "version-semver": "3.4.2", + "version-semver": "3.4.3", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, "dependencies": [ - { - "name": "atlmfc", - "platform": "windows & !uwp" - }, "curl", "expat", "geos", @@ -45,6 +41,12 @@ "supported-default-features" ], "features": { + "aws-ec2-windows": { + "description": "Optimized detection of AWS EC2 Windows hosts", + "dependencies": [ + "atlmfc" + ] + }, "cfitsio": { "description": "Enable cfitsio support", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index cf1acb0048bac9..66187818824c33 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2429,7 +2429,7 @@ "port-version": 0 }, "gdal": { - "baseline": "3.4.2", + "baseline": "3.4.3", "port-version": 0 }, "gdcm": { diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 6f1222acf6000b..6e65fae250eb3c 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8277225a2c5da40e154062f73526126fb00c9125", + "version-semver": "3.4.3", + "port-version": 0 + }, { "git-tree": "7c26036e04d87f1f5c27bf4bffa589b2481f47d3", "version-semver": "3.4.2", From d5ea96667ed4f41487811bb01b1ee89b1206a9dd Mon Sep 17 00:00:00 2001 From: Nemirtingas <9432037+Nemirtingas@users.noreply.github.com> Date: Sat, 7 May 2022 02:17:27 +0200 Subject: [PATCH 200/383] [vcpkg] Fix '/' incorrectly replaced by '-' on Linux. (#24098) * Fix '/' incorrectly replaced by '-' on Linux. * Update baseline. * Use MATCHES instead of STREQUAL. * Update version hash. * Add comment for future modifications. * Update version hash. * Update version-date. * Update baseline. * Update ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt Co-authored-by: Billy O'Neal * Update version. * Run vcpkg format-manifest ports/vcpkg-cmake/vcpkg.json * Run vcpkg x-add-version vcpkg-cmake Co-authored-by: Nemirtingas Co-authored-by: Billy O'Neal --- ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt | 9 ++++++--- ports/vcpkg-cmake/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 +++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt index 51f6357c7c71af..fb1da469651b97 100644 --- a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt +++ b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt @@ -143,9 +143,12 @@ foreach(incdir IN LISTS CMAKE_C_STANDARD_INCLUDE_DIRECTORIES) endforeach() foreach(flag CXX C SHARED_LINKER EXE_LINKER STATIC_LINKER RC) - if(MSVC) - # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. - # This is imperfect because it fails on directories with trailing spaces, but those are exceedingly rare + # When using MSVC, maybe transform /flags to -flags. + # When cross compiling, "/flags" may be an absolute path starting with /, so don't transform. + # Otherwise, transform to improve compatibility with scripts interpreting "/flags" as a path. + if(MSVC AND "${CMAKE_HOST_SYSTEM_NAME}" MATCHES "Windows") + # This implementation is imperfect because it fails on directories with trailing spaces, + # but those are rare. string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_FLAGS "${${flag}_FLAGS}") if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if("${flag}" STREQUAL "CXX") diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index c888fc8729a5a6..3c3cebde55fdff 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-05-05", + "version-date": "2022-05-06", "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index 66187818824c33..2b1f11e29daddd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7317,7 +7317,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-05-05", + "baseline": "2022-05-06", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index bb8b094fabf7c5..ecc5876cd29787 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46a5686341cf9136053ff01b9f213dbd2dbea8a6", + "version-date": "2022-05-06", + "port-version": 0 + }, { "git-tree": "ecfb2282f599a9c1f3a9ad98eac9d2b35690850f", "version-date": "2022-05-05", From a5d6d145164e82e67fbf91a4a30f98699d30de63 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 7 May 2022 12:39:42 +0800 Subject: [PATCH 201/383] [cpr] update to 1.8.3 (#24590) * [cpr] update to 1.8.3 * update version --- ports/cpr/portfile.cmake | 4 ++-- ports/cpr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpr.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 24790b9b663c79..3c37382960eb4e 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF 1.8.1 - SHA512 f586b63ddbd9bd03e5c5aa385aad0d4f16f79847e1a14f6dc8a5e0cad4ed89e097ab83484c9ed19e034abf0d2eece13a7609652bc6a1a9caba43189cf0a782db + REF db351ffbbadc6c4e9239daaa26e9aefa9f0ec82d #v1.8.3 + SHA512 4ce4e791c5a29584eaf147b2efc4e5c0fb363cf254e6ec0c66734f7ec8da538b5b295300fee3de218da6daf4107fc11e0eac695885a3380e03a72720d328c3db HEAD_REF master PATCHES 001-cpr-config.patch diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index be243b70c93129..1b53b85d2f5b01 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpr", - "version-semver": "1.8.1", + "version-semver": "1.8.3", "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", "homepage": "https://github.com/libcpr/cpr", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 2b1f11e29daddd..cd021b02c48e3b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1653,7 +1653,7 @@ "port-version": 0 }, "cpr": { - "baseline": "1.8.1", + "baseline": "1.8.3", "port-version": 0 }, "cpu-features": { diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 823f87fb6522ea..55445f2871a47a 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0699dd50434f04eeccbcd30ed9a3973c3143052b", + "version-semver": "1.8.3", + "port-version": 0 + }, { "git-tree": "6a73ff58e720c30c96a1f7d12f98c9553a62a0d7", "version-semver": "1.8.1", From 0c5bb650f8543b6a39483a11bb2a66d8777ef74d Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Mon, 9 May 2022 16:58:35 -0400 Subject: [PATCH 202/383] [septag-dmon] New port (#22828) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [ports/dmon] Init * [versions/d-/dmon.json,versions/baseline.json] `./vcpkg x-add-version --all --overwrite-version` * [ports/dmon/vcpkg.json] Add pthreads on Windows; add license; set version to date * `./vcpkg x-add-version --all --overwrite-version` * [versions/d-/dmon.json] Remove 0.0.1 * [ports/dmon/vcpkg.json] Remove pthreads dependency on Windows * `./vcpkg x-add-version --all --overwrite-version` * [ports/dmon] My PR was mergedā€¦ switch to official source repo * [versions/d-/dmon.json,versions/baseline.json] `./vcpkg x-add-version --all --overwrite-version` * [ports/dmon/portfile.cmake] Upgrade to latest dmon * `vcpkg x-add-version --all --overwrite-version` * [ports/dmon/portfile.cmake] Upgrade to latest; [ports/dmon/vcpkg.json] Add homepage * [versions/d-/dmon.json] `./vcpkg x-add-version --all --overwrite-version`; manually remove old versions * [ports/dmon/vcpkg.json] Remove `vcpkg-cmake-config` * `./vcpkg x-add-version --all --overwrite-version` * [ports/dmon/portfile.cmake] ${PORT} -> dmon; [ports/mailio/vcpkg.json] ./vcpkg format-manifest * `./vcpkg x-add-version --all --overwrite-version` * [ports/mailio/vcpkg.json,versions/{baseline.json,m-/mailio.json}] Revert to `07e508359ca5488456988191d8709722484daccd` * [versions/baseline.json] `./vcpkg x-add-version --all --overwrite-version` * dmon -> septag-dmon * `./vcpkg x-add-version --all --overwrite-version` --- ports/septag-dmon/portfile.cmake | 18 ++++++++++++++++++ ports/septag-dmon/vcpkg.json | 14 ++++++++++++++ versions/baseline.json | 4 ++++ versions/s-/septag-dmon.json | 9 +++++++++ 4 files changed, 45 insertions(+) create mode 100644 ports/septag-dmon/portfile.cmake create mode 100644 ports/septag-dmon/vcpkg.json create mode 100644 versions/s-/septag-dmon.json diff --git a/ports/septag-dmon/portfile.cmake b/ports/septag-dmon/portfile.cmake new file mode 100644 index 00000000000000..2628c4306b0cc4 --- /dev/null +++ b/ports/septag-dmon/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO septag/dmon + REF 59fac713a168b6c9fd08db48da49f7bd50fd9d37 + SHA512 61fa6a0e243be456d3b59d20e18183392d106983dc9f1b0a7290b54fefa964d4eeba4bacd92cd5310b6f3da2dac232fd043c529c51fe3e6cccbfb9422dd31311 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTS=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/septag-dmon/vcpkg.json b/ports/septag-dmon/vcpkg.json new file mode 100644 index 00000000000000..d9df93c871dba9 --- /dev/null +++ b/ports/septag-dmon/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "septag-dmon", + "version-date": "2022-02-08", + "description": "a tiny C library that monitors changes in a directory", + "homepage": "https://github.com/septag/dmon", + "license": "BSD-2-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index cd021b02c48e3b..c6c8e75337e37a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6432,6 +6432,10 @@ "baseline": "0.4.17", "port-version": 0 }, + "septag-dmon": { + "baseline": "2022-02-08", + "port-version": 0 + }, "septag-sx": { "baseline": "2019-05-07", "port-version": 3 diff --git a/versions/s-/septag-dmon.json b/versions/s-/septag-dmon.json new file mode 100644 index 00000000000000..ed29d1fd1521f7 --- /dev/null +++ b/versions/s-/septag-dmon.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "377b8711ab595b704c7beb3dd9972b7bb6d75c62", + "version-date": "2022-02-08", + "port-version": 0 + } + ] +} From 83fc3b74c9ec54d12702e2f0bdd92a89a1e5a027 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 9 May 2022 23:00:29 +0200 Subject: [PATCH 203/383] [vcpkg-tool-ninja] Add only the ninja port (#23911) * [vcpkg-tool-ninja] add ninja tool as a port * version stuff * add Unix Makefiles to list of valid generators for bootstraping ninja * nicole CRs * update version db * revert vcpkg_build_cmake changes * retrigger ci * download patch * version stuff * Remove checked in diff copy. Co-authored-by: Alexander Neumann Co-authored-by: nicole mazzuca Co-authored-by: Billy Robert O'Neal III --- ports/vcpkg-tool-ninja/portfile.cmake | 28 +++++++++++++++++++ .../vcpkg-tool-ninja/vcpkg-port-config.cmake | 1 + ports/vcpkg-tool-ninja/vcpkg.json | 12 ++++++++ scripts/build_info.cmake | 3 ++ versions/baseline.json | 4 +++ versions/v-/vcpkg-tool-ninja.json | 9 ++++++ 6 files changed, 57 insertions(+) create mode 100644 ports/vcpkg-tool-ninja/portfile.cmake create mode 100644 ports/vcpkg-tool-ninja/vcpkg-port-config.cmake create mode 100644 ports/vcpkg-tool-ninja/vcpkg.json create mode 100644 versions/v-/vcpkg-tool-ninja.json diff --git a/ports/vcpkg-tool-ninja/portfile.cmake b/ports/vcpkg-tool-ninja/portfile.cmake new file mode 100644 index 00000000000000..8cb941b47b4282 --- /dev/null +++ b/ports/vcpkg-tool-ninja/portfile.cmake @@ -0,0 +1,28 @@ +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) + +vcpkg_download_distfile( + LONG_PATH_PATCH + URLS "https://patch-diff.githubusercontent.com/raw/ninja-build/ninja/pull/2056.diff" # stable? + FILENAME 2056.diff + SHA512 90f17c2cbb5e0c5b41de748f75a3fc3e0c9da8837a0507c8570a49affe15ae7258661dc1f1bc201574847d93ea8b7fe4cbecfffd868395d50ca821033c5f295d +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ninja-build/ninja + REF 170c387a7461d476523ae29c115a58f16e4d3430 + SHA512 75c0f263ad325d14c99c9a1d85e571832407b481271a2733e78183a478f7ecd22d84451fc8d7ce16ab20d641ce040761d7ab266695d66bbac5b2b9a3a29aa521 + HEAD_REF master + PATCHES "${LONG_PATH_PATCH}" # Long path support windows +) +set(VCPKG_BUILD_TYPE release) #we only need release here! +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_copy_tools( + TOOL_NAMES ninja + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/ninja" + AUTO_CLEAN +) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) diff --git a/ports/vcpkg-tool-ninja/vcpkg-port-config.cmake b/ports/vcpkg-tool-ninja/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..8bf42e9f6a28f4 --- /dev/null +++ b/ports/vcpkg-tool-ninja/vcpkg-port-config.cmake @@ -0,0 +1 @@ +set(NINJA "${CMAKE_CURRENT_LIST_DIR}/../../tools/ninja/ninja@VCPKG_TARGET_EXECUTABLE_SUFFIX@") diff --git a/ports/vcpkg-tool-ninja/vcpkg.json b/ports/vcpkg-tool-ninja/vcpkg.json new file mode 100644 index 00000000000000..434990e25f0353 --- /dev/null +++ b/ports/vcpkg-tool-ninja/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "vcpkg-tool-ninja", + "version-date": "2022-03-31", + "description": "Ninja is a small build system with a focus on speed.", + "homepage": "https://ninja-build.org/", + "license": "Apache-2.0", + "supports": "native", + "dependencies": [ + "vcpkg-cmake", + "vcpkg-cmake-config" + ] +} diff --git a/scripts/build_info.cmake b/scripts/build_info.cmake index a6208016ae522b..112e074654f818 100644 --- a/scripts/build_info.cmake +++ b/scripts/build_info.cmake @@ -35,6 +35,9 @@ endif() if (DEFINED VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK) file(APPEND ${BUILD_INFO_FILE_PATH} "PolicySkipArchitectureCheck: ${VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK}\n") endif() +if (DEFINED VCPKG_POLICY_CMAKE_HELPER_PORT) + file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyCmakeHelperPort: ${VCPKG_POLICY_CMAKE_HELPER_PORT}\n") +endif() if (DEFINED VCPKG_HEAD_VERSION) file(APPEND ${BUILD_INFO_FILE_PATH} "Version: ${VCPKG_HEAD_VERSION}\n") endif() diff --git a/versions/baseline.json b/versions/baseline.json index c6c8e75337e37a..c799f509defc79 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7368,6 +7368,10 @@ "baseline": "3.3", "port-version": 0 }, + "vcpkg-tool-ninja": { + "baseline": "2022-03-31", + "port-version": 0 + }, "vcpkg-tool-nodejs": { "baseline": "14.17.4", "port-version": 0 diff --git a/versions/v-/vcpkg-tool-ninja.json b/versions/v-/vcpkg-tool-ninja.json new file mode 100644 index 00000000000000..643a736c0a0e50 --- /dev/null +++ b/versions/v-/vcpkg-tool-ninja.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0d55ba6e9ede00479127566b8f39fce7034e1b05", + "version-date": "2022-03-31", + "port-version": 0 + } + ] +} From a02ef95400c4dfb6bddf9b4eb498e108abba0527 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 10 May 2022 05:12:27 +0800 Subject: [PATCH 204/383] [opencascade] Fix link the debug of freetype.dll (#23939) * [opencascade] Fix link the debug of freetype.dll * update version * fix build error * update version * update patch * update version Co-authored-by: Lily Wang --- ports/opencascade/fix-depend-freetype.patch | 15 +++++++++++++ ports/opencascade/portfile.cmake | 25 +++++++++++---------- ports/opencascade/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/o-/opencascade.json | 5 +++++ 5 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 ports/opencascade/fix-depend-freetype.patch diff --git a/ports/opencascade/fix-depend-freetype.patch b/ports/opencascade/fix-depend-freetype.patch new file mode 100644 index 00000000000000..b37b7ee4e09e5d --- /dev/null +++ b/ports/opencascade/fix-depend-freetype.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbcede5..66b127d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -563,7 +563,9 @@ if (CAN_USE_FREETYPE) + if (USE_FREETYPE) + message (STATUS "Info: FreeType is used by OCCT") + add_definitions (-DHAVE_FREETYPE) +- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype") ++ find_package(freetype CONFIG REQUIRED) ++ get_target_property(FREETYPE_INCLUDE_DIR freetype INTERFACE_INCLUDE_DIRECTORIES) ++ list (APPEND 3RDPARTY_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR}") + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE") + OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2") diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index a1f7e439d915b6..b10642345d8aee 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix-pdb-find.patch fix-install-prefix-path.patch install-include-dir.patch + fix-depend-freetype.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -49,22 +50,22 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencascade) #make occt includes relative to source_file list(APPEND ADDITIONAL_HEADERS "ExprIntrp.tab.h" - "FlexLexer.h" - "glext.h" - "igesread.h" - "NCollection_Haft.h" - "OSD_PerfMeter.h" - "Standard_values.h" + "FlexLexer.h" + "glext.h" + "igesread.h" + "NCollection_Haft.h" + "OSD_PerfMeter.h" + "Standard_values.h" ) file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/[a-zA-Z0-9_]*\.[hgl]xx") foreach(file_name IN LISTS files) - file(READ "${file_name}" filedata) - string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}") - foreach(extra_header IN LISTS ADDITIONAL_HEADERS) - string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}") - endforeach() - file(WRITE "${file_name}" "${filedata}") + file(READ "${file_name}" filedata) + string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}") + foreach(extra_header IN LISTS ADDITIONAL_HEADERS) + string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}") + endforeach() + file(WRITE "${file_name}" "${filedata}") endforeach() # Remove libd to lib, libd just has cmake files we dont want too diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index ea7ddba2961fbf..d06977325cc589 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,8 +1,10 @@ { "name": "opencascade", "version": "7.6.0", + "port-version": 1, "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", + "license": "LGPL-2.1", "supports": "!(uwp | osx | linux | arm)", "dependencies": [ "freetype", diff --git a/versions/baseline.json b/versions/baseline.json index c799f509defc79..43352a62cbb20f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5066,7 +5066,7 @@ }, "opencascade": { "baseline": "7.6.0", - "port-version": 0 + "port-version": 1 }, "opencc": { "baseline": "2020-04-26", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index 4c4df69f2ad2e3..c82c8c0f97c4ce 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b043af5fd55a990d23a36523c82b005422ba75c", + "version": "7.6.0", + "port-version": 1 + }, { "git-tree": "a1f9f32c2e0778573a20d4b59fda9be37cf6134d", "version": "7.6.0", From d4bc451ce6d10f0e2391fd9a5a3e5e64edf4807f Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 9 May 2022 23:33:47 +0200 Subject: [PATCH 205/383] [openssl] Update to 3.0.3 (#24547) * [openssl] Update to 3.0.3 * version * hash * version --- ports/openssl/portfile.cmake | 4 ++-- ports/openssl/vcpkg-cmake-wrapper.cmake.in | 2 +- ports/openssl/vcpkg.json | 7 +------ versions/baseline.json | 4 ++-- versions/o-/openssl.json | 5 +++++ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 4a51777ab1e489..36a8f4b774b913 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -11,13 +11,13 @@ It can be installed on alpine systems via apk add linux-headers.]] ) endif() -set(OPENSSL_VERSION 3.0.2) +set(OPENSSL_VERSION 3.0.3) vcpkg_download_distfile( ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 f986850d5be908b4d6b5fd7091bc4652d7378c9bccebfbc5becd7753843c04c1eb61a1749c432139d263dfac33df0b1f6c773664b485cad47542266823a4eb03 + SHA512 949472025211fabdaf2564122f0a9a3baef0facb6373e90cf6c4485164a50898050b179722d0b358c4d8cf1787384ea30d5fd03b98757634631d3e8978509b1a ) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake.in b/ports/openssl/vcpkg-cmake-wrapper.cmake.in index ee16a896b74eef..cb3aba0e7ff909 100644 --- a/ports/openssl/vcpkg-cmake-wrapper.cmake.in +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake.in @@ -5,7 +5,7 @@ cmake_policy(SET CMP0057 NEW) set(OPENSSL_VERSION_MAJOR 3) set(OPENSSL_VERSION_MINOR 0) -set(OPENSSL_VERSION_FIX 2) +set(OPENSSL_VERSION_FIX 3) if(OPENSSL_USE_STATIC_LIBS) if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic") diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index ff3927f0f22bb8..008c3fa1304451 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openssl", - "version": "3.0.2", - "port-version": 3, + "version": "3.0.3", "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", @@ -9,10 +8,6 @@ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 43352a62cbb20f..de04410d172b61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5169,8 +5169,8 @@ "port-version": 1 }, "openssl": { - "baseline": "3.0.2", - "port-version": 3 + "baseline": "3.0.3", + "port-version": 0 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 10a28745a12690..14d19fb9584b60 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "973408910bc03c5a350f502080548a0d1ac68352", + "version": "3.0.3", + "port-version": 0 + }, { "git-tree": "f521f59b704e7bebbddd28929f61f3911b8c7cb4", "version": "3.0.2", From 3e53ba7ea9b913d23ba1d89a7b8c013674b2da0e Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Mon, 9 May 2022 21:34:42 +0000 Subject: [PATCH 206/383] [fontconfig] Enable tool CLI option handling (#24553) * [fontconfig] Enable tool CLI option handling (microsoft#24552) * [fontconfig] fix non-windows systems (microsoft#24552) * [fontconfig] regenerate version registries (microsoft#24552) --- ports/fontconfig/libgetopt.patch | 130 +++++++++++++++++++++++++++++++ ports/fontconfig/portfile.cmake | 1 + ports/fontconfig/vcpkg.json | 2 + versions/baseline.json | 2 +- versions/f-/fontconfig.json | 5 ++ 5 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 ports/fontconfig/libgetopt.patch diff --git a/ports/fontconfig/libgetopt.patch b/ports/fontconfig/libgetopt.patch new file mode 100644 index 00000000000000..ced94ddb8f6751 --- /dev/null +++ b/ports/fontconfig/libgetopt.patch @@ -0,0 +1,130 @@ +diff --git a/fc-cache/meson.build b/fc-cache/meson.build +index 5e40fac..3c3e46b 100644 +--- a/fc-cache/meson.build ++++ b/fc-cache/meson.build +@@ -1,6 +1,7 @@ + fccache = executable('fc-cache', ['fc-cache.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-cat/meson.build b/fc-cat/meson.build +index f26e4b8..476c0f9 100644 +--- a/fc-cat/meson.build ++++ b/fc-cat/meson.build +@@ -1,6 +1,7 @@ + fccat = executable('fc-cat', ['fc-cat.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-conflist/meson.build b/fc-conflist/meson.build +index f543cf9..f06640b 100644 +--- a/fc-conflist/meson.build ++++ b/fc-conflist/meson.build +@@ -1,6 +1,7 @@ + fcconflist = executable('fc-conflist', ['fc-conflist.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-list/meson.build b/fc-list/meson.build +index 2f679d5..4b0fb62 100644 +--- a/fc-list/meson.build ++++ b/fc-list/meson.build +@@ -1,6 +1,7 @@ + fclist = executable('fc-list', ['fc-list.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-match/meson.build b/fc-match/meson.build +index aca8bc8..cab4f09 100644 +--- a/fc-match/meson.build ++++ b/fc-match/meson.build +@@ -1,6 +1,7 @@ + fcmatch = executable('fc-match', ['fc-match.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-pattern/meson.build b/fc-pattern/meson.build +index 07de245..b957c67 100644 +--- a/fc-pattern/meson.build ++++ b/fc-pattern/meson.build +@@ -1,6 +1,7 @@ + fcpattern = executable('fc-pattern', ['fc-pattern.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-query/meson.build b/fc-query/meson.build +index d0f2dd4..940b021 100644 +--- a/fc-query/meson.build ++++ b/fc-query/meson.build +@@ -1,7 +1,7 @@ + fcquery = executable('fc-query', ['fc-query.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], +- dependencies: [freetype_dep], ++ dependencies: [freetype_dep, getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-scan/meson.build b/fc-scan/meson.build +index 4de2134..c5b2b67 100644 +--- a/fc-scan/meson.build ++++ b/fc-scan/meson.build +@@ -1,7 +1,7 @@ + fcscan = executable('fc-scan', ['fc-scan.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], +- dependencies: [freetype_dep], ++ dependencies: [freetype_dep, getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-validate/meson.build b/fc-validate/meson.build +index e2b956e..8902d59 100644 +--- a/fc-validate/meson.build ++++ b/fc-validate/meson.build +@@ -1,7 +1,7 @@ + fcvalidate = executable('fc-validate', ['fc-validate.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], +- dependencies: [freetype_dep], ++ dependencies: [freetype_dep, getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/meson.build b/meson.build +index f616600..6d82a16 100644 +--- a/meson.build ++++ b/meson.build +@@ -202,6 +202,14 @@ if cc.links(files('meson-cc-tests/solaris-atomic-operations.c'), name: 'Solaris + conf.set('HAVE_SOLARIS_ATOMIC_OPS', 1) + endif + ++if host_machine.system() == 'windows' ++ conf.set('HAVE_GETOPT', 1) ++ conf.set('HAVE_GETOPT_LONG', 1) ++ getopt_dep = cc.find_library('getopt', required: true) ++else ++ getopt_dep = dependency('', required: false) ++endif ++ + + prefix = get_option('prefix') + diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 1ad11bfb27eddc..f8f1d1f1c541df 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_gitlab( HEAD_REF master PATCHES no-etc-symlinks.patch + libgetopt.patch ) vcpkg_find_acquire_program(GPERF) diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 0ab7edc10ef79b..28a77f62e1ef20 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fontconfig", "version": "2.14.0", + "port-version": 1, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "license": "MIT", @@ -8,6 +9,7 @@ "dirent", "expat", "freetype", + "getopt", "gettext", "libiconv", { diff --git a/versions/baseline.json b/versions/baseline.json index de04410d172b61..fc40b1b07431a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2286,7 +2286,7 @@ }, "fontconfig": { "baseline": "2.14.0", - "port-version": 0 + "port-version": 1 }, "foonathan-memory": { "baseline": "2019-07-21", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 70a3570d97b9dd..068c6f259ab263 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1b1de99dba230f78c88bb9d73329bed77227ad4", + "version": "2.14.0", + "port-version": 1 + }, { "git-tree": "49816baac2cb555355f7e0176c5d36b2701cfceb", "version": "2.14.0", From 7708b63fa2efd8099554abd5e7caa93b779f7307 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 9 May 2022 23:35:05 +0200 Subject: [PATCH 207/383] [msdfgen] Update to 1.9.2 (#24565) * Update msdfgen to 1.9.2 * Update CI baseline * Fix CMake option * Update CI baseline * Add license * Update CI baseline Co-authored-by: chausner --- ports/msdfgen/portfile.cmake | 6 +++--- ports/msdfgen/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/m-/msdfgen.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/msdfgen/portfile.cmake b/ports/msdfgen/portfile.cmake index 16bb48a7e3d628..fd187b8e52c375 100644 --- a/ports/msdfgen/portfile.cmake +++ b/ports/msdfgen/portfile.cmake @@ -8,15 +8,15 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Chlumsky/msdfgen - REF v1.9.1 - SHA512 7A721B38027548F66D1C3EB862C1F27EA0A431C325119504D072BA6D7ED87539BA4D6020C663354B7B82BA48725D77CC642DB05FB596749292A2A12BE21CE528 + REF v1.9.2 + SHA512 5080a640c353fde86883946a04581a072b39d0d2111b5f3217344510d78324cea69df4e5046a380e84cf7da247d96efd4407c041991fae69e128ba435774e30f HEAD_REF master ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - tools MSDFGEN_BUILD_MSDFGEN_STANDALONE + tools MSDFGEN_BUILD_STANDALONE openmp MSDFGEN_USE_OPENMP ) diff --git a/ports/msdfgen/vcpkg.json b/ports/msdfgen/vcpkg.json index ebc4372eec1a4a..7ecbe554f5d4b8 100644 --- a/ports/msdfgen/vcpkg.json +++ b/ports/msdfgen/vcpkg.json @@ -1,8 +1,9 @@ { "name": "msdfgen", - "version": "1.9.1", + "version": "1.9.2", "description": "Multi-channel signed distance field generator", "homepage": "https://github.com/Chlumsky/msdfgen", + "license": "MIT", "dependencies": [ "freetype", { diff --git a/versions/baseline.json b/versions/baseline.json index fc40b1b07431a5..019f111a75bbef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4677,7 +4677,7 @@ "port-version": 0 }, "msdfgen": { - "baseline": "1.9.1", + "baseline": "1.9.2", "port-version": 0 }, "msgpack": { diff --git a/versions/m-/msdfgen.json b/versions/m-/msdfgen.json index 333d04e5c842cd..c6ca1037f64086 100644 --- a/versions/m-/msdfgen.json +++ b/versions/m-/msdfgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d49eb065f4ec389be55189e28ab310178281bfe7", + "version": "1.9.2", + "port-version": 0 + }, { "git-tree": "eade2edd986173003ec960fa30d29226a35ddb68", "version": "1.9.1", From 6388f90f847afe98fb15d8a81935e021ef680a07 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 10 May 2022 05:41:24 +0800 Subject: [PATCH 208/383] [Fakeit] update to 2.1.1 (#24592) * [FakeIt] update to 2.1.1 * update version --- ports/fakeit/portfile.cmake | 4 ++-- ports/fakeit/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fakeit.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/fakeit/portfile.cmake b/ports/fakeit/portfile.cmake index 6b02ad63dc56de..c17a6431181e0a 100644 --- a/ports/fakeit/portfile.cmake +++ b/ports/fakeit/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eranpeer/FakeIt - REF 98979d2784d270514c3d4cde18d4370d1381d866 #v2.1.0 - SHA512 f824d9f2171b2453b43a19ebaf203527ca2e943af9cf5caef435c31dcb3af74ccc9ea6e09cd14875652b887d68e9d1a006cd9543c099b4606e68eeae1ce042f7 + REF 38c118c2be2fe33148545b1c32dc568eeabe1f23 #v2.1.1 + SHA512 32b91a1d2fc156cd2293774fea0196492356411ad2437acde1488e087a62f921e13dd75d850be3d50c380e3d525759273eba5b40771fe140581d5ffaefe16842 HEAD_REF master ) diff --git a/ports/fakeit/vcpkg.json b/ports/fakeit/vcpkg.json index 2f3dfbc5fbe873..837586d55a9fd0 100644 --- a/ports/fakeit/vcpkg.json +++ b/ports/fakeit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fakeit", - "version": "2.1.0", + "version": "2.1.1", "description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.", "homepage": "https://github.com/eranpeer/FakeIt", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 019f111a75bbef..dcf3f0f92a849c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2137,7 +2137,7 @@ "port-version": 0 }, "fakeit": { - "baseline": "2.1.0", + "baseline": "2.1.1", "port-version": 0 }, "fann": { diff --git a/versions/f-/fakeit.json b/versions/f-/fakeit.json index 328716091de5c4..768775ed5468f1 100644 --- a/versions/f-/fakeit.json +++ b/versions/f-/fakeit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2af5c0e3dc6e0f5d2ae288b50f6f8167e830ff69", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "e69fbaa4aed8ea6adf901929dd369ead884b9977", "version": "2.1.0", From f70ecfd8f70a0920c603686ba21fe7a5d78790e8 Mon Sep 17 00:00:00 2001 From: "Stephen E. Baker" Date: Mon, 9 May 2022 17:47:48 -0400 Subject: [PATCH 209/383] [luasocket] update to v3.0.0 (#24606) * [luasocket] Bump to official v3.0.0 release Upstream changed to https://github.com/lunarmodules/luasocket and an actual 3.0.0 release was tagged so we no longer need to point to unversioned commits. * [luasocket] Specify license in manifest * Run vcpkg x-add-version --all --- ports/luasocket/portfile.cmake | 6 +++--- ports/luasocket/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/l-/luasocket.json | 5 +++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake index b48185c8de6840..a951dcdad208fc 100644 --- a/ports/luasocket/portfile.cmake +++ b/ports/luasocket/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO diegonehab/luasocket - REF 5b18e475f38fcf28429b1cc4b17baee3b9793a62 # accessed on 2020-09-14 - SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb + REPO lunarmodules/luasocket + REF v3.0.0 + SHA512 4f93d6c0b602333df50ee4f939cd0419243f6de333472ffebf99334e301143e8cdee3bc1655c29f81608622d6e7850a9bcf6929a6d4748210a70cdb8218a1ec6 HEAD_REF master) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/luasocket/vcpkg.json b/ports/luasocket/vcpkg.json index 0fe9652f2aba97..269310c791f9d8 100644 --- a/ports/luasocket/vcpkg.json +++ b/ports/luasocket/vcpkg.json @@ -1,9 +1,9 @@ { "name": "luasocket", - "version-date": "2020-09-14", - "port-version": 2, + "version": "3.0.0", "description": "LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.", - "homepage": "https://github.com/diegonehab/luasocket", + "homepage": "https://lunarmodules.github.io/luasocket/", + "license": "MIT", "supports": "windows", "dependencies": [ "lua", diff --git a/versions/baseline.json b/versions/baseline.json index dcf3f0f92a849c..c9cfaef1b71ce6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4317,8 +4317,8 @@ "port-version": 1 }, "luasocket": { - "baseline": "2020-09-14", - "port-version": 2 + "baseline": "3.0.0", + "port-version": 0 }, "lunasvg": { "baseline": "2.3.1", diff --git a/versions/l-/luasocket.json b/versions/l-/luasocket.json index 568f5f18145919..d7a4594a125125 100644 --- a/versions/l-/luasocket.json +++ b/versions/l-/luasocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f809809d4b061b2579f41521b20a7c4a0992558", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "94ee0f78bf41cf8d10f7bc25b2305a9a0a33cb36", "version-date": "2020-09-14", From f5537367c1230a79ab51d59eee80a464371ee2b4 Mon Sep 17 00:00:00 2001 From: friendlyanon <1736896+friendlyanon@users.noreply.github.com> Date: Mon, 9 May 2022 23:50:17 +0200 Subject: [PATCH 210/383] [minimp3] Update to 2021-11-30 (#24610) * [minimp3] Update to 2021-11-30 * Add license field to vcpkg.json * Use double quotes for arguments with variables * Update versions hash Co-authored-by: friendlyanon --- ports/minimp3/portfile.cmake | 10 +++++----- ports/minimp3/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/m-/minimp3.json | 5 +++++ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ports/minimp3/portfile.cmake b/ports/minimp3/portfile.cmake index 08ef0703292522..dc795aadb4dd1a 100644 --- a/ports/minimp3/portfile.cmake +++ b/ports/minimp3/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lieff/minimp3 - REF 95864e8e0d3b34402a49ae9af6c66f7e98c13c35 #committed on Nov 27 - SHA512 6e5364a83e882b54fd1eb5ba35ec7c7179b5b5c0ceb2c658615a2306ae0c28252ca8591ec6b515483c6ff0ed608db7eb73fba3d201a20ad4a85ce7b3a091a695 + REF afb604c06bc8beb145fecd42c0ceb5bda8795144 # committed on 2021-11-30 + SHA512 633da0b20982f6f22c87d872c69626b2939ffb4519339cd0c090d7538308007cf633c07af57020cd2332a75c6e7b9bf3ebd5bda1af59dc96a4f0e85ce1b3f751 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/minimp3.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -file(COPY ${SOURCE_PATH}/minimp3_ex.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(COPY "${SOURCE_PATH}/minimp3.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(COPY "${SOURCE_PATH}/minimp3_ex.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/minimp3/vcpkg.json b/ports/minimp3/vcpkg.json index 5fad0a36310ca7..e21253915a99de 100644 --- a/ports/minimp3/vcpkg.json +++ b/ports/minimp3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "minimp3", - "version-string": "2020-12-25", - "port-version": 1, + "version-date": "2021-11-30", "description": "Minimalistic, single-header library for decoding MP3. minimp3 is designed to be small, fast (with SSE and NEON support), and accurate (ISO conformant).", - "homepage": "https://github.com/lieff/minimp3" + "homepage": "https://github.com/lieff/minimp3", + "license": "CC0-1.0" } diff --git a/versions/baseline.json b/versions/baseline.json index c9cfaef1b71ce6..682134f4c29245 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4521,8 +4521,8 @@ "port-version": 2 }, "minimp3": { - "baseline": "2020-12-25", - "port-version": 1 + "baseline": "2021-11-30", + "port-version": 0 }, "minio-cpp": { "baseline": "2022-01-03", diff --git a/versions/m-/minimp3.json b/versions/m-/minimp3.json index 415f3d8c8be1da..73663162f7ce6e 100644 --- a/versions/m-/minimp3.json +++ b/versions/m-/minimp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2997f9c06f0831c803fca134a599171dc2399bc4", + "version-date": "2021-11-30", + "port-version": 0 + }, { "git-tree": "4ed9d5474095c5aaecd2fc4ccab507523dd98241", "version-string": "2020-12-25", From f37a58300990a2aec13855194d0b299db646a965 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 10 May 2022 05:53:44 +0800 Subject: [PATCH 211/383] [ktx] update to 4.1.0-rc1 (#24620) * update ktx to 4.1.0-rc1 * remove useless file * change to version-semver --- ports/ktx/0001-Use-vcpkg-zstd.patch | 46 ++++++++++++++--------------- ports/ktx/portfile.cmake | 6 ++-- ports/ktx/vcpkg.json | 4 +-- versions/baseline.json | 4 +-- versions/k-/ktx.json | 5 ++++ 5 files changed, 35 insertions(+), 30 deletions(-) diff --git a/ports/ktx/0001-Use-vcpkg-zstd.patch b/ports/ktx/0001-Use-vcpkg-zstd.patch index 8dff4a59a9004e..47a798eabe60b5 100644 --- a/ports/ktx/0001-Use-vcpkg-zstd.patch +++ b/ports/ktx/0001-Use-vcpkg-zstd.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0bdb708..356c160 100644 +index 8ca40f8..84fcb18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -121,7 +121,6 @@ set(KTX_MAIN_SRC +@@ -174,7 +174,6 @@ set(KTX_MAIN_SRC lib/basisu/transcoder/basisu_transcoder.cpp lib/basisu/transcoder/basisu_transcoder.h lib/basisu/transcoder/basisu.h @@ -10,31 +10,31 @@ index 0bdb708..356c160 100644 lib/checkheader.c lib/dfdutils/createdfd.c lib/dfdutils/colourspaces.c -@@ -227,7 +226,6 @@ macro(commom_lib_settings lib write) +@@ -284,7 +283,6 @@ macro(commom_lib_settings lib write) $ - $ + $ - $ $ $ -@@ -309,6 +307,11 @@ macro(commom_lib_settings lib write) +@@ -361,6 +359,11 @@ macro(commom_lib_settings lib write) endif() if(WIN32) + find_package(zstd CONFIG REQUIRED) + target_link_libraries( -+ ${lib} ++ ${lib} PRIVATE + $,zstd::libzstd_shared,zstd::libzstd_static> -+ ) - # By wrapping in generator expression we force multi configuration generators (like Visual Studio) - # to take the exact path and not change it. - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${KTX_BUILD_DIR}/$>) ++ ) + # By wrapping in generator expression we force multi configuration + # generators (like Visual Studio) to take the exact path and not + # change it. diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt -index 78dd110..e155896 100644 +index 492233a..8786d16 100644 --- a/lib/basisu/CMakeLists.txt +++ b/lib/basisu/CMakeLists.txt -@@ -118,7 +118,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST} +@@ -146,7 +146,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST} ) if (ZSTD) @@ -43,7 +43,7 @@ index 78dd110..e155896 100644 endif() if (APPLE) -@@ -137,6 +137,10 @@ else() +@@ -165,6 +165,10 @@ else() target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0) endif() @@ -52,13 +52,13 @@ index 78dd110..e155896 100644 +endif() + if (NOT MSVC) - target_link_libraries(basisu m pthread) - endif() + # For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us. + if (OPENCL_FOUND) diff --git a/lib/basisu/webgl/encoder/CMakeLists.txt b/lib/basisu/webgl/encoder/CMakeLists.txt -index e365e1b..6e6a7a5 100644 +index 588d91b..0b38012 100644 --- a/lib/basisu/webgl/encoder/CMakeLists.txt +++ b/lib/basisu/webgl/encoder/CMakeLists.txt -@@ -36,9 +36,7 @@ if (EMSCRIPTEN) +@@ -34,9 +34,7 @@ if (EMSCRIPTEN) ) if (KTX2_ZSTANDARD) @@ -69,19 +69,19 @@ index e365e1b..6e6a7a5 100644 set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) else() set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) -@@ -58,6 +56,10 @@ if (EMSCRIPTEN) +@@ -56,6 +54,10 @@ if (EMSCRIPTEN) target_include_directories(basis_encoder.js PRIVATE ../../transcoder) + if(ZSTD_LIBRARIES) + target_link_libraries(basis_encoder.js ${ZSTD_LIBRARIES}) + endif() -+ ++ set_target_properties(basis_encoder.js PROPERTIES OUTPUT_NAME "basis_encoder" SUFFIX ".js" diff --git a/lib/basisu/webgl/transcoder/CMakeLists.txt b/lib/basisu/webgl/transcoder/CMakeLists.txt -index 372653d..2e19ece 100644 +index 372653d..f75e3a3 100644 --- a/lib/basisu/webgl/transcoder/CMakeLists.txt +++ b/lib/basisu/webgl/transcoder/CMakeLists.txt @@ -28,9 +28,7 @@ if (EMSCRIPTEN) @@ -95,14 +95,14 @@ index 372653d..2e19ece 100644 set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) else() set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) -@@ -44,7 +42,9 @@ if (EMSCRIPTEN) - target_compile_definitions(basis_transcoder.js PRIVATE NDEBUG BASISD_SUPPORT_UASTC=1 BASISD_SUPPORT_BC7=1 BASISD_SUPPORT_ATC=0 BASISD_SUPPORT_ASTC_HIGHER_OPAQUE_QUALITY=0 BASISD_SUPPORT_PVRTC2=0 BASISD_SUPPORT_FXT1=0 BASISD_SUPPORT_ETC2_EAC_RG11=0 BASISU_SUPPORT_ENCODING=0 ${KTX2_DEFINITION} ${ZSTD_DEFINITION} ) +@@ -45,6 +43,10 @@ if (EMSCRIPTEN) target_compile_options(basis_transcoder.js PRIVATE -O3 -fno-strict-aliasing) target_include_directories(basis_transcoder.js PRIVATE ../../transcoder) -- + + if(ZSTD_LIBRARIES) + target_link_libraries(basis_transcoder.js ${ZSTD_LIBRARIES}) + endif() ++ set_target_properties(basis_transcoder.js PROPERTIES OUTPUT_NAME "basis_transcoder" SUFFIX ".js" diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake index ab105302a515c3..92db9f25873c51 100644 --- a/ports/ktx/portfile.cmake +++ b/ports/ktx/portfile.cmake @@ -1,10 +1,10 @@ -set(PORT_VERSION 4.0.0) +set(PORT_VERSION 4.1.0-rc1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/KTX-Software - REF v${PORT_VERSION} - SHA512 49787cf0230939ae0c737f6080ef483dd27ebd653c16525b469b078511ab72e85aecba9bffe71ed45ce1692e8448b845e60545c39f9333e6d216b20f56595faa + REF af6df0267b07bf5d4278837e5350f97bcbdcc870 #v${PORT_VERSION} + SHA512 00e5c37ec1922bae7903e3b51ac61e44d815bd606e12104c87b3c8d89e04b5d81f8d502712d8d6c9420aa21289c93c6ef01d0a4091062d03aae07b7fbfce5f74 HEAD_REF master FILE_DISAMBIGUATOR 1 PATCHES diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index c2d458df23e22b..f307ce9f88ecb5 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ktx", - "version": "4.0.0", - "port-version": 2, + "version-semver": "4.1.0-rc1", "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGLĀ®, OpenGL ESā„¢ļø and VulkanĀ® textures from them", "homepage": "https://github.com/KhronosGroup/KTX-Software", + "license": "Apache-2.0", "supports": "!(uwp | x86 | arm64)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 682134f4c29245..1ae3cff1499d46 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3297,8 +3297,8 @@ "port-version": 1 }, "ktx": { - "baseline": "4.0.0", - "port-version": 2 + "baseline": "4.1.0-rc1", + "port-version": 0 }, "kubazip": { "baseline": "0.1.19", diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json index 98609c3f7a39b3..14ca1ca066ac67 100644 --- a/versions/k-/ktx.json +++ b/versions/k-/ktx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70ff7e521be27f851d96a9d69016fe3c58abe74d", + "version-semver": "4.1.0-rc1", + "port-version": 0 + }, { "git-tree": "048534e1a90a5e15ebf065ccfc752c9c5fea77c5", "version": "4.0.0", From 19033ddfa6a0b57204ffb29e30cad1a916fcd2f8 Mon Sep 17 00:00:00 2001 From: "Stephen E. Baker" Date: Mon, 9 May 2022 17:57:02 -0400 Subject: [PATCH 212/383] [luasec] upgrade to 1.1.0 (#24609) * [luasec] upgrade to 1.1.0 * [luasec] Replace deprecated functions * Run vcpkg x-add-version --all Co-authored-by: Billy Robert O'Neal III --- ports/luasec/portfile.cmake | 9 ++++----- ports/luasec/vcpkg.json | 14 +++++++++++--- versions/baseline.json | 4 ++-- versions/l-/luasec.json | 5 +++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ports/luasec/portfile.cmake b/ports/luasec/portfile.cmake index 31eed452132055..ee2fff5a6046c7 100644 --- a/ports/luasec/portfile.cmake +++ b/ports/luasec/portfile.cmake @@ -1,5 +1,5 @@ -set(LUASEC_REVISION v1.0.1) -set(LUASEC_HASH 21ae200e40f13a35eebca95cdac25ae13532a3008b2f9ec97a079033b9efde69e81954354453623eb77340368f482d3c69adb26881a6c0d7c4897df31301af93) +set(LUASEC_REVISION v1.1.0) +set(LUASEC_HASH ce08be2c62e97ebfab30e867790874030d404d195ce336b149d9501d652e9b8efe201cc2d0bcbb3be16214d7e4763b5871e45cbc22db758724baab9f7cd78568) if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) @@ -15,12 +15,11 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Remove debug share diff --git a/ports/luasec/vcpkg.json b/ports/luasec/vcpkg.json index 76d24caaa4455c..98f86d809f6665 100644 --- a/ports/luasec/vcpkg.json +++ b/ports/luasec/vcpkg.json @@ -1,14 +1,22 @@ { "name": "luasec", - "version": "1.0.1", - "port-version": 1, + "version": "1.1.0", "maintainers": "Stephen Baker ", "description": "LuaSec depends on OpenSSL, and integrates with LuaSocket to make it easy to add secure connections to any Lua applications or scripts.", "homepage": "https://github.com/brunoos/luasec", + "license": "MIT", "supports": "!(windows & static)", "dependencies": [ "lua", "luasocket", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1ae3cff1499d46..38b2e6442436e7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4313,8 +4313,8 @@ "port-version": 6 }, "luasec": { - "baseline": "1.0.1", - "port-version": 1 + "baseline": "1.1.0", + "port-version": 0 }, "luasocket": { "baseline": "3.0.0", diff --git a/versions/l-/luasec.json b/versions/l-/luasec.json index 29c704691d8713..4881a9987185be 100644 --- a/versions/l-/luasec.json +++ b/versions/l-/luasec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c562198b62737a1b5c47ef51bb4a5a7b46fd3ce", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "ac5ef37f939164b6bc4a63bf7eeec24e8e8c5a79", "version": "1.0.1", From 659b6b5eeacb50ffe25856413960d231ce1a4b58 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 10 May 2022 01:12:37 +0200 Subject: [PATCH 213/383] [many ports] Local license ripe out 1/x (#24432) * [zlib] Use readme as copyright * [soil2] update to 1.3.0 * [bento4] update to 1.6.0-639 * [bento4] fix version db * [zlib] Format manifest * [anglescript] Remove local license * [bustache] Update to master * [bustache] Don't update * version * version * remove version string * remove v * version * version * Fix version database. Co-authored-by: Billy Robert O'Neal III --- ports/angelscript/LICENSE | 13 ----- ports/angelscript/portfile.cmake | 13 +++-- ports/angelscript/vcpkg.json | 2 + ports/bento4/LICENSE | 6 --- .../bento4/fix-install-and-c4996-error.patch | 43 ---------------- ports/bento4/fix-install.patch | 25 ++++++++++ ports/bento4/portfile.cmake | 20 ++++---- ports/bento4/vcpkg.json | 12 +++-- ports/bustache/LICENSE | 4 -- ports/bustache/portfile.cmake | 10 ++-- ports/bustache/vcpkg.json | 15 ++++-- ports/soil2/LICENSE | 7 --- ports/soil2/portfile.cmake | 21 ++++---- ports/soil2/vcpkg.json | 3 +- ports/zlib/LICENSE | 20 -------- ..._mingw.patch => debug-postfix-mingw.patch} | 0 ports/zlib/portfile.cmake | 49 ++++++++----------- ports/zlib/vcpkg.json | 10 +++- versions/a-/angelscript.json | 5 ++ versions/b-/bento4.json | 5 ++ versions/b-/bustache.json | 5 ++ versions/baseline.json | 14 +++--- versions/s-/soil2.json | 5 ++ versions/z-/zlib.json | 5 ++ 24 files changed, 142 insertions(+), 170 deletions(-) delete mode 100644 ports/angelscript/LICENSE delete mode 100644 ports/bento4/LICENSE delete mode 100644 ports/bento4/fix-install-and-c4996-error.patch create mode 100644 ports/bento4/fix-install.patch delete mode 100644 ports/bustache/LICENSE delete mode 100644 ports/soil2/LICENSE delete mode 100644 ports/zlib/LICENSE rename ports/zlib/{add_debug_postfix_on_mingw.patch => debug-postfix-mingw.patch} (100%) diff --git a/ports/angelscript/LICENSE b/ports/angelscript/LICENSE deleted file mode 100644 index ea549c6e657dd9..00000000000000 --- a/ports/angelscript/LICENSE +++ /dev/null @@ -1,13 +0,0 @@ -AngelCode Scripting Library - -Copyright Ā© 2003-2018 Andreas Jƶnsson - -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - - The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - - Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - - This notice may not be removed or altered from any source distribution. diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index 46fb7aa77c3a43..b63ce6d8b96166 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -6,25 +6,24 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES - mark-threads-private.patch + mark-threads-private.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}/angelscript/projects/cmake" ) vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Angelscript) # Copy the addon files if("addons" IN_LIST FEATURES) - file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp") + file(INSTALL "${SOURCE_PATH}/add_on/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/angelscript" FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp") endif() -file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/docs/manual/doc_license.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/angelscript/vcpkg.json b/ports/angelscript/vcpkg.json index 39fd3916ff7171..a7b48cb40f833d 100644 --- a/ports/angelscript/vcpkg.json +++ b/ports/angelscript/vcpkg.json @@ -1,8 +1,10 @@ { "name": "angelscript", "version": "2.35.1", + "port-version": 1, "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.", "homepage": "https://angelcode.com/angelscript", + "license": "Zlib", "supports": "!arm", "dependencies": [ { diff --git a/ports/bento4/LICENSE b/ports/bento4/LICENSE deleted file mode 100644 index c1d00b26c5e495..00000000000000 --- a/ports/bento4/LICENSE +++ /dev/null @@ -1,6 +0,0 @@ -Bento4 is developed by Axiomatic Systems LLC in San Francisco, California. - -This software is available under two different licenses -For applications that are entirely distributable under the terms of the GPL(https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html), the Bento4 GPL license applies. -For applications that cannot be entirely distributable under the terms of the GPL (either the application, or code modules linked with the application are not compatible with the terms of the GPL licence), a non-GPL commercial license is available from Axiomatic Systems LLC. -Contact Gilles Boccon-Gibod (licensing@axiosys.com or bok@bok.net) for more information. \ No newline at end of file diff --git a/ports/bento4/fix-install-and-c4996-error.patch b/ports/bento4/fix-install-and-c4996-error.patch deleted file mode 100644 index c99fdc411a96e8..00000000000000 --- a/ports/bento4/fix-install-and-c4996-error.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f08b2f..fccf2a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,6 +35,8 @@ endif() - - add_library(ap4 STATIC ${AP4_SOURCES}) - -+add_definitions(-D_CRT_SECURE_NO_WARNINGS) -+ - # Includes - include_directories( - ${SOURCE_CORE} -@@ -43,6 +45,14 @@ include_directories( - ${SOURCE_METADATA} - ) - -+# AP4 includes -+file(GLOB AP4_INCLUDES -+ ${SOURCE_CODECS}/*.h -+ ${SOURCE_CORE}/*.h -+ ${SOURCE_CRYPTO}/*.h -+ ${SOURCE_METADATA}/*.h -+) -+ - # Apps - file(GLOB BENTO4_APPS RELATIVE ${SOURCE_ROOT}/Apps ${SOURCE_ROOT}/Apps/*) - foreach(app ${BENTO4_APPS}) -@@ -50,3 +60,13 @@ foreach(app ${BENTO4_APPS}) - add_executable(${binary_name} ${SOURCE_ROOT}/Apps/${app}/${app}.cpp) - target_link_libraries(${binary_name} ap4) - endforeach() -+ -+# Install targets -+install(TARGETS ap4 -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) -+ -+# Install headers -+install(FILES ${AP4_INCLUDES} DESTINATION include) -\ No newline at end of file diff --git a/ports/bento4/fix-install.patch b/ports/bento4/fix-install.patch new file mode 100644 index 00000000000000..5de2edc72c01f9 --- /dev/null +++ b/ports/bento4/fix-install.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6de3bfe..2b2239a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,3 +81,20 @@ foreach(app ${BENTO4_APPS}) + endif() + endforeach() + endif(BUILD_APPS) ++ ++file(GLOB AP4_INCLUDES ++ ${SOURCE_CODECS}/*.h ++ ${SOURCE_CORE}/*.h ++ ${SOURCE_CRYPTO}/*.h ++ ${SOURCE_METADATA}/*.h ++) ++ ++# Install targets ++install(TARGETS ap4 ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++ ++# Install headers ++install(FILES ${AP4_INCLUDES} DESTINATION include/bento4) diff --git a/ports/bento4/portfile.cmake b/ports/bento4/portfile.cmake index 0e5cb143b45773..ae6e04103dad14 100644 --- a/ports/bento4/portfile.cmake +++ b/ports/bento4/portfile.cmake @@ -3,21 +3,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axiomatic-systems/Bento4 - REF v1.5.1-628 - SHA512 2bf44f55307178cc9128e323904acbfaa2f88e06beff26cf27fc0a7707875942de89778a0ee1a8315ef2c3b19754edad77d32fdb74f3d651f03c2623e7a9122d + REF 83c48e6e2a3f8e4be7ad2eddaa0639303184146d # v1.6.0-639 + SHA512 764c1102dc1e2a0f48395427b5b0a96f87d7124cceb61eb24008f245cf1f5f057753307c38f6f7e74d6838d6600c436d8540e94cbca12385cb4fffb02995069b HEAD_REF master - PATCHES fix-install-and-c4996-error.patch + PATCHES + fix-install.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_APPS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Documents/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bento4/vcpkg.json b/ports/bento4/vcpkg.json index d5278c24fb1fee..abaadfba86f62a 100644 --- a/ports/bento4/vcpkg.json +++ b/ports/bento4/vcpkg.json @@ -1,7 +1,13 @@ { "name": "bento4", - "version-string": "1.5.1", - "port-version": 629, + "version": "1.6.0-639", "description": "Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15.", - "homepage": "https://github.com/axiomatic-systems/Bento4" + "homepage": "https://github.com/axiomatic-systems/Bento4", + "license": "GPL-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/bustache/LICENSE b/ports/bustache/LICENSE deleted file mode 100644 index 6d2e4af1fcf09a..00000000000000 --- a/ports/bustache/LICENSE +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2014-2018 Jamboree - -Distributed under the Boost Software License, Version 1.0. (See accompanying -file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/ports/bustache/portfile.cmake b/ports/bustache/portfile.cmake index 24c885770f3900..b720f024933cd6 100644 --- a/ports/bustache/portfile.cmake +++ b/ports/bustache/portfile.cmake @@ -6,16 +6,16 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/bustache/cmake") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/bustache/cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" ) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# No license file --> use Readme +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bustache/vcpkg.json b/ports/bustache/vcpkg.json index 92e11540891e97..fd4f73ddc2e053 100644 --- a/ports/bustache/vcpkg.json +++ b/ports/bustache/vcpkg.json @@ -1,11 +1,20 @@ { "name": "bustache", - "version-string": "1.1.0", - "port-version": 1, + "version": "1.1.0", + "port-version": 2, "description": "C++11 implementation of {{ mustache }}", "homepage": "https://github.com/jamboree/bustache", + "license": "BSL-1.0", "dependencies": [ "boost-unordered", - "boost-utility" + "boost-utility", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/soil2/LICENSE b/ports/soil2/LICENSE deleted file mode 100644 index 02c4106758c7b5..00000000000000 --- a/ports/soil2/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ -Copyright 2018 Matrin Lucas Golini - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/ports/soil2/portfile.cmake b/ports/soil2/portfile.cmake index db31e6d78afa2e..b8c223779758f1 100644 --- a/ports/soil2/portfile.cmake +++ b/ports/soil2/portfile.cmake @@ -1,26 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SpartanJ/soil2 - REF 51023d551d895fb4beb576d726d798ccfe358d34 - SHA512 5ce8b3f04eea674cdef7ee58778e81bcefa5df7afb1013ad28dcd2d502e26915529da8bf06b751b8c350165172866e4f99d4b1081bb6c7ba04ac83a78faba83c + REF ddcb35d13cc4129103de1c1a3cb74b828fe46b4a # 1.3.0 + SHA512 627c7bf4fddd5afef85ba7634c5ec0e10005c700abc1eb07c6346c1604e430c34aa4c33f6ffecbecb3dc2b04de7b855a3f6d923e94f23621ae0184e706358908 HEAD_REF master - PATCHES Workaround-ICE-in-release.patch + PATCHES Workaround-ICE-in-release.patch ) file( COPY - "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" - "${CMAKE_CURRENT_LIST_DIR}/LICENSE" - "${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in" - DESTINATION "${SOURCE_PATH}" + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in" + DESTINATION "${SOURCE_PATH}" ) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_cmake_install() +vcpkg_cmake_install() # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/soil2/vcpkg.json b/ports/soil2/vcpkg.json index aebe61dcf7895e..55acddbbb1086c 100644 --- a/ports/soil2/vcpkg.json +++ b/ports/soil2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "soil2", - "version-date": "2021-05-01", - "port-version": 1, + "version": "1.3.0", "description": "Simple OpenGL Image Library 2", "homepage": "https://github.com/SpartanJ/SOIL2", "license": "MIT-0", diff --git a/ports/zlib/LICENSE b/ports/zlib/LICENSE deleted file mode 100644 index ca5fddfe0d24dc..00000000000000 --- a/ports/zlib/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ - Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu \ No newline at end of file diff --git a/ports/zlib/add_debug_postfix_on_mingw.patch b/ports/zlib/debug-postfix-mingw.patch similarity index 100% rename from ports/zlib/add_debug_postfix_on_mingw.patch rename to ports/zlib/debug-postfix-mingw.patch diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index f1699178f92f8f..66398f322426d2 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -1,28 +1,21 @@ -set(VERSION 1.2.12) - -vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.zlib.net/zlib-${VERSION}.tar.gz" - FILENAME "zlib1212.tar.gz" - SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE_FILE} - REF ${VERSION} + REPO madler/zlib + REF v1.2.12 + SHA512 5b029532a9f5f12ad425c12eccdf1b77c8d91801342c5b5e26ffb539f76a204e6c4882b40f0130f143f2cd38df90e90af2978cf4bb997e1fa3a0d1eff2ca979e + HEAD_REF master PATCHES - "cmake_dont_build_more_than_needed.patch" - "0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch" - "add_debug_postfix_on_mingw.patch" - "0002-android-build-mingw.patch" + cmake_dont_build_more_than_needed.patch + 0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch + debug-postfix-mingw.patch + 0002-android-build-mingw.patch ) # This is generated during the cmake build -file(REMOVE ${SOURCE_PATH}/zconf.h) +file(REMOVE "${SOURCE_PATH}/zconf.h") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSKIP_INSTALL_FILES=ON -DSKIP_BUILD_EXAMPLES=ON @@ -30,27 +23,25 @@ vcpkg_configure_cmake( -DSKIP_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +vcpkg_cmake_install() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Install the pkgconfig file if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc "-lz" "-lzlib") + vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" "-lz" "-lzlib") endif() - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc "-lz" "-lzlibd") + vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" "-lz" "-lzlibd") endif() - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() vcpkg_fixup_pkgconfig() - -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json index d147fad30bfc28..078669f294b6f2 100644 --- a/ports/zlib/vcpkg.json +++ b/ports/zlib/vcpkg.json @@ -1,6 +1,14 @@ { "name": "zlib", "version": "1.2.12", + "port-version": 1, "description": "A compression library", - "homepage": "https://www.zlib.net/" + "homepage": "https://www.zlib.net/", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/a-/angelscript.json b/versions/a-/angelscript.json index e94a026e775bd2..fbd7d66379d898 100644 --- a/versions/a-/angelscript.json +++ b/versions/a-/angelscript.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f2a9b2d8cad46707e241ac52565fa50656c0dad", + "version": "2.35.1", + "port-version": 1 + }, { "git-tree": "342bbf5e5b2f9492dc70589d4f73b9ee2990f6d4", "version": "2.35.1", diff --git a/versions/b-/bento4.json b/versions/b-/bento4.json index a5d351761a194c..96bea9cd746fca 100644 --- a/versions/b-/bento4.json +++ b/versions/b-/bento4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "834cb05380588e07628713420e709264f168a567", + "version": "1.6.0-639", + "port-version": 0 + }, { "git-tree": "bfedfc70c05cececac8e23b744b43619e2ae3125", "version-string": "1.5.1", diff --git a/versions/b-/bustache.json b/versions/b-/bustache.json index 6642c72b7a2fba..5744b051adbea3 100644 --- a/versions/b-/bustache.json +++ b/versions/b-/bustache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "888d4f529ac5ecc9a12049beb50337d237f97e28", + "version": "1.1.0", + "port-version": 2 + }, { "git-tree": "746808aa3bda8d2627ecc6da664cc58ebf57896e", "version-string": "1.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 38b2e6442436e7..698a8c23534705 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -82,7 +82,7 @@ }, "angelscript": { "baseline": "2.35.1", - "port-version": 0 + "port-version": 1 }, "angle": { "baseline": "chromium_4472", @@ -425,8 +425,8 @@ "port-version": 0 }, "bento4": { - "baseline": "1.5.1", - "port-version": 629 + "baseline": "1.6.0-639", + "port-version": 0 }, "berkeleydb": { "baseline": "4.8.30", @@ -1186,7 +1186,7 @@ }, "bustache": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "butteraugli": { "baseline": "2019-05-08", @@ -6605,8 +6605,8 @@ "port-version": 1 }, "soil2": { - "baseline": "2021-05-01", - "port-version": 1 + "baseline": "1.3.0", + "port-version": 0 }, "sokol": { "baseline": "2019-09-09", @@ -7710,7 +7710,7 @@ }, "zlib": { "baseline": "1.2.12", - "port-version": 0 + "port-version": 1 }, "zlib-ng": { "baseline": "2.0.6", diff --git a/versions/s-/soil2.json b/versions/s-/soil2.json index 849a933dbd31c3..187420ec98d5d0 100644 --- a/versions/s-/soil2.json +++ b/versions/s-/soil2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d6004f9bd4f228751d31a1921bb8ece30d3c6eb", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "20e7e06d73b0119e99f870bcffc70be22a7c8287", "version-date": "2021-05-01", diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json index b7830cc6d249e0..523f7374adddea 100644 --- a/versions/z-/zlib.json +++ b/versions/z-/zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecc4c064d4911faf12d8bf5fd6bcd5c556d89774", + "version": "1.2.12", + "port-version": 1 + }, { "git-tree": "9c4edb1fabbd87dd236a200ba55eaf241cd8c8d0", "version": "1.2.12", From 0d7603c4efc351da97b43c1952ba943e76f9b35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 10 May 2022 00:23:32 +0000 Subject: [PATCH 214/383] [vcpkg_setup_pkgconfig_path] Add new functions to set or restore pkgconfig related environment variables (#23429) * [vcpkg_configure_meson] Fix append host path * New functions vcpkg_setup_pkgconfig_path and vcpkg_restore_pkgconfig_path * Fix bug, add cos * Apply suggestions * Apply suggestions * Apply suggestion * doc * Update docs/maintainers/vcpkg_setup_pkgconfig_path.cmake.md Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> * Update scripts/cmake/vcpkg_setup_pkgconfig_path.cmake Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> * Update scripts/cmake/vcpkg_configure_make.cmake * Apply suggestions * Apply suggestion * Apply suggestions Co-authored-by: Victor Romero Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> --- .../z_vcpkg_setup_pkgconfig_path.cmake.md | 11 +++++ docs/maintainers/portfile-functions.md | 1 + scripts/cmake/vcpkg_configure_make.cmake | 22 ++------- scripts/cmake/vcpkg_configure_meson.cmake | 20 ++++---- scripts/cmake/vcpkg_configure_qmake.cmake | 23 ++------- .../cmake/z_vcpkg_setup_pkgconfig_path.cmake | 48 +++++++++++++++++++ scripts/ports.cmake | 1 + 7 files changed, 78 insertions(+), 48 deletions(-) create mode 100644 docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md create mode 100644 scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake diff --git a/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md b/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md new file mode 100644 index 00000000000000..f1a9290a614d75 --- /dev/null +++ b/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md @@ -0,0 +1,11 @@ +# z_vcpkg_setup_pkgconfig_path + +Setup the generated pkgconfig file path to PKG_CONFIG_PATH environment variable or restore PKG_CONFIG_PATH environment variable. + +```cmake +z_vcpkg_setup_pkgconfig_path(BASE_DIRS <"${CURRENT_INSTALLED_DIR}" ...>) +z_vcpkg_restore_pkgconfig_path() +``` + +`z_vcpkg_setup_pkgconfig_path` prepends `lib/pkgconfig` and `share/pkgconfig` directories for the given `BASE_DIRS` to the `PKG_CONFIG_PATH` environment variable. It creates or updates a backup of the previous value. +`z_vcpkg_restore_pkgconfig_path` shall be called when leaving the scope which called `z_vcpkg_setup_pkgconfig_path` in order to restore the original value from the backup. diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 6c7b87fdc859d9..0e6903a8072d25 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -64,6 +64,7 @@ - [z\_vcpkg\_function\_arguments](internal/z_vcpkg_function_arguments.md) - [z\_vcpkg\_get\_cmake\_vars](internal/z_vcpkg_get_cmake_vars.md) - [z\_vcpkg\_prettify\_command\_line](internal/z_vcpkg_prettify_command_line.md) +- [z\_vcpkg\_setup\_pkgconfig\_path](internal/z_vcpkg_setup_pkgconfig_path.md) ## Scripts from Ports diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index a1097b11665889..535941379187a6 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -611,10 +611,6 @@ function(vcpkg_configure_make) endif() endif() debug_message("ENV{LIBS}:$ENV{LIBS}") - vcpkg_find_acquire_program(PKGCONFIG) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT PKGCONFIG STREQUAL "--static") - set(PKGCONFIG "${PKGCONFIG} --static") # Is this still required or was the PR changing the pc files accordingly merged? - endif() # Run autoconf if necessary if (arg_AUTOCONFIG OR requires_autoconfig) @@ -767,13 +763,10 @@ function(vcpkg_configure_make) endif() # Setup PKG_CONFIG_PATH - set(pkgconfig_installed_dir "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/pkgconfig") - set(pkgconfig_installed_share_dir "${CURRENT_INSTALLED_DIR}/share/pkgconfig") - if(ENV{PKG_CONFIG_PATH}) - set(backup_env_pkg_config_path_${current_buildtype} $ENV{PKG_CONFIG_PATH}) - set(ENV{PKG_CONFIG_PATH} "${pkgconfig_installed_dir}${VCPKG_HOST_PATH_SEPARATOR}${pkgconfig_installed_share_dir}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") + if ("${current_buildtype}" STREQUAL "DEBUG") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug") else() - set(ENV{PKG_CONFIG_PATH} "${pkgconfig_installed_dir}${VCPKG_HOST_PATH_SEPARATOR}${pkgconfig_installed_share_dir}") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}") endif() # Setup environment @@ -794,7 +787,6 @@ function(vcpkg_configure_make) set(link_config_backup "$ENV{_LINK_}") set(ENV{_LINK_} "${LINK_ENV_${current_buildtype}}") endif() - set(ENV{PKG_CONFIG} "${PKGCONFIG}") vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH) # LD_LIBRARY_PATH) foreach(lib_env_var IN LISTS lib_env_vars) @@ -834,13 +826,7 @@ function(vcpkg_configure_make) file(RENAME "${target_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/config.log-${TARGET_TRIPLET}-${short_name_${current_buildtype}}.log") endif() endif() - - if(backup_env_pkg_config_path_${current_buildtype}) - set(ENV{PKG_CONFIG_PATH} "${backup_env_pkg_config_path_${current_buildtype}}") - else() - unset(ENV{PKG_CONFIG_PATH}) - endif() - unset(backup_env_pkg_config_path_${current_buildtype}) + z_vcpkg_restore_pkgconfig_path() if(link_config_backup) set(ENV{_LINK_} "${link_config_backup}") diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 2dc8bd206790c8..352b3e3e874e6f 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -438,13 +438,6 @@ function(vcpkg_configure_meson) vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug']") endif() - if(NOT arg_NO_PKG_CONFIG) - vcpkg_find_acquire_program(PKGCONFIG) - get_filename_component(PKGCONFIG_PATH ${PKGCONFIG} DIRECTORY) - vcpkg_add_to_path("${PKGCONFIG_PATH}") - set(pkgconfig_share_dir "${CURRENT_INSTALLED_DIR}/share/pkgconfig/") - endif() - set(buildtypes) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(buildname "DEBUG") @@ -466,11 +459,12 @@ function(vcpkg_configure_meson) message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}}") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}") #setting up PKGCONFIG - vcpkg_backup_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) if(NOT arg_NO_PKG_CONFIG) - set(ENV{PKG_CONFIG} "${PKGCONFIG}") # Set via native file? - set(pkgconfig_installed_dir "${CURRENT_INSTALLED_DIR}/${path_suffix_${buildtype}}lib/pkgconfig/") - vcpkg_host_path_list(APPEND ENV{PKG_CONFIG_PATH} "${pkgconfig_installed_dir}" "${pkgconfig_share_dir}" "$ENV{PKG_CONFIG_PATH}") + if ("${buildtype}" STREQUAL "DEBUG") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug") + else() + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}") + endif() endif() vcpkg_execute_required_process( @@ -494,7 +488,9 @@ function(vcpkg_configure_meson) endif() message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}} done") - vcpkg_restore_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) + if(NOT arg_NO_PKG_CONFIG) + z_vcpkg_restore_pkgconfig_path() + endif() endforeach() vcpkg_restore_env_variables(VARS INCLUDE) diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index 0bed7567e3c761..bf220787354bcb 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -55,19 +55,8 @@ function(vcpkg_configure_qmake) set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) endif() - vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) - - vcpkg_find_acquire_program(PKGCONFIG) - set(ENV{PKG_CONFIG} "${PKGCONFIG}") - get_filename_component(PKGCONFIG_PATH "${PKGCONFIG}" DIRECTORY) - vcpkg_add_to_path("${PKGCONFIG_PATH}") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} - "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" - "${CURRENT_INSTALLED_DIR}/share/pkgconfig" - "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}" "${CURRENT_PACKAGES_DIR}") set(current_binary_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") @@ -98,15 +87,11 @@ function(vcpkg_configure_qmake) file(RENAME "${current_binary_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-rel.log") endif() - vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) + z_vcpkg_restore_pkgconfig_path() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} - "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" - "${CURRENT_INSTALLED_DIR}/share/pkgconfig" - "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug" "${CURRENT_PACKAGES_DIR}/debug") set(current_binary_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -135,6 +120,8 @@ function(vcpkg_configure_qmake) file(REMOVE "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-dbg.log") file(RENAME "${current_binary_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-dbg.log") endif() + + z_vcpkg_restore_pkgconfig_path() endif() endfunction() diff --git a/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake b/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake new file mode 100644 index 00000000000000..1a275bbac7832a --- /dev/null +++ b/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake @@ -0,0 +1,48 @@ +#[===[ +# z_vcpkg_setup_pkgconfig_path + +`z_vcpkg_setup_pkgconfig_path` sets up environment variables to use `pkgconfig`, such as `PKG_CONFIG` and `PKG_CONFIG_PATH`. +The original values are restored with `z_vcpkg_restore_pkgconfig_path`. `BASE_DIRS` indicates the base directories to find `.pc` files; typically `${CURRENT_INSTALLED_DIR}`, or `${CURRENT_INSTALLED_DIR}/debug`. + +```cmake +z_vcpkg_setup_pkgconfig_path(BASE_DIRS <"${CURRENT_INSTALLED_DIR}" ...>) +# Build process that may transitively invoke pkgconfig +z_vcpkg_restore_pkgconfig_path() +``` + +#]===] +function(z_vcpkg_setup_pkgconfig_path) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "" "BASE_DIRS") + + if(NOT DEFINED arg_BASE_DIRS OR "${arg_BASE_DIRS}" STREQUAL "") + message(FATAL_ERROR "BASE_DIRS is required.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + vcpkg_backup_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) + + vcpkg_find_acquire_program(PKGCONFIG) + get_filename_component(pkgconfig_path "${PKGCONFIG}" DIRECTORY) + vcpkg_add_to_path("${pkgconfig_path}") + + set(ENV{PKG_CONFIG} "${PKGCONFIG}") # Set via native file? + + foreach(base_dir IN LISTS arg_BASE_DIRS) + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${base_dir}/share/pkgconfig/") + endforeach() + + foreach(base_dir IN LISTS arg_BASE_DIRS) + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${base_dir}/lib/pkgconfig/") + endforeach() +endfunction() + +function(z_vcpkg_restore_pkgconfig_path) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + vcpkg_restore_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) +endfunction() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 4d11521b4fb3fc..581969636b4771 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -61,6 +61,7 @@ include("${SCRIPTS}/cmake/z_vcpkg_forward_output_variable.cmake") include("${SCRIPTS}/cmake/z_vcpkg_function_arguments.cmake") include("${SCRIPTS}/cmake/z_vcpkg_get_cmake_vars.cmake") include("${SCRIPTS}/cmake/z_vcpkg_prettify_command_line.cmake") +include("${SCRIPTS}/cmake/z_vcpkg_setup_pkgconfig_path.cmake") function(debug_message) if(PORT_DEBUG) From de74e09d8d36f7d6f33a137d12c4014e62ffa9f5 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 10 May 2022 11:23:48 -0700 Subject: [PATCH 215/383] In https://github.com/microsoft/vcpkg/pull/24432 I noticed that the bento4 license was wrong, but it was a preexisting mistake so I didn't comment. This port is dual licensed under GPL v2 or a proprietary license, which is already described in share/bento4/copyright (#24632) --- ports/bento4/vcpkg.json | 3 ++- versions/b-/bento4.json | 5 +++++ versions/baseline.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/bento4/vcpkg.json b/ports/bento4/vcpkg.json index abaadfba86f62a..9103b59ebb176d 100644 --- a/ports/bento4/vcpkg.json +++ b/ports/bento4/vcpkg.json @@ -1,9 +1,10 @@ { "name": "bento4", "version": "1.6.0-639", + "port-version": 1, "description": "Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15.", "homepage": "https://github.com/axiomatic-systems/Bento4", - "license": "GPL-2.0", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/b-/bento4.json b/versions/b-/bento4.json index 96bea9cd746fca..d56f926704d438 100644 --- a/versions/b-/bento4.json +++ b/versions/b-/bento4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4da8906f31697785969422135a52cb2d0861fe53", + "version": "1.6.0-639", + "port-version": 1 + }, { "git-tree": "834cb05380588e07628713420e709264f168a567", "version": "1.6.0-639", diff --git a/versions/baseline.json b/versions/baseline.json index 698a8c23534705..c08edaff1e707a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -426,7 +426,7 @@ }, "bento4": { "baseline": "1.6.0-639", - "port-version": 0 + "port-version": 1 }, "berkeleydb": { "baseline": "4.8.30", From 5d8b7711b18988375406d72c0c6edb6fd213632d Mon Sep 17 00:00:00 2001 From: Federico Aponte Date: Tue, 10 May 2022 20:35:35 +0200 Subject: [PATCH 216/383] [luajit] Add support for OSX (#24584) * [luajit] Add support for OSX * Apply suggestions from code review Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> * [luajit] Add code review suggestions * Remove MACOSX_DEPLOYMENT_TARGET definition from Makefile * Add usage file * Add license field to manifest file Co-authored-by: Billy O'Neal * [luajit] Remove usage file whose content is controversial Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> --- ...-do-not-set-macosx-deployment-target.patch | 14 ++ ports/luajit/portfile.cmake | 211 +++++++++--------- ports/luajit/vcpkg.json | 5 +- versions/baseline.json | 2 +- versions/l-/luajit.json | 5 + 5 files changed, 128 insertions(+), 109 deletions(-) create mode 100644 ports/luajit/003-do-not-set-macosx-deployment-target.patch diff --git a/ports/luajit/003-do-not-set-macosx-deployment-target.patch b/ports/luajit/003-do-not-set-macosx-deployment-target.patch new file mode 100644 index 00000000000000..0db44b4c30db9d --- /dev/null +++ b/ports/luajit/003-do-not-set-macosx-deployment-target.patch @@ -0,0 +1,14 @@ +diff --git a/src/Makefile b/src/Makefile +index f7f81a4..e6140c4 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -297,9 +297,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector + TARGET_XCFLAGS+= -fno-stack-protector + endif + ifeq (Darwin,$(TARGET_SYS)) +- ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) +- export MACOSX_DEPLOYMENT_TARGET=10.4 +- endif + TARGET_STRIP+= -x + TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC + TARGET_DYNXLDOPTS= diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index fefdc11e82c628..7eaf65aa136621 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -1,106 +1,105 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO LuaJIT/LuaJIT - REF v2.0.5 - SHA512 65d982d7fe532a61335613f414f3b8fa5333747bdf7aefc2c2d52022d227594ade827639049b97e3c4ffae9f38f32cb15f1a17b1780fb0a943e1a3af05e2b576 - HEAD_REF master - PATCHES - 001-fix-build-path.patch - 002-fix-crt-linkage.patch -) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set (LJIT_STATIC "") -else() - set (LJIT_STATIC "static") -endif() - -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - - if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_execute_required_process_repeat( - COUNT 1 - COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - LOGNAME build-${TARGET_TRIPLET}-dbg - ) - - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(COPY ${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) - endif() - vcpkg_copy_pdbs() - else() - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME clean-${TARGET_TRIPLET}-debug - ) - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile PREFIX=${CURRENT_PACKAGES_DIR}/debug CCDEBUG=-g3 CFLAGS=-O0 BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-debug - ) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lua") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() -endif() - - -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) - message(STATUS "Building ${TARGET_TRIPLET}-rel") - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - - if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_execute_required_process_repeat( - COUNT 1 - COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - LOGNAME build-${TARGET_TRIPLET}-rel - ) - - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) - endif() - vcpkg_copy_pdbs() - else() - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME clean-${TARGET_TRIPLET}-rel - ) - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile PREFIX=${CURRENT_PACKAGES_DIR} CCDEBUG= BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-rel - ) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/lua" "${CURRENT_PACKAGES_DIR}/lib/lua") - endif() -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(INSTALL ${SOURCE_PATH}/src/lua.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -file(INSTALL ${SOURCE_PATH}/src/luajit.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -file(INSTALL ${SOURCE_PATH}/src/luaconf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -file(INSTALL ${SOURCE_PATH}/src/lualib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -file(INSTALL ${SOURCE_PATH}/src/lauxlib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -file(INSTALL ${SOURCE_PATH}/src/lua.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LuaJIT/LuaJIT + REF v2.0.5 + SHA512 65d982d7fe532a61335613f414f3b8fa5333747bdf7aefc2c2d52022d227594ade827639049b97e3c4ffae9f38f32cb15f1a17b1780fb0a943e1a3af05e2b576 + HEAD_REF master + PATCHES + 001-fix-build-path.patch + 002-fix-crt-linkage.patch + 003-do-not-set-macosx-deployment-target.patch +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set (LJIT_STATIC "") +else() + set (LJIT_STATIC "static") +endif() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + + if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_execute_required_process_repeat( + COUNT 1 + COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME build-${TARGET_TRIPLET}-dbg + ) + + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") + endif() + vcpkg_copy_pdbs() + else() + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-debug + ) + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile PREFIX=${CURRENT_PACKAGES_DIR}/debug CCDEBUG=-g3 CFLAGS=-O0 BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-debug + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lua") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() +endif() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) + message(STATUS "Building ${TARGET_TRIPLET}-rel") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + + if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_execute_required_process_repeat( + COUNT 1 + COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + LOGNAME build-${TARGET_TRIPLET}-rel + ) + + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) + endif() + vcpkg_copy_pdbs() + else() + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-rel + ) + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile PREFIX=${CURRENT_PACKAGES_DIR} CCDEBUG= BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-rel + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/lua" "${CURRENT_PACKAGES_DIR}/lib/lua") + endif() +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/src/lua.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/src/luajit.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/src/luaconf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/src/lualib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/src/lauxlib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/src/lua.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index 04da3220e3ba26..c6acb5e1ad92d1 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,8 +1,9 @@ { "name": "luajit", "version": "2.0.5", - "port-version": 6, + "port-version": 7, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", - "supports": "!uwp & !osx" + "license": "MIT", + "supports": "!uwp" } diff --git a/versions/baseline.json b/versions/baseline.json index c08edaff1e707a..b8807a6b697df7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4310,7 +4310,7 @@ }, "luajit": { "baseline": "2.0.5", - "port-version": 6 + "port-version": 7 }, "luasec": { "baseline": "1.1.0", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index 8cf378c23a875c..17b0a64301bcfa 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "daf2e19a72e3bf1d8a6c47a38489c9d1bd016d33", + "version": "2.0.5", + "port-version": 7 + }, { "git-tree": "d8d4e2ca9656ec3a26a0ade9f0421e17b11206c7", "version": "2.0.5", From 0e26d200d9366573217650472dccdf2723ff82d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hock?= Date: Tue, 10 May 2022 20:35:54 +0200 Subject: [PATCH 217/383] [stftpitchshift] Update to 1.4.1 (#24599) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add stftpitchshift port * Fix shared library build on Windows * Run vcpkg x-add-version stftpitchshift * Update version database * Just increase the version counter to hopefully fix the vcpkg problem I simply don't understand... šŸ˜” * Now update both sha and version... * Update version database * Fix version database. * Add quotes and modernize cmake helpers. * Update stftpitchshift to v.1.4.1 * Update version database like suggested by bot * Update ports/stftpitchshift/portfile.cmake Funny suggestion, to use some kind of hidden ${PORT} variable just in one place and still the port name string otherwise... Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update version database * Consequently use ${PORT} everywhere... and not just in one place like suggested by Cheney-W * Update stftpitchshift.json * Cheney-W: Thie sentence could be removed, PACKAGE_NAME defaults to ${PORT}. * Update stftpitchshift.json Co-authored-by: Billy Robert O'Neal Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/stftpitchshift/portfile.cmake | 18 ++++++++++++++---- ports/stftpitchshift/vcpkg.json | 7 ++++++- versions/baseline.json | 2 +- versions/s-/stftpitchshift.json | 5 +++++ 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/ports/stftpitchshift/portfile.cmake b/ports/stftpitchshift/portfile.cmake index ecf27ef9ac5090..1b6c2232e1d8b3 100644 --- a/ports/stftpitchshift/portfile.cmake +++ b/ports/stftpitchshift/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jurihock/stftPitchShift HEAD_REF main - REF e25def2f6aad9db865aded9f0550fd1c7925188f - SHA512 a7e9343ede83eb7d37a231e3db80659f8fa7c61c70811618c75a817fcc94902f5fa4582f81e4473a0e137f12c2eaf17025a057a7ef7c4b348451454e39b3fa2f + REF v1.4.1 + SHA512 69e68af5baeb1bbeae440d2b2dc7a510a72b8b49cd9b23e0934eb8070d31c9a2e98759ea6d609f81caa3c57e1615cc50028dd13a9d04e82725a41da79175a868 ) vcpkg_cmake_configure( @@ -14,6 +14,16 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/stftpitchshift" RENAME copyright) +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" +) + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file( + REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" +) diff --git a/ports/stftpitchshift/vcpkg.json b/ports/stftpitchshift/vcpkg.json index f11f71221e390a..dea081ce336450 100644 --- a/ports/stftpitchshift/vcpkg.json +++ b/ports/stftpitchshift/vcpkg.json @@ -1,11 +1,16 @@ { "name": "stftpitchshift", - "version": "1.3.2", + "version": "1.4.1", "description": "STFT based multi pitch shifting with optional formant preservation.", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index b8807a6b697df7..9da5e91d8da847 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6789,7 +6789,7 @@ "port-version": 2 }, "stftpitchshift": { - "baseline": "1.3.2", + "baseline": "1.4.1", "port-version": 0 }, "stlab": { diff --git a/versions/s-/stftpitchshift.json b/versions/s-/stftpitchshift.json index d04954fabb6ffc..1ebb0bc55f0913 100644 --- a/versions/s-/stftpitchshift.json +++ b/versions/s-/stftpitchshift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36932b4bd7c57fdc63ae75ec5117f6321e3c2ca6", + "version": "1.4.1", + "port-version": 0 + }, { "git-tree": "1f4a495416b6e2e3a830c8ba72eb5cf9034c68cc", "version": "1.3.2", From 3c1e65c20920ada5cf042b2f41f5c9618a72e3f0 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 10 May 2022 11:36:05 -0700 Subject: [PATCH 218/383] [cppgraphqlgen] Update to v4.3.1 (#24607) * [cppgraphqlgen] Update to v4.3.1 * vcpkg x-add-version --all * Update ports/cppgraphqlgen/vcpkg.json Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> * vcpkg x-add-version cppgraphqlgen --overwrite-version Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> --- ports/cppgraphqlgen/portfile.cmake | 4 ++-- ports/cppgraphqlgen/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cppgraphqlgen.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 66a0b0190f65e9..a2d121a4d99870 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cppgraphqlgen - REF v4.2.0 - SHA512 81dd9d81c7f05470b2bfd106e75b54aa79ae15085b43daab68b4ce4784c5b1885e5eb342e4c29c3131e79d566627b7cf46901311c51c18334b440f4744c44142 + REF v4.3.1 + SHA512 22c453d9617ce420c194edc9a73ffb6b1b48722e24186d4b76bc36d9dd64a8720aa3f85905d43b07c3e31781ef30a945f935ca216dc464f16a1c088380dea4e6 HEAD_REF main ) diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json index d19e8d7f19f9ae..5209f9d50a1b05 100644 --- a/ports/cppgraphqlgen/vcpkg.json +++ b/ports/cppgraphqlgen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppgraphqlgen", - "version-semver": "4.2.0", + "version": "4.3.1", "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 9da5e91d8da847..f6acb5e682b68b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1609,7 +1609,7 @@ "port-version": 1 }, "cppgraphqlgen": { - "baseline": "4.2.0", + "baseline": "4.3.1", "port-version": 0 }, "cppitertools": { diff --git a/versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json index 42beb76497077c..b4c5accad41538 100644 --- a/versions/c-/cppgraphqlgen.json +++ b/versions/c-/cppgraphqlgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c3acfd5254a4ae0680cc3f96eef630bcaab7b36", + "version": "4.3.1", + "port-version": 0 + }, { "git-tree": "c8d2246a2df1d89e380901d0027220ca7a91531d", "version-semver": "4.2.0", From 62335b3b40c04d521dffb5b47500e842f4bcf6b5 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Wed, 11 May 2022 02:36:17 +0800 Subject: [PATCH 219/383] [teemo] Update v2.7 (#24624) * [teemo] Update to v2.7 * [teemo] Format manifest * [teemo] Update to v2.7 --- ports/teemo/portfile.cmake | 4 ++-- ports/teemo/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/t-/teemo.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/teemo/portfile.cmake b/ports/teemo/portfile.cmake index 6d0a1a7ee6a7bd..a6db3539602246 100644 --- a/ports/teemo/portfile.cmake +++ b/ports/teemo/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/teemo - REF abfff2b724f3ae9f7968392178005f648fe666e3 - SHA512 56b1791159179c7f84523bf3d4b21f5272fce11843da0f0993e58563414a11637ccee50fe5a520089e16df5e17acf2308c2993266156ee49d9d07b1d7211f151 + REF 03f40f92bfbf3b83dc597a60ba36582505adfa54 + SHA512 86962883dfe09f90c4892deb0235e4f71fc295fb837e2b33a9bcf240b4f91d0e191157968d28a6ec02dfe3f8cb9a3869c6bb5986b8a0ea96250fce6c27fe1172 HEAD_REF master ) diff --git a/ports/teemo/vcpkg.json b/ports/teemo/vcpkg.json index ed999e2ebac17a..c4428ccf1bd66f 100644 --- a/ports/teemo/vcpkg.json +++ b/ports/teemo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "teemo", - "version": "2.6", - "port-version": 1, + "version": "2.7", "maintainers": "winsoft666 ", "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.", "homepage": "https://github.com/winsoft666/teemo", diff --git a/versions/baseline.json b/versions/baseline.json index f6acb5e682b68b..16d157b4d77c24 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6889,8 +6889,8 @@ "port-version": 4 }, "teemo": { - "baseline": "2.6", - "port-version": 1 + "baseline": "2.7", + "port-version": 0 }, "telnetpp": { "baseline": "2.1.2", diff --git a/versions/t-/teemo.json b/versions/t-/teemo.json index f06a0abfec997f..d45946f79526c4 100644 --- a/versions/t-/teemo.json +++ b/versions/t-/teemo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58d7f598471297c1dad7372349f2c5a66c118659", + "version": "2.7", + "port-version": 0 + }, { "git-tree": "6eff96ba13b50bd8a7b7b3d1197fdbda11c09712", "version": "2.6", From a6a97cd1fc6fa30a836d6551d89cba04f0281cbe Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 10 May 2022 11:36:36 -0700 Subject: [PATCH 220/383] [google-cloud-cpp] add missing subpackage (#24626) --- ports/google-cloud-cpp/portfile.cmake | 2 +- ports/google-cloud-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 9cbe00fc6cd2b9..fca68939490aec 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -47,7 +47,7 @@ foreach(feature IN LISTS FEATURES) endforeach() # These packages are automatically installed depending on what features are # enabled. -foreach(suffix common googleapis grpc_utils) +foreach(suffix common googleapis grpc_utils rest_internal) set(config_path "lib/cmake/google_cloud_cpp_${suffix}") if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") continue() diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 718e0ee4f04dcf..4c8421d9e2112b 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "google-cloud-cpp", "version": "1.40.1", + "port-version": 1, "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 16d157b4d77c24..7155754826f6e7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2590,7 +2590,7 @@ }, "google-cloud-cpp": { "baseline": "1.40.1", - "port-version": 0 + "port-version": 1 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 056d907a3019b8..f15cf1bbf32c59 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "506bdfbf9040c856f8f3a4a2c183da38f9030817", + "version": "1.40.1", + "port-version": 1 + }, { "git-tree": "2a18f7bea0f4811da422b3099c4331305cb1f617", "version": "1.40.1", From acca474962d8bc714ba555ec0c21b0dabee4e79d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 10 May 2022 20:37:35 +0200 Subject: [PATCH 221/383] [lerc] Update to 3.0, move config to unofficial (#24634) * Update to 3.0 * Modernize portfile * Install NOTICE as required by license * Move CMake config to unofficial namespace The target name changed, so old configs would break anyways, without polyfill. The unofficial namespace reflects such risks. * Add include path to CMake config * Update versions --- ports/lerc/create_package.patch | 23 ++++++++------------ ports/lerc/enable_static_build.patch | 16 -------------- ports/lerc/install_lib_to_archive_path.patch | 16 -------------- ports/lerc/portfile.cmake | 20 +++++++---------- ports/lerc/vcpkg.json | 16 +++++++++++--- versions/baseline.json | 4 ++-- versions/l-/lerc.json | 5 +++++ 7 files changed, 37 insertions(+), 63 deletions(-) delete mode 100644 ports/lerc/enable_static_build.patch delete mode 100644 ports/lerc/install_lib_to_archive_path.patch diff --git a/ports/lerc/create_package.patch b/ports/lerc/create_package.patch index 7b06c119ba3f66..166c3f43bc030b 100644 --- a/ports/lerc/create_package.patch +++ b/ports/lerc/create_package.patch @@ -1,26 +1,21 @@ - CMakeLists.txt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt index e90fcdd..17c79e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ add_library(LercLib ${SOURCES}) - target_link_libraries (LercLib) +@@ -26,9 +26,16 @@ add_library(LercLib ${SOURCES}) + endif() install( -- TARGETS LercLib -+ TARGETS LercLib EXPORT LercTargets + TARGETS Lerc ++ EXPORT LercTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -28,3 +28,9 @@ install( - FILES "include/Lerc_types.h" "include/Lerc_c_api.h" - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) -+ ++target_include_directories(Lerc PUBLIC "$") +install(EXPORT LercTargets -+ FILE lercConfig.cmake -+ NAMESPACE Esri:: -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/lerc" ++ FILE unofficial-lerc-config.cmake ++ NAMESPACE unofficial::Lerc:: ++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-lerc" +) diff --git a/ports/lerc/enable_static_build.patch b/ports/lerc/enable_static_build.patch deleted file mode 100644 index 92f0d7852c8254..00000000000000 --- a/ports/lerc/enable_static_build.patch +++ /dev/null @@ -1,16 +0,0 @@ - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d22ad11..e90fcdd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,7 +12,7 @@ file(GLOB SOURCES - ) - message(${SOURCES}) - --add_library(LercLib SHARED ${SOURCES}) -+add_library(LercLib ${SOURCES}) - - target_link_libraries (LercLib) - diff --git a/ports/lerc/install_lib_to_archive_path.patch b/ports/lerc/install_lib_to_archive_path.patch deleted file mode 100644 index 3262a7ca55c528..00000000000000 --- a/ports/lerc/install_lib_to_archive_path.patch +++ /dev/null @@ -1,16 +0,0 @@ - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ececeed..d22ad11 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,7 +20,7 @@ install( - TARGETS LercLib - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) - diff --git a/ports/lerc/portfile.cmake b/ports/lerc/portfile.cmake index 5b3060f434020b..2b92c7022d40d4 100644 --- a/ports/lerc/portfile.cmake +++ b/ports/lerc/portfile.cmake @@ -1,24 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Esri/lerc - REF v2.2 - SHA512 5ddf1e8f0c123d3c1329e980021e25e6ff9b79c96588115e5b48ba7637f0b2bf3ebb2ab6ebf94cfbde45ea1521f14405f669e23f0b74d9ae8f9b2cf80a908215 + REF v3.0 + SHA512 8e04d890c4d46528641b354ec3f47f2b0563e1740927ac894925a30f7de2b235cb3517ce7e477886bd3eb50ebd6c6e78f22d73d5500877e552d9e684e626293b HEAD_REF master PATCHES - "install_lib_to_archive_path.patch" - "enable_static_build.patch" "create_package.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) - -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lerc) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - +file(INSTALL "${SOURCE_PATH}/NOTICE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lerc/vcpkg.json b/ports/lerc/vcpkg.json index 6772a248b35261..22939ae2f99f00 100644 --- a/ports/lerc/vcpkg.json +++ b/ports/lerc/vcpkg.json @@ -1,7 +1,17 @@ { "name": "lerc", - "version-string": "2.2", - "port-version": 2, + "version": "3.0", "description": "An open-source image or raster format which supports rapid encoding and decoding for any pixel type", - "homepage": "https://github.com/Esri/lerc" + "homepage": "https://github.com/Esri/lerc", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 7155754826f6e7..a106b41d4f524c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3369,8 +3369,8 @@ "port-version": 0 }, "lerc": { - "baseline": "2.2", - "port-version": 2 + "baseline": "3.0", + "port-version": 0 }, "lest": { "baseline": "1.35.1", diff --git a/versions/l-/lerc.json b/versions/l-/lerc.json index d414aab0e614f8..a65b52371a1514 100644 --- a/versions/l-/lerc.json +++ b/versions/l-/lerc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3037b9fd610059bc84e89607a3e58aa13641cdd8", + "version": "3.0", + "port-version": 0 + }, { "git-tree": "81c91f19fa142f53370b1a7ecac53fd2ba10aaf6", "version-string": "2.2", From 14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 10 May 2022 15:54:52 -0700 Subject: [PATCH 222/383] Update vcpkg-tool to 2022-05-05 (#24526) * Update vcpkg-tool to 2022-05-03 * Remove unused --x-xunit call. * Actually 2022-05-05 --- scripts/azure-pipelines/test-modified-ports.ps1 | 6 +----- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 4fb4a180b58235..dd8e25fdcab858 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -115,10 +115,6 @@ else { $executableExtension = '.exe' } -$xmlResults = Join-Path $ArtifactStagingDirectory 'xml-results' -mkdir $xmlResults -$xmlFile = Join-Path $xmlResults "$Triplet.xml" - $failureLogs = Join-Path $ArtifactStagingDirectory 'failure-logs' if ($IsWindows) @@ -166,7 +162,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) # but changes must trigger at least some testing. Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" -& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --x-xunit=$xmlFile --failure-logs=$failureLogs "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg +& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --failure-logs=$failureLogs "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index ea1edb8e87a645..3c18f30f29abad 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-03-30' +$versionDate = '2022-05-05' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 474d56cfea4190..157c7585a7aae4 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-03-30" +vcpkgToolReleaseTag="2022-05-05" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="8bf65bc52b48c0c048c465036dfab60c0d6b84d2c61bf36c948b58d2da0a6f9f21b00dbc888fe5b163c275e901a0014482e50895ee607408cf533057b66a4e73" + vcpkgToolReleaseSha="d1bc1de6185892b90641256ac509aac88b6c23d5f4875038d071b4518f33d852d7519346a78d79913748991203a9474632d59645c788b1fe56f74938327bb90f" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="d5a0a67ef966b1db5ded37986ccabd8a6dc2531209e07945c32679faab45c0f001b95eef342e41f8937234e8efa6b038847b78f77c19d949a7d2aa7857b6a019" + vcpkgToolReleaseSha="d698b5c37438eb03846d3908a67a7b955242d4e73c069ac4668de3be5fee8c21bf7ff0d291f5b85c6415fae70ca8d3ff926a757eb5aeda8b5d112d24c6874133" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="14dae353ce576e688cd93f0607f4eb7d724fb34f4c78c62d90db0c0fc4806e21c0da2b4fbe0b2a776ac3e8c669685e8d26990b5828be252645ac9289c7d015f9" + vcpkgToolReleaseSha="bd1c24f113acee53c458b204b2443bb3a2e129f0df7f2772c83876e97e7788e9151d0ab92248ed5ee7cecf1152569ccb1050f174e70a7a21d7da8a580c73c132" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="d1fba2655e04dbf599129e688b40be6b61cc23c41943b5d0d4ac23a7cb5df195fadfe252a8c9ea619d4730352eb40e424ef50919ecfad6e52a76b2b4627dbb16" + vcpkgToolReleaseSha="9968b2420c19ac88fd912aa0d3d230a4712d51c411a7f5023c4a5d96c5fcc963ce8fbb286594220b5dfc63e23bdbcf3439326b90262dd89ea5b63afa143ca699" fi # Do the download or build. From 0a1420dc443a2c8fc135ef88bbf96af57263e911 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 11 May 2022 15:05:24 +0800 Subject: [PATCH 223/383] [arrow] add cuda to feature list (#24570) * add cuda support * remove supports for cuda --- ports/arrow/portfile.cmake | 1 + ports/arrow/vcpkg.json | 8 +++++++- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 972be66415ada3..1aa93020f7e779 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -34,6 +34,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS parquet PARQUET_REQUIRE_ENCRYPTION plasma ARROW_PLASMA s3 ARROW_S3 + cuda ARROW_CUDA ) if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 1c2b84085435f0..bab2dfe3274fcd 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrow", "version": "7.0.0", - "port-version": 2, + "port-version": 3, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", @@ -41,6 +41,12 @@ "csv": { "description": "CSV support" }, + "cuda": { + "description": "cuda support", + "dependencies": [ + "cuda" + ] + }, "dataset": { "description": "Dataset support" }, diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 66bc46896e2ef4..d810dc21ecd881 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9beefb8449a167f6dbcbe35a2bd2b7d3cb2889a2", + "version": "7.0.0", + "port-version": 3 + }, { "git-tree": "3d3371b4741fc81354b2033d584c48a1929373f4", "version": "7.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index a106b41d4f524c..f73dbd95e28c4f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -170,7 +170,7 @@ }, "arrow": { "baseline": "7.0.0", - "port-version": 2 + "port-version": 3 }, "ashes": { "baseline": "2022-04-03", From 74ff2a04415691361b07b7dbd1d4762ad79bd82c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 11 May 2022 12:18:31 -0700 Subject: [PATCH 224/383] [docs] Add catalog release process. (#24647) * [docs] Add catalog release process. Also fixes https://github.com/microsoft/vcpkg/issues/23387 Also sorts added and changed ports by port name in the generated release notes Also makes the formatting more consistent with GitHub's default generated release notes ("by foo, in #bar") * Fix docs links. * Add a space for additional PRs for new ports. --- .../internal/vcpkg_catalog_release_process.md | 14 ++++++++++++ scripts/Get-Changelog.ps1 | 22 ++++++++----------- 2 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 docs/maintainers/internal/vcpkg_catalog_release_process.md diff --git a/docs/maintainers/internal/vcpkg_catalog_release_process.md b/docs/maintainers/internal/vcpkg_catalog_release_process.md new file mode 100644 index 00000000000000..0ea8922d58cb62 --- /dev/null +++ b/docs/maintainers/internal/vcpkg_catalog_release_process.md @@ -0,0 +1,14 @@ +# vcpkg_tool_release_process + +This document describes the acceptance criteria / process we use when doing a vcpkg release. + +1. Generate a new GitHub Personal Access Token with repo permissions. +2. Using the PAT, invoke $/scripts/Get-Changelog.ps1 `-StartDate (previous release date) -EndDate (Get-Date) -OutFile path/to/results.md` +3. Create a new GitHub release in this repo. +4. Submit a vcpkg.ci (full tree rebuild) run with the same SHA as that release. +5. Use the "auto-generate release notes". Copy the "new contributors" and "full changelog" parts to the end of `path/to/results.md`. +6. Change `## New Contributors` to `#### New Contributors` +7. In `path/to/results.md`, update `LINK TO BUILD` with the most recent link to vcpkg.ci run. +8. In `path/to/results.md`, fill out the tables for number of existing ports and successful ports. +9. Replace the contents of the release notes with the contents of `path/to/results.md` +10. After the full rebuild submission completes, update the link to the one for the exact SHA, the counts, and remove "(tentative)". diff --git a/scripts/Get-Changelog.ps1 b/scripts/Get-Changelog.ps1 index 68f02957e3b6a8..5beebce6ecaea8 100644 --- a/scripts/Get-Changelog.ps1 +++ b/scripts/Get-Changelog.ps1 @@ -405,7 +405,7 @@ $output = @" vcpkg ($($StartDate.ToString('yyyy.MM.dd')) - $((($EndDate).AddSeconds(-1)).ToString('yyyy.MM.dd'))) --- #### Total port count: -#### Total port count per triplet (tested): +#### Total port count per triplet (tested) (tentative): LINK TO BUILD |triplet|ports available| |---|---| |x86-windows|NUM| @@ -424,12 +424,12 @@ if ($UpdatedDocumentation) { $output += @" #### The following documentation has been updated: -$(-join ($UpdatedDocumentation | ForEach-Object { +$(-join ($UpdatedDocumentation | Sort-Object -Property 'Path' | ForEach-Object { $PathWithoutDocs = ([string]$_.Path).Remove(0, 5) # 'docs/' - "- [{0}]({0}){1}`n" -f $PathWithoutDocs, $_.Path, ($(if ($_.New) { ' ***[NEW]***' } else { '' })) + "- [{0}](https://github.com/microsoft/vcpkg/blob/master/docs/{0}){1}`n" -f $PathWithoutDocs, ($(if ($_.New) { ' ***[NEW]***' } else { '' })) $_.Pulls | ForEach-Object { - " - [(#{0})]({1}) {2} (by @{3})`n" -f $_.number, $_.html_url, $_.title, $_.user.login + " - {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number } })) @@ -443,13 +443,13 @@ if ($NewPorts) { |port|version| |---|---| -$(-join ($NewPorts | ForEach-Object { +$(-join ($NewPorts | Sort-Object -Property 'Port' | ForEach-Object { "|[{0}]({1})" -f $_.Port, $_.Pulls[0].html_url if ($_.Pulls.Length -gt 1 ) { '' $_.Pulls[1..($_.Pulls.Length - 1)] | ForEach-Object { - "[#{0}]({1})" -f $_.number, $_.html_url + " #{0}" -f $_.number } '' } @@ -466,13 +466,13 @@ if ($ChangedPorts) {
The following $($ChangedPorts.Length) ports have been updated: -$(-join ($ChangedPorts | ForEach-Object { +$(-join ($ChangedPorts | Sort-Object -Property 'Port' | ForEach-Object { "- {0} ``{1}#{2}``" -f $_.Port, $_.Version.Begin, $_.Version.BeginPort ' -> ' "``{0}#{1}```n" -f $_.Version.End, $_.Version.EndPort $_.Pulls | ForEach-Object { - " - [(#{0})]({1}) {2} (by @{3})`n" -f $_.number, $_.html_url, $_.title, $_.user.login + " - {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number } }))
@@ -486,17 +486,13 @@ if ($UpdatedInfrastructure) { The following additional changes have been made to vcpkg's infrastructure: $(-join ($UpdatedInfrastructure | ForEach-Object { - "- [(#{0})]({1}) {2} (by @{3})`n" -f $_.number, $_.html_url, $_.title, $_.user.login + "- {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number })) "@ } -$output += @" --- vcpkg team vcpkg@microsoft.com $(Get-Date -UFormat "%a, %d %B %T %Z00") -"@ - Set-Content -Value $Output -Path $OutFile Write-Progress -Activity 'Writing changelog file' -Completed From a563603129ba9a084a606b127a0a9a67305e418f Mon Sep 17 00:00:00 2001 From: panda-z Date: Thu, 12 May 2022 07:27:53 +0800 Subject: [PATCH 225/383] [cgns] Update to 4.3.0 (#24531) * [cgns] update to 4.3.0 * [cgns] update CI baseline * Fix version database. * CMake nitpicks * Use rename rather than copy and remove * Add quotes * Guard explicit references to debug in case the user is using a release-only triplet. * Use in lists * Convert hdf5.patch from CRLF to LF * update version * LIOSTS => LISTS * Revert cgnstools feature * update version Co-authored-by: Billy Robert O'Neal Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/cgns/hdf5.patch | 89 +++++++++++++------------------------ ports/cgns/linux_lfs.patch | 8 ++-- ports/cgns/portfile.cmake | 91 +++++++++++++++++++------------------- ports/cgns/vcpkg.json | 12 ++++- versions/baseline.json | 2 +- versions/c-/cgns.json | 5 +++ 6 files changed, 97 insertions(+), 110 deletions(-) diff --git a/ports/cgns/hdf5.patch b/ports/cgns/hdf5.patch index 67d08fa2d88b2d..82316913d5bed9 100644 --- a/ports/cgns/hdf5.patch +++ b/ports/cgns/hdf5.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d871a9dc8..d2c631023 100644 +index 60f9de4..e980ef7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -232,46 +232,12 @@ if (CGNS_ENABLE_HDF5) +@@ -261,51 +261,12 @@ if (CGNS_ENABLE_HDF5) cmake_policy(SET CMP0074 NEW) endif() @@ -10,79 +10,52 @@ index d871a9dc8..d2c631023 100644 - message (STATUS "HDF5 C libs:${HDF5_FOUND} static:${HDF5_static_C_FOUND} and shared:${HDF5_shared_C_FOUND}") - if (HDF5_FOUND) - if (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) -- set (FIND_HDF_COMPONENTS C) +- if (CG_HDF5_LINK_TYPE STREQUAL "shared") +- set(CG_HDF5_LINK_TYPE "static") +- set(CG_HDF5_LINK_TYPE_UPPER "STATIC") +- else() +- set(CG_HDF5_LINK_TYPE "shared") +- set(CG_HDF5_LINK_TYPE_UPPER "SHARED") +- endif() - -- find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS}) -- message (STATUS "HDF5 libs:${HDF5_FOUND} C:${HDF5_C_FOUND}") -- set (LINK_LIBS ${LINK_LIBS} ${HDF5_LIBRARIES}) -- if (HDF5_BUILD_SHARED_LIBS) -- add_definitions (-DH5_BUILT_AS_DYNAMIC_LIB) -- else (HDF5_BUILD_SHARED_LIBS) -- add_definitions (-DH5_BUILT_AS_STATIC_LIB) -- endif (HDF5_BUILD_SHARED_LIBS) -- else (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) -- if (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND) -- set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_SHARED_LIBRARY}) -- else (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND) -- set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_STATIC_LIBRARY}) -- endif (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND) -- endif (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) +- set (FIND_HDF_COMPONENTS C ${CG_HDF5_LINK_TYPE}) - -- else (HDF5_FOUND) +- find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS} REQUIRED) +- message (STATUS "HDF5 libs:${HDF5_FOUND} C:${HDF5_C_${CG_HDF5_LINK_TYPE_UPPER}_LIBRARY}") +- endif() +- +- set(LINK_LIBS ${HDF5_C_${CG_HDF5_LINK_TYPE_UPPER}_LIBRARY}) +- else () - find_package (HDF5) # Legacy find - - #Legacy find_package does not set HDF5_TOOLS_DIR, so we set it here - set(HDF5_TOOLS_DIR ${HDF5_LIBRARY}/../bin) - - #Legacy find_package does not set HDF5_BUILD_SHARED_LIBS, so we set it here -- if (CGNS_BUILD_SHARED AND EXISTS "${HDF5_LIBRARY}/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") +- set(GUESS_SHARED "${HDF5_LIBRARY}/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") +- foreach (ITEM ${HDF5_LIBRARIES}) +- if (ITEM MATCHES "(.*)hdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") +- set(GUESS_SHARED "${ITEM}") +- break() +- endif() +- endforeach() +- if (CGNS_BUILD_SHARED AND EXISTS "${GUESS_SHARED}") - set (HDF5_BUILD_SHARED_LIBS 1) -- add_definitions (-DH5_BUILT_AS_DYNAMIC_LIB) +- set (CG_HDF5_LINK_TYPE "shared") +- set (CG_HDF5_LINK_TYPE_UPPER "SHARED") - else () - set (HDF5_BUILD_SHARED_LIBS 0) -- add_definitions (-DH5_BUILT_AS_STATIC_LIB) +- set (CG_HDF5_LINK_TYPE "static") +- set (CG_HDF5_LINK_TYPE_UPPER "STATIC") - endif () -- set (LINK_LIBS ${LINK_LIBS} ${HDF5_LIBRARIES}) -- -- endif (HDF5_FOUND) -- set (HDF5_PACKAGE_NAME ${SEARCH_PACKAGE_NAME}) +- set (LINK_LIBS ${HDF5_LIBRARIES}) + find_package (HDF5 CONFIG REQUIRED) + if (TARGET hdf5::hdf5-shared) + set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-shared) + else () + set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-static) -+ endif () + endif () +- set (HDF5_PACKAGE_NAME ${SEARCH_PACKAGE_NAME}) if (HDF5_FOUND) if (NOT DEFINED HDF5_INCLUDE_DIRS) -@@ -289,20 +255,10 @@ if (CGNS_ENABLE_HDF5) - endif (HDF5_FOUND) - - set(HDF5_NEED_ZLIB "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") -- if(HDF5_NEED_ZLIB) -- find_library(ZLIB_LIBRARY z) -- mark_as_advanced(CLEAR ZLIB_LIBRARY) -- else (HDF5_NEED_ZLIB) -- mark_as_advanced(FORCE ZLIB_LIBRARY) -- endif(HDF5_NEED_ZLIB) -+ set(HDF5_NEED_ZLIB ${HDF5_ENABLE_Z_LIB_SUPPORT} CACHE INTERNAL "" FORCE) - - set(HDF5_NEED_SZIP "OFF" CACHE BOOL "Does the HDF5 library require linking to szip?") -- if (HDF5_NEED_SZIP) -- find_library(SZIP_LIBRARY szip) -- mark_as_advanced(CLEAR SZIP_LIBRARY) -- else (HDF5_NEED_SZIP) -- mark_as_advanced(FORCE SZIP_LIBRARY) -- endif (HDF5_NEED_SZIP) -+ set(HDF5_NEED_SZIP ${HDF5_ENABLE_SZIP_SUPPORT} CACHE INTERNAL "" FORCE) - - # Check if HDF5 version is 1.8 or greater - if (HDF5_VERSION VERSION_LESS "1.8.0") -@@ -310,6 +266,7 @@ if (CGNS_ENABLE_HDF5) - endif (HDF5_VERSION VERSION_LESS "1.8.0") - - set(HDF5_NEED_MPI "OFF" CACHE BOOL "Does the HDF5 library require linking to mpi? (Only true if using parallel HDF5)") -+ set(HDF5_NEED_MPI ${HDF5_ENABLE_PARALLEL} CACHE INTERNAL "" FORCE) - set(MPI_INC) - set(MPI_LIBS) - if (HDF5_NEED_MPI) diff --git a/ports/cgns/linux_lfs.patch b/ports/cgns/linux_lfs.patch index 3ccda64e27a304..af3d411cfba624 100644 --- a/ports/cgns/linux_lfs.patch +++ b/ports/cgns/linux_lfs.patch @@ -2,11 +2,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 46446da8a..a3d8cd98f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -82,6 +82,7 @@ if (CGNS_ENABLE_LFS) - else (WIN32) +@@ -116,6 +116,7 @@ if (CGNS_ENABLE_LFS) + else () check_symbol_exists(open64 "sys/types.h;sys/stat.h;unistd.h" HAVE_OPEN64) check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) + add_definitions(-D_FILE_OFFSET_BITS=64 -D__LARGEFILE64_SOURCE -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) - endif (WIN32) + endif () if (HAVE_OPEN64) - add_definitions(-DHAVE_OPEN64) + add_compile_definitions(HAVE_OPEN64) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index bb75a9485ceae7..9181d009067e43 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGNS/CGNS - REF 86b686bce292eef7782cfb56b6acdb5123c96f49 # v4.2.0 - SHA512 88df741acc1b650724bcbeb82ab0f7e593bf01e0a30c04b14b9915f4ea4331725cc24b87715dd08d93d5a3708660ca7f7874bc0a9c5505b76471802cf033e35d + REF ec538ac11dbaff510464a831ef094b0d6bf7216c # v4.3.0 + SHA512 3c04829ff99c0f4f1cd705f0807fda0a65f970c7eecd23ec624cf09fb6fa2a566c63fc94d46c1d0754910bbff8f98c3723e4f32ef66c3e7e41930313454fa10b HEAD_REF develop PATCHES hdf5.patch @@ -12,13 +12,14 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - fortran CGNS_ENABLE_FORTRAN - tests CGNS_ENABLE_TESTS - hdf5 CGNS_ENABLE_HDF5 - lfs CGNS_ENABLE_LFS - legacy CGNS_ENABLE_LEGACY + "fortran" CGNS_ENABLE_FORTRAN + "tests" CGNS_ENABLE_TESTS + "hdf5" CGNS_ENABLE_HDF5 + "lfs" CGNS_ENABLE_LFS + "legacy" CGNS_ENABLE_LEGACY ) +set(CGNS_BUILD_OPTS "") if(VCPKG_TARGET_ARCHITECTURE MATCHES "64") list(APPEND CGNS_BUILD_OPTS "-DCGNS_ENABLE_64BIT=ON") endif() @@ -29,54 +30,54 @@ else() list(APPEND CGNS_BUILD_OPTS "-DCGNS_BUILD_SHARED=OFF;-DCGNS_USE_SHARED=OFF") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS +# By default, when possible, vcpkg_cmake_configure uses ninja-build as its build system +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} ${CGNS_BUILD_OPTS} ) -vcpkg_install_cmake() - -file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) - -file(INSTALL ${CURRENT_PORT_DIR}/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) # the include is all that is needed +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Moves all *.cmake files from /debug/lib/cmake/cgns/ to /share/cgns/ +# See /docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md for more details +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/cgns") + +vcpkg_copy_tools( + TOOL_NAMES + cgnscheck + cgnscompress + cgnsconvert + cgnsdiff + cgnslist + cgnsnames + AUTO_CLEAN +) -set(TOOLS cgnscheck cgnscompress cgnsconvert cgnsdiff cgnslist cgnsnames) +if(VCPKG_TARGET_IS_WINDOWS) + set(TOOLS "adf2hdf.bat" "hdf2adf.bat" "cgnsupdate.bat") +elseif(VCPKG_TARGET_IS_LINUX) + set(TOOLS "adf2hdf" "hdf2adf" "cgnsupdate") +endif() -foreach(tool ${TOOLS}) - set(suffix ${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") - file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") - endif() +foreach(TOOL ${TOOLS}) + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${TOOL}") endforeach() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) - -IF(EXISTS ${CURRENT_PACKAGES_DIR}/debug) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) -file(GLOB_RECURSE BATCH_FILES ${CURRENT_PACKAGES_DIR}/bin/*.bat) - -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +if (EXISTS "${CURRENT_PACKAGES_DIR}/debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") endif() -# # Moves all .cmake files from /debug/share/cgns/ to /share/cgns/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/cgns) +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs" "${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h") +file(INSTALL "${CURRENT_PORT_DIR}/cgnsconfig.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # the include is all that is needed -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +# Handle copyright +configure_file("${SOURCE_PATH}/license.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/cgns/vcpkg.json b/ports/cgns/vcpkg.json index c738b9a3b6d904..04a85921f01c62 100644 --- a/ports/cgns/vcpkg.json +++ b/ports/cgns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cgns", - "version-semver": "4.2.0", + "version-semver": "4.3.0", "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.", "homepage": "http://cgns.org/", "default-features": [ @@ -20,6 +20,14 @@ "features": [ "tools" ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] }, @@ -58,7 +66,7 @@ "description": "Build tests" }, "tools": { - "description": "Build tools" + "description": "No effects, preserved for upgrade compatibility" } } } diff --git a/versions/baseline.json b/versions/baseline.json index f73dbd95e28c4f..d2440cb60274ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1329,7 +1329,7 @@ "port-version": 0 }, "cgns": { - "baseline": "4.2.0", + "baseline": "4.3.0", "port-version": 0 }, "chaiscript": { diff --git a/versions/c-/cgns.json b/versions/c-/cgns.json index bc33d2bd991678..3ba5b6275e4ccd 100644 --- a/versions/c-/cgns.json +++ b/versions/c-/cgns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d2c412303ae38864d8ff36777cc22bfc404b9b6", + "version-semver": "4.3.0", + "port-version": 0 + }, { "git-tree": "9d33908ce58fbfa6e823c937716e57d84d1cb2a5", "version-semver": "4.2.0", From a7dfa7d10fa0e59cf6a14ec5e96be576e13e08d1 Mon Sep 17 00:00:00 2001 From: Hamish Moffatt <7577172+hmoffatt@users.noreply.github.com> Date: Thu, 12 May 2022 09:38:46 +1000 Subject: [PATCH 226/383] [Fluidsynth] add sndfile feature (#24635) * Add sndfile feature to fluidsynth * add fluidsynth 2.2.6#1 --- ports/fluidsynth/portfile.cmake | 8 +++++++- ports/fluidsynth/vcpkg.json | 13 +++++++++++++ versions/baseline.json | 2 +- versions/f-/fluidsynth.json | 5 +++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index fd9f48d465e8b4..fb009c4a96a3c0 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -25,7 +25,13 @@ if ("buildtools" IN_LIST FEATURES) vcpkg_add_to_path(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() -set(feature_list dbus jack libinstpatch libsndfile midishare opensles oboe oss sdl2 pulseaudio readline lash alsa systemd coreaudio coremidi dart) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sndfile enable-libsndfile +) + +set(feature_list dbus jack libinstpatch midishare opensles oboe oss sdl2 pulseaudio readline lash alsa systemd coreaudio coremidi dart) vcpkg_list(SET FEATURE_OPTIONS) foreach(_feature IN LISTS feature_list) list(APPEND FEATURE_OPTIONS -Denable-${_feature}:BOOL=OFF) diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index 0cb01fc4bf469f..6ad2fdb4a4c721 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fluidsynth", "version": "2.2.6", + "port-version": 1, "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", "homepage": "https://github.com/FluidSynth/fluidsynth", "license": "LGPL-2.1-or-later", @@ -21,6 +22,18 @@ "features": { "buildtools": { "description": "Build tools gentables" + }, + "sndfile": { + "description": "Enable rendering to file and SF3 support", + "dependencies": [ + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index d2440cb60274ff..9f6d6e0e59e61e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2258,7 +2258,7 @@ }, "fluidsynth": { "baseline": "2.2.6", - "port-version": 0 + "port-version": 1 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 8b85a542fe4951..f2b4168fd3e571 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5c0f85546fe88c0e9aaf67734a929f2b717b1ef", + "version": "2.2.6", + "port-version": 1 + }, { "git-tree": "7740f8dfb97fa273a9f9ed740ade48f9953ff393", "version": "2.2.6", From 85f216ff85be24a945c375d78a3db1df7c5d308c Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 12 May 2022 07:39:01 +0800 Subject: [PATCH 227/383] [liburing] Update to version 2.1 (#24637) * [liburing] Update to version 2.1 * format vcpkg.json * x-add-version * apply suggestion * version Co-authored-by: Lily Wang --- ports/liburing/fix-spec-version.patch | 4 ++-- ports/liburing/portfile.cmake | 23 +++++++++++++---------- ports/liburing/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/liburing.json | 5 +++++ 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ports/liburing/fix-spec-version.patch b/ports/liburing/fix-spec-version.patch index 9acb1fc40434bb..cb495f856c1ecf 100644 --- a/ports/liburing/fix-spec-version.patch +++ b/ports/liburing/fix-spec-version.patch @@ -4,8 +4,8 @@ index fa4d970..8607074 100644 +++ b/liburing.spec @@ -1,5 +1,5 @@ Name: liburing --Version: 0.7 -+Version: 2.0 +-Version: 2.0 ++Version: 2.1 Release: 1%{?dist} Summary: Linux-native io_uring I/O access library License: (GPLv2 with exceptions and LGPLv2+) or MIT diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 276f68fb48aa3b..72f6d07eb3c2a6 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing - REF liburing-2.0 - SHA512 8a7b37600246d44a94d3fed1ca4bb60e76f9ddc60bd3c237e600b60e77961a1125c8a1f230cb7569f959acf10b68b91aafb4935c1c2fd13d5df7373b374e47f5 + REF 41a61c97c2e3df4475c93fdf5026d575ce3f1377 #liburing-2.1 + SHA512 adbfee9a775ff0977c192b52f5cc2c52b2b40bf5e7c0c1153d88b7767889c7c8a39863da0bce3ebed0f396a453e879633ecf1c79f4f2c4f89407ff896d8b6222 HEAD_REF master PATCHES fix-spec-version.patch # update version value for pkgconfig(.pc) files @@ -11,22 +11,25 @@ vcpkg_from_github( # note: check ${SOURCE_PATH}/liburing.spec before updating configure options vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE ) vcpkg_install_make() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/usage - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # note: {SOURCE_PATH}/src/Makefile makes liburing.so from liburing.a. # For dynamic, remove intermediate file liburing.a when install is finished. if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/liburing.a - ${CURRENT_PACKAGES_DIR}/lib/liburing.a + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/liburing.a" + "${CURRENT_PACKAGES_DIR}/lib/liburing.a" ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/man) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man2") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man7") diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index 37403d70c9d118..d2fb6d7f1d25ae 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,8 +1,8 @@ { "name": "liburing", - "version": "2.0", - "port-version": 3, + "version": "2.1", "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", + "license": null, "supports": "linux" } diff --git a/versions/baseline.json b/versions/baseline.json index 9f6d6e0e59e61e..f461dce88af55c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4125,8 +4125,8 @@ "port-version": 3 }, "liburing": { - "baseline": "2.0", - "port-version": 3 + "baseline": "2.1", + "port-version": 0 }, "libusb": { "baseline": "1.0.26", diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 2fc0750a765c67..50c21042134e29 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2abcbd2b104e5dbd5406cac8f3f9a3ae7fc47647", + "version": "2.1", + "port-version": 0 + }, { "git-tree": "10bf5144950610a1f587342c5107bf4fdfb52658", "version": "2.0", From 32ee2c76b0a498178996b0af942aec14c0e50b7d Mon Sep 17 00:00:00 2001 From: Sean Farrell Date: Thu, 12 May 2022 01:45:39 +0200 Subject: [PATCH 228/383] [c9y] Adds new port (#24643) * Adds c9y 0.3.0 * Adds versions for c9y 0.3.0. * Implements review suggestions. * Bump versions. --- ports/c9y/portfile.cmake | 16 ++++++++++++++++ ports/c9y/vcpkg.json | 13 +++++++++++++ versions/baseline.json | 4 ++++ versions/c-/c9y.json | 9 +++++++++ 4 files changed, 42 insertions(+) create mode 100644 ports/c9y/portfile.cmake create mode 100644 ports/c9y/vcpkg.json create mode 100644 versions/c-/c9y.json diff --git a/ports/c9y/portfile.cmake b/ports/c9y/portfile.cmake new file mode 100644 index 00000000000000..42f281d8c7bf4a --- /dev/null +++ b/ports/c9y/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rioki/c9y + REF v0.3.0 + SHA512 9d105f5d8f93856d6104663704944e0456c779c9ae6469d4ad9a40f6e451065376a44e4efb61c2e0b5e79cb2f3ae78de72209b6668d56d7df7992275f2168336 + ) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/c9y/vcpkg.json b/ports/c9y/vcpkg.json new file mode 100644 index 00000000000000..ebeff761000095 --- /dev/null +++ b/ports/c9y/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "c9y", + "version-semver": "0.3.0", + "description": "Concurency", + "homepage": "https://github.com/rioki/c9y", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f461dce88af55c..1fe1fb5953c4e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1216,6 +1216,10 @@ "baseline": "0.0.1", "port-version": 0 }, + "c9y": { + "baseline": "0.3.0", + "port-version": 0 + }, "caf": { "baseline": "0.18.6", "port-version": 1 diff --git a/versions/c-/c9y.json b/versions/c-/c9y.json new file mode 100644 index 00000000000000..62647f3068e360 --- /dev/null +++ b/versions/c-/c9y.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5964f7fa10d83aa2d1a01ec7c64bd9b64f25f6a6", + "version-semver": "0.3.0", + "port-version": 0 + } + ] +} From 9e26f9208b07381e35a6e33b9f749fc3736740be Mon Sep 17 00:00:00 2001 From: DevFdv <105297284+DevFdv@users.noreply.github.com> Date: Thu, 12 May 2022 01:46:02 +0200 Subject: [PATCH 229/383] [tclap] Update TCLAP to 1.2.5 (#24644) * [tclap] Update to TCLAP 1.2.5 * [tclap] x-add-version to update TCLAP to 1.2.5 * [tclap] Specify MIT license in manifest. * [tclap] x-add-version after license update. --- ports/tclap/portfile.cmake | 4 ++-- ports/tclap/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/t-/tclap.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/tclap/portfile.cmake b/ports/tclap/portfile.cmake index d23ae531dfd81a..9688be8f7391ee 100644 --- a/ports/tclap/portfile.cmake +++ b/ports/tclap/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO tclap - FILENAME "tclap-1.2.2.tar.gz" - SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107 + FILENAME "tclap-1.2.5.tar.gz" + SHA512 3b5b3d76e8ff21133001f5f9589fa6ec143729909bf0b9cc9934377bce178360c161fb5c1f4c4d9e9c74b09cff3d65f1d5100e61d4a732283524a78b6f236b10 ) file(COPY "${SOURCE_PATH}/include/tclap" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") diff --git a/ports/tclap/vcpkg.json b/ports/tclap/vcpkg.json index c8ad1ac88de44f..25488bc261b954 100644 --- a/ports/tclap/vcpkg.json +++ b/ports/tclap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tclap", - "version-string": "1.2.2", - "port-version": 4, + "version": "1.2.5", "description": "Templatized command-line argument parser for C++", - "homepage": "https://sourceforge.net/projects/tclap/" + "homepage": "https://sourceforge.net/projects/tclap/", + "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index 1fe1fb5953c4e1..a454f9f82b7f03 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6889,8 +6889,8 @@ "port-version": 5 }, "tclap": { - "baseline": "1.2.2", - "port-version": 4 + "baseline": "1.2.5", + "port-version": 0 }, "teemo": { "baseline": "2.7", diff --git a/versions/t-/tclap.json b/versions/t-/tclap.json index b9991c21b20454..c440ca2bcd2532 100644 --- a/versions/t-/tclap.json +++ b/versions/t-/tclap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f02ffdbe328a2df58a554ba83269ec09bd47a6ad", + "version": "1.2.5", + "port-version": 0 + }, { "git-tree": "787d1698947778edfecc2aa104ca7d09fb7d7415", "version-string": "1.2.2", From 1c498017cbe1434bbee025505d06003b9322048d Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Thu, 12 May 2022 01:46:29 +0200 Subject: [PATCH 230/383] [rxspencer] Avoid tests and docs (#24645) * [rxspencer] Remove tests and docs * version --- ports/rxspencer/disable-docs-and-tests.patch | 37 ++++++++++++++++++++ ports/rxspencer/portfile.cmake | 7 ++-- ports/rxspencer/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/r-/rxspencer.json | 5 +++ 5 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 ports/rxspencer/disable-docs-and-tests.patch diff --git a/ports/rxspencer/disable-docs-and-tests.patch b/ports/rxspencer/disable-docs-and-tests.patch new file mode 100644 index 00000000000000..9cacda578fed85 --- /dev/null +++ b/ports/rxspencer/disable-docs-and-tests.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 49faf30..e590001 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ + project ( rxspencer C ) + cmake_minimum_required ( VERSION 3.0 ) + option ( rxshared "build shared library instead of static" OFF ) +-enable_testing() ++#enable_testing() + + # Define POSIX_MISTAKE to allow unmatched right parentheses as literals, as + # required by POSIX 1003.2. +@@ -47,10 +47,12 @@ install ( TARGETS rxspencer + PUBLIC_HEADER DESTINATION ${RXSPENCER_INCLUDE_DIR} ) + + # Install docs ++if(FALSE) + set ( RXSPENCER_DATA_FILES "COPYRIGHT;README;WHATSNEW" ) + install ( FILES ${RXSPENCER_DATA_FILES} DESTINATION ${RXSPENCER_DATA_DIR} ) + install ( FILES rxspencer.3 DESTINATION ${RXSPENCER_MAN3_DIR} ) + install ( FILES rxspencer.7 DESTINATION ${RXSPENCER_MAN7_DIR} ) ++endif() + + # generate cmake configuration file + include ( CMakePackageConfigHelpers ) +@@ -69,8 +71,9 @@ install ( EXPORT RXSpencerTargets DESTINATION ${CMAKE_CONFIG_DEST} ) + install ( FILES + ${CMAKE_CURRENT_BINARY_DIR}/RXSpencerConfig.cmake + DESTINATION ${CMAKE_CONFIG_DEST} ) +- ++if(FALSE) + add_executable(tester ${RXSPENCER_SRCS} debug.c main.c split.c) + add_test(NAME test1 COMMAND sh -c "./tester -f ${CMAKE_CURRENT_SOURCE_DIR}/tests") + add_test(NAME test2 COMMAND sh -c "./tester -el -f ${CMAKE_CURRENT_SOURCE_DIR}/tests") + add_test(NAME test3 COMMAND sh -c "./tester -er -f ${CMAKE_CURRENT_SOURCE_DIR}/tests") ++endif() diff --git a/ports/rxspencer/portfile.cmake b/ports/rxspencer/portfile.cmake index b4ce794d01af94..4f31d69fb87e25 100644 --- a/ports/rxspencer/portfile.cmake +++ b/ports/rxspencer/portfile.cmake @@ -4,18 +4,21 @@ vcpkg_from_github( REF 9f835b523f1af617ca54e06863a1924c23f6e56a #v3.9.0 SHA512 fe7721bd4b4e4f7d31fd5a7e42d34d0c9735d062d8b146ee47a25f87c809eead7133265fc37fa958c37bc4ffeaf101d143202080508d98efd160b8fd0a278598 HEAD_REF master + PATCHES + disable-docs-and-tests.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_CONFIG_DEST=share/rxspencer -Drxshared=${BUILD_SHARED} ) vcpkg_cmake_install() +vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH "share/rxspencer") @@ -25,5 +28,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() diff --git a/ports/rxspencer/vcpkg.json b/ports/rxspencer/vcpkg.json index 41b863e25f4f35..910ff4279490c9 100644 --- a/ports/rxspencer/vcpkg.json +++ b/ports/rxspencer/vcpkg.json @@ -1,9 +1,10 @@ { "name": "rxspencer", "version": "3.9.0", - "port-version": 1, + "port-version": 2, "description": "Henry Spencer's BSD regular expression library.", "homepage": "https://garyhouston.github.io/regex/", + "license": "MIT AND CC0-1.0", "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index a454f9f82b7f03..b63f97efb6028c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6298,7 +6298,7 @@ }, "rxspencer": { "baseline": "3.9.0", - "port-version": 1 + "port-version": 2 }, "ryml": { "baseline": "2021-07-24", diff --git a/versions/r-/rxspencer.json b/versions/r-/rxspencer.json index 1d4df6e4be1bfb..66d8180da99c47 100644 --- a/versions/r-/rxspencer.json +++ b/versions/r-/rxspencer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "423d711ba8013c78f3ca4931bf2d6c8a5ecc8ba0", + "version": "3.9.0", + "port-version": 2 + }, { "git-tree": "d0db813c47fd33b7e6f5ffb95790b66aafcaa53e", "version": "3.9.0", From 188ff7a10258508650655a9530e02feb98556e20 Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Thu, 12 May 2022 03:46:53 +0400 Subject: [PATCH 231/383] [magic-enum] Update to v0.8.0 (#24646) * [magic-enum] Update to v0.8.0 * x-add-version * fix deprecated * fix review * fix version * Update ports/magic-enum/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update ports/magic-enum/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update versions/m-/magic-enum.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * fix review * overwrite-version * fix cmake * fix onfig_fixup * overwrite-version * delete extra blank line * overwrite-version Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- ports/magic-enum/portfile.cmake | 18 +++++++++--------- ports/magic-enum/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/m-/magic-enum.json | 5 +++++ 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index b612ccabe84e4d..27108907457123 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -3,25 +3,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.7.3 - SHA512 7645ef56bbe262ba801c6f5ffb7baf997869de6422a239ef2000d7ff6f4f6d00c34360543c60aa91a02433311b4b996bba410e4f04f96f185a6276ad9e6bb0a8 + REF v0.8.0 + SHA512 097260c234a1b716d26b537cd80a8d3eca255422e8dce46183708a27b1d4ad1d81c6be05f1b7d300db3362eafa243cccc39c9d12f1bcbfdb0d7755701a222808 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DMAGIC_ENUM_OPT_ENABLE_NONASCII=OFF -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF -DMAGIC_ENUM_OPT_BUILD_TESTS=OFF -DMAGIC_ENUM_OPT_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/magic_enum TARGET_PATH share/magic_enum) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum PACKAGE_NAME magic_enum) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 44979659563122..642141ff753b0c 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,7 +1,17 @@ { "name": "magic-enum", - "version-string": "0.7.3", - "port-version": 1, + "version": "0.8.0", "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", - "homepage": "https://github.com/Neargye/magic_enum" + "homepage": "https://github.com/Neargye/magic_enum", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index b63f97efb6028c..1903c79c0d680f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4349,8 +4349,8 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.7.3", - "port-version": 1 + "baseline": "0.8.0", + "port-version": 0 }, "magic-get": { "baseline": "2019-09-02", diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index 26748e3dd32d83..445bc5af81e967 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b170feb45c6c04a727f51a40d65fd01b5f0afdc", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "1962d2e544199e80b56432fb1bd1e28c12cca3ad", "version-string": "0.7.3", From e80f345d8e23e0c759148464773caef0fc2388e6 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Thu, 12 May 2022 07:47:22 +0800 Subject: [PATCH 232/383] [akali] Update to v1.43 (#24648) * [teemo] Update to v2.7 * [teemo] Format manifest * [teemo] Update to v2.7 * [akali] Update to v1.43 * [akali] Update to v1.43 * [akali] Update to v1.43 * overwrite version * add license * overwrite version Co-authored-by: FrankXie --- ports/akali/portfile.cmake | 32 ++++++++++++++++---------------- ports/akali/vcpkg.json | 16 +++++++++++++--- versions/a-/akali.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index 4c6a52472b46ee..f489f6e263da07 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -1,40 +1,40 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali - REF 57fea619dea42aa116679b22340f56fc94eb83a9 - SHA512 b80f7e72396032e8b24464e159f4a6c24663d671bcbe9ffa46f68e5bc0398fd0caf3ac918f8ccb8d304be4d5a3fade2821f87f7270e02ec8aae722e2faeab0f3 + REF 2e35164a9a2a48a50af06c8ae59fcad0f4d6584e + SHA512 103c4da3d318d7ae7da4821e58eced918c9d64dbc6d97e9e6c15fa69731331cf6160f593437366cb3a844fa292a8d875e3e63a679e7fbdeae22bb4d73e3d3144 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DAKALI_STATIC:BOOL=${AKALI_STATIC} -DBUILD_TESTS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/akali) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/akali) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/akali) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/akali) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/akali") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/akali) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/akali") + vcpkg_cmake_config_fixup(CONFIG_PATH share/akali) endif() -file(READ ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h AKALI_EXPORT_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "${AKALI_EXPORT_H}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "#ifdef AKALI_STATIC" "#if 1" AKALI_EXPORT_H "${AKALI_EXPORT_H}") else() string(REPLACE "#ifdef AKALI_STATIC" "#if 0" AKALI_EXPORT_H "${AKALI_EXPORT_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h "${AKALI_EXPORT_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "${AKALI_EXPORT_H}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_copy_pdbs() diff --git a/ports/akali/vcpkg.json b/ports/akali/vcpkg.json index 1977d5a26f2e16..aa2f9c420e2a14 100644 --- a/ports/akali/vcpkg.json +++ b/ports/akali/vcpkg.json @@ -1,8 +1,18 @@ { "name": "akali", - "version-string": "1.42", - "port-version": 3, + "version": "1.43", "description": "C++ Common Library.", "homepage": "https://github.com/winsoft666/akali", - "supports": "!(arm | arm64 | uwp)" + "license": "MIT", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/a-/akali.json b/versions/a-/akali.json index 210ecf510b1368..82a641a9c4f917 100644 --- a/versions/a-/akali.json +++ b/versions/a-/akali.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e97f0348cd1def4c594fda413436a01609923ec", + "version": "1.43", + "port-version": 0 + }, { "git-tree": "44ab167f077406e598eb19f7e48f10b638bc1547", "version-string": "1.42", diff --git a/versions/baseline.json b/versions/baseline.json index 1903c79c0d680f..a46fc05461809f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -37,8 +37,8 @@ "port-version": 1 }, "akali": { - "baseline": "1.42", - "port-version": 3 + "baseline": "1.43", + "port-version": 0 }, "alac": { "baseline": "2017-11-03-c38887c5", From 68ab9e91b6e24341c3fe9a411d9531f27324570a Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 11 May 2022 16:47:49 -0700 Subject: [PATCH 233/383] [directxtk, directxtk12, directxtex, directxmesh, uvatlas] Update ports for May 2022 release (#24650) * Update directxtk, directxtex, directxmesh, uvatlas port to May 2022 releases * reformat vcpkg.json * Update baseline * directxtex doesn't need to build sample * Update baseline --- ports/directxmesh/portfile.cmake | 14 ++++++------- ports/directxmesh/vcpkg.json | 2 +- ports/directxtex/portfile.cmake | 35 ++++++++++++++++++-------------- ports/directxtex/vcpkg.json | 2 +- ports/directxtk/portfile.cmake | 26 ++++++++++++++---------- ports/directxtk/vcpkg.json | 4 ++-- ports/directxtk12/portfile.cmake | 35 +++++++++++++++++++++----------- ports/directxtk12/vcpkg.json | 21 +++++++++++++++++-- ports/uvatlas/portfile.cmake | 14 ++++++------- ports/uvatlas/vcpkg.json | 2 +- versions/baseline.json | 10 ++++----- versions/d-/directxmesh.json | 5 +++++ versions/d-/directxtex.json | 5 +++++ versions/d-/directxtk.json | 5 +++++ versions/d-/directxtk12.json | 5 +++++ versions/u-/uvatlas.json | 5 +++++ 16 files changed, 126 insertions(+), 64 deletions(-) diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 293a475e1956f9..807ef0517f7c7b 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF mar2022 - SHA512 ec5cfcbba0f361a2a7d572284c77a88464fcf38a10b113f12b1e51a1c0c42a651abd6f8bbf257a3470b35c62c8d25af9a79925f2e0c79eb33a8b1c9ca6a9191b + REF may2022 + SHA512 f82ac5bf8211cb5699caf79cf2fb13eb23b4c3c8de807bc114966cc8e933b3bdb2c98940c9add74ee9ad0addb1bdf91dd16cbe2efe2db2afd96f69fd3871d556 HEAD_REF main ) @@ -30,14 +30,14 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmesh/cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MESHCONVERT_EXE - URLS "https://github.com/Microsoft/DirectXMesh/releases/download/mar2022/meshconvert.exe" - FILENAME "meshconvert-mar2022.exe" - SHA512 43b4305b73994eccc086bf1812147a5156359f5d927475b915bbf8edde70189cc419b96703aeb736f76d9d52037657f10ba0c104f9713c1f0defb28ce7a46ac1 + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/may2022/meshconvert.exe" + FILENAME "meshconvert-may2022.exe" + SHA512 0fcc3728425bc9681bdc4e1fae79a0f3da638d1b43597171e6829fca85cec8e7f1aa30a51c2f9457074c0a7bb9f358da06df666b6ae054266ceb1c9c38874547 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") @@ -46,7 +46,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${MESHCONVERT_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-mar2022.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-may2022.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index 1180f4b5ee46c0..e864903f08c857 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-date": "2022-03-24", + "version-date": "2022-05-09", "description": "DirectXMesh geometry processing library", "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 62e43378aacfd1..f1af64d1dc13ee 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -1,10 +1,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_MINGW) + message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF mar2022 - SHA512 04f898b2cf2c76edd400147db9144e196fc8441739de3293f8851952ce8153bab033deba52a0d35e51c4fbc9705ffe183f1606a0fae29970dc2babe65ed78e19 + REF may2022 + SHA512 b5783c55a1faa9ac616f93d13af91d072e5cef65bcb02c402f2a4d072036135ae610264dc5ebe4e15c56b152c0b3fd0fb87666ab16e74507218906f4210687db HEAD_REF main ) @@ -52,33 +56,34 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} + -DBUILD_SAMPLE=OFF -DBC_USE_OPENMP=ON -DBUILD_DX11=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtex/cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( TEXASSEMBLE_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texassemble.exe" - FILENAME "texassemble-mar2022.exe" - SHA512 2a2bec1f012ba6778d99f53a3b4f015f84e4ab76dd68a1980d77cdac588c60a21b30abbfc0de9f0b0ef790ef5ed8444f1648b80990053f8a1f967a04d20d3c33 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/may2022/texassemble.exe" + FILENAME "texassemble-may2022.exe" + SHA512 22963920f3047533d2ec6d9751f4d2eb4d530e6c4a96099322a070f5f311785d79d07c2e79fd05daa9992deba116f630de14436df4f42b415d7511fd6193241e ) vcpkg_download_distfile( TEXCONV_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texconv.exe" - FILENAME "texconv-mar2022.exe" - SHA512 fa0b12dcc7e4688f356bb591dedd07dcb27b6029c6490438b39368f72b77f90112360544e035f89e1098dc09b26fb921840ecae851ad5eba6a339cd46316c4e3 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/may2022/texconv.exe" + FILENAME "texconv-may2022.exe" + SHA512 9f0c9307f00062883be8a2afff0f6428020d9f056db5a2f175ea3ff72e50f6fd5c57b2dbc448fe8352a86837b318bd3874995dc87d741bdeb413060618a0b08f ) vcpkg_download_distfile( TEXDIAG_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texdiag.exe" - FILENAME "texdiag-mar2022.exe" - SHA512 7fe074a08599edca9ad8ad5ff930c9c4dbc74faad6502c288e9a555a4a79f51affbce51758c99518d54c4698457e0edb379ffaebfd3dcae0bd16a343195f8292 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/may2022/texdiag.exe" + FILENAME "texdiag-may2022.exe" + SHA512 01fc96ea5cc286dfea097d3b8bedb92d41dbbab949953315e640ee019578c33e2e1b0db476e51576c92763bacfa4cdf270ebad7cac1c59b185d5fdc0752f0393 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") @@ -89,9 +94,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXDIAG_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index 297f6f2203c190..a9699dcb9ff88b 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-date": "2022-03-24", + "version-date": "2022-05-09", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index ab5b1db563d451..4fb4081666fb10 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -1,10 +1,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_MINGW) + message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF mar2022 - SHA512 09264e19ff786b1f8cf56f0a789ce9df60b3682adba6dbb3e9c8c8c7d869b464c0ad869299fc5cda2d535db19c7a96b43cba2fd40d8cb6aa9dc14914b181d410 + REF may2022 + SHA512 739d50c8dfa88a8905e61a797889a33c8b5a32a2e8ded1eea4c4f5fea82a9e8c04f6414ce709410def905d711cf7c8daf40e38579b355071288423b193196444 HEAD_REF main ) @@ -28,21 +32,21 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk/cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/mar2022/MakeSpriteFont.exe" - FILENAME "makespritefont-mar2022.exe" - SHA512 a24f76781ddb2c9baa2550d3ef26bf4cf6cb03bfd97caa3b202232a04730fd81e299a9f3549c3ff58c03fda827e44deac5e0b311e8e3fc795e393651ecb51752 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/may2022/MakeSpriteFont.exe" + FILENAME "makespritefont-may2022.exe" + SHA512 6f88fec787f9db0823cc0c5aa3d2579248c3dea566909a8d41417f42a3bd2af147ff9af82a3b96a3b1d0f8661dffda27530565bb8fed0a2e7d819d471e51493b ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/mar2022/XWBTool.exe" - FILENAME "xwbtool-mar2022.exe" - SHA512 32dd88e742211deaf0ca83e51ec510490456473c07fabbd6627960dc9abfa32289d99f2c8f53d7590a6a6733b3068ba25bff9a512fcf7d1072791dce931d463f + URLS "https://github.com/Microsoft/DirectXTK/releases/download/may2022/XWBTool.exe" + FILENAME "xwbtool-may2022.exe" + SHA512 505c7aa7a22ea78a793ba70f136b13548a69b36cd8ec1631969203deff6e93236460c674b219316793aa475f1350ad56f4a3f844e94c3adba0af7b1723c8765e ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -52,8 +56,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") elseif(NOT VCPKG_TARGET_IS_UWP) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index e0379377dc9d02..682bd77171b516 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-date": "2022-03-24", + "version-date": "2022-05-09", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", @@ -22,7 +22,7 @@ "description": "Build with XAudio 2.8 support for Windows 8.x or later" }, "xaudio2-9": { - "description": "Build with XAudio 2.9 support for Windows 10" + "description": "Build with XAudio 2.9 support for Windows 10/11" }, "xaudio2redist": { "description": "Build with XAudio2Redist support for Windows 7 SP1 or later", diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index c980b3de6c41bf..ba2f498a2113ac 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -1,34 +1,45 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_MINGW) + message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler dxc.exe also be in the PATH. See https://github.com/microsoft/DirectXShaderCompiler.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF mar2022 - SHA512 fc41450aad51491f4ac89f87bfd76a62179052db1b98ee626561ef3edb8716578c8dfee01613731cdd9fd91f03ed54a8ec73595374ae16e217cfc87d6f11eca4 + REF may2022 + SHA512 a306792c134458766ff0ce2672b4769d261080258207173aaff9e59c3a975859df2a540ea8537e28fc2aa1693237c3609665b87c4cf1d9115ac41c7a45ff5d61 HEAD_REF main ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + xaudio2-9 BUILD_XAUDIO_WIN10 + xaudio2redist BUILD_XAUDIO_REDIST +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS -DBUILD_XAUDIO_WIN10=ON -DBUILD_DXIL_SHADERS=ON + OPTIONS ${FEATURE_OPTIONS} -DBUILD_DXIL_SHADERS=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk12/cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/mar2022/MakeSpriteFont.exe" - FILENAME "makespritefont-mar2022.exe" - SHA512 a24f76781ddb2c9baa2550d3ef26bf4cf6cb03bfd97caa3b202232a04730fd81e299a9f3549c3ff58c03fda827e44deac5e0b311e8e3fc795e393651ecb51752 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/may2022/MakeSpriteFont.exe" + FILENAME "makespritefont-may2022.exe" + SHA512 6f88fec787f9db0823cc0c5aa3d2579248c3dea566909a8d41417f42a3bd2af147ff9af82a3b96a3b1d0f8661dffda27530565bb8fed0a2e7d819d471e51493b ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/mar2022/XWBTool.exe" - FILENAME "xwbtool-mar2022.exe" - SHA512 32dd88e742211deaf0ca83e51ec510490456473c07fabbd6627960dc9abfa32289d99f2c8f53d7590a6a6733b3068ba25bff9a512fcf7d1072791dce931d463f + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/may2022/XWBTool.exe" + FILENAME "xwbtool-may2022.exe" + SHA512 505c7aa7a22ea78a793ba70f136b13548a69b36cd8ec1631969203deff6e93236460c674b219316793aa475f1350ad56f4a3f844e94c3adba0af7b1723c8765e ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -38,8 +49,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index e6e83a029f702f..e86107c4b70b40 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-date": "2022-03-24", + "version-date": "2022-05-09", "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", @@ -17,5 +17,22 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "xaudio2-9" + ], + "features": { + "xaudio2-9": { + "description": "Build with XAudio 2.9 support for Windows 10/11" + }, + "xaudio2redist": { + "description": "Build with XAudio2Redist", + "dependencies": [ + { + "name": "xaudio2redist", + "platform": "!uwp & !arm" + } + ] + } + } } diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 21defe3fb0d99e..49d16aad5121d8 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF mar2022 - SHA512 8e532a754d1b07108c98e099221a1c6eb39e1386e2e61d8694e041fcdf0556d1aeaed703018b18aa0cc2972c1b874fedd4d7b5e5694c504e70d623a78e6eb421 + REF may2022 + SHA512 132c7570acd14e69f9a9888ce62aaa58f78d7d7e933bd3648af7208689693906fe6d8e17f4f41ba46a5151e09a0012874b0d11b96f30246337208c4f6f5ef8db HEAD_REF main ) @@ -30,14 +30,14 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/uvatlas/cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES))) vcpkg_download_distfile( UVATLASTOOL_EXE - URLS "https://github.com/Microsoft/UVAtlas/releases/download/mar2022/uvatlastool.exe" - FILENAME "uvatlastool-mar2022.exe" - SHA512 d4179b755a9f8d81c180c86ae7e2d177dd0842f78fc81d96b87fa6551407a038edb8250529e45a9b783514e27cbe2a806bac4af47c3db5c34a6e4adc602f5ff4 + URLS "https://github.com/Microsoft/UVAtlas/releases/download/may2022/uvatlastool.exe" + FILENAME "uvatlastool-may2022.exe" + SHA512 8a58e54881b16dc2e2489cfb605c02d5368bbfe02182c4d64ee1e903496d2ebcfc9cfaca63d602572c2241109c4ee4591aa7bb4f8da65daeead99b8144049b84 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") @@ -46,7 +46,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${UVATLASTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-mar2022.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-may2022.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 98c6954a724e7c..1f8f5be4fcb138 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-date": "2022-03-24", + "version-date": "2022-05-09", "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", diff --git a/versions/baseline.json b/versions/baseline.json index a46fc05461809f..b874e35b3e0131 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1869,7 +1869,7 @@ "port-version": 0 }, "directxmesh": { - "baseline": "2022-03-24", + "baseline": "2022-05-09", "port-version": 0 }, "directxsdk": { @@ -1877,15 +1877,15 @@ "port-version": 5 }, "directxtex": { - "baseline": "2022-03-24", + "baseline": "2022-05-09", "port-version": 0 }, "directxtk": { - "baseline": "2022-03-24", + "baseline": "2022-05-09", "port-version": 0 }, "directxtk12": { - "baseline": "2022-03-24", + "baseline": "2022-05-09", "port-version": 0 }, "dirent": { @@ -7281,7 +7281,7 @@ "port-version": 2 }, "uvatlas": { - "baseline": "2022-03-24", + "baseline": "2022-05-09", "port-version": 0 }, "uvw": { diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index 6204eb5a3f81d0..f72dff607aa7d2 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf2c810ddbc4a551cb5fb561092bb6fe67ed986f", + "version-date": "2022-05-09", + "port-version": 0 + }, { "git-tree": "799bc935afc5a0b5d8d50037f28807512fc7c38e", "version-date": "2022-03-24", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index a3b3dc8cd76dd7..9534b07d933458 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "269e245ad8428d3a09059bc195bae935613478af", + "version-date": "2022-05-09", + "port-version": 0 + }, { "git-tree": "15870041c7dc7d9db536c8770c6334f96af9f92c", "version-date": "2022-03-24", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 12018a7aa4b97e..9e8af3d211e087 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8707f957389d4329f61d4af69a47766fea2d6b9", + "version-date": "2022-05-09", + "port-version": 0 + }, { "git-tree": "d6e54dc5cc77469ecc88f949b6c149cb01f5a335", "version-date": "2022-03-24", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index 6f3eac0f7b5388..f8d53c8a9098ab 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e513b241157a3eada954cdb4c2d353ed4dac27e3", + "version-date": "2022-05-09", + "port-version": 0 + }, { "git-tree": "c89638b81272f98ae99cfb782c1269ad7b1836a5", "version-date": "2022-03-24", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index c1980b0485ea54..cfeb42373b7511 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ac8444f59bd76ba38a620d4e0fe1a6a64969873", + "version-date": "2022-05-09", + "port-version": 0 + }, { "git-tree": "100ee1b04f5da317153da9c52eb0c0def30e9b49", "version-date": "2022-03-24", From 6a2c904768c4a6e2f8fff27140c4ee98aba85203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Thu, 12 May 2022 01:48:04 +0200 Subject: [PATCH 234/383] [materialx] Add port MaterialX 1.38.4 (#24614) * [materialx] Add port MaterialX 1.38.4 * Update ports/materialx/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Switch `version-semver` -> `version` * Bump port commit to avoid patch * Add quotes. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/materialx/portfile.cmake | 49 ++++++++++++++++++++++++++++++++++ ports/materialx/vcpkg.json | 18 +++++++++++++ versions/baseline.json | 4 +++ versions/m-/materialx.json | 9 +++++++ 4 files changed, 80 insertions(+) create mode 100644 ports/materialx/portfile.cmake create mode 100644 ports/materialx/vcpkg.json create mode 100644 versions/m-/materialx.json diff --git a/ports/materialx/portfile.cmake b/ports/materialx/portfile.cmake new file mode 100644 index 00000000000000..da56e07be004d4 --- /dev/null +++ b/ports/materialx/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AcademySoftwareFoundation/MaterialX + REF b1ba83b312576fc58f02a6a7db40b18ddbe4f87f # 1.38.4 + SHA512 3988c42d487e391f9f0f3ab5f34eaa26c7f450079695d96954b871e078eecfe692daa9917279560ba3f10bf771685df3da6e26273d575a23a11c3d17fb897c62 + HEAD_REF main +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPTION_BUILD_SHARED_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DMATERIALX_BUILD_SHARED_LIBS:BOOL=${OPTION_BUILD_SHARED_LIB}" + "-DMATERIALX_BUILD_JS:BOOL=NO" + "-DMATERIALX_BUILD_PYTHON:BOOL=NO" + "-DMATERIALX_BUILD_VIEWER:BOOL=NO" + "-DMATERIALX_BUILD_DOCS:BOOL=NO" + "-DMATERIALX_BUILD_GEN_GLSL:BOOL=NO" + "-DMATERIALX_BUILD_GEN_OSL:BOOL=NO" + "-DMATERIALX_BUILD_GEN_MDL:BOOL=NO" + "-DMATERIALX_BUILD_RENDER:BOOL=NO" + "-DMATERIALX_BUILD_OIIO:BOOL=NO" + "-DMATERIALX_BUILD_TESTS:BOOL=NO" + "-DMATERIALX_PYTHON_LTO:BOOL=NO" + "-DMATERIALX_INSTALL_PYTHON:BOOL=NO" + "-DMATERIALX_TEST_RENDER:BOOL=NO" + "-DMATERIALX_WARNINGS_AS_ERRORS:BOOL=NO" + MAYBE_UNUSED_VARIABLES + MATERIALX_PYTHON_LTO # Used when MATERIALX_BUILD_PYTHON=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME MaterialX CONFIG_PATH lib/cmake/MaterialX) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/CHANGELOG.md" + "${CURRENT_PACKAGES_DIR}/LICENSE" + "${CURRENT_PACKAGES_DIR}/README.md" + "${CURRENT_PACKAGES_DIR}/THIRD-PARTY.md" + "${CURRENT_PACKAGES_DIR}/debug/CHANGELOG.md" + "${CURRENT_PACKAGES_DIR}/debug/LICENSE" + "${CURRENT_PACKAGES_DIR}/debug/README.md" + "${CURRENT_PACKAGES_DIR}/debug/THIRD-PARTY.md" + "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/materialx/vcpkg.json b/ports/materialx/vcpkg.json new file mode 100644 index 00000000000000..60fc20236cf118 --- /dev/null +++ b/ports/materialx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "materialx", + "version": "1.38.4", + "description": "MaterialX is an open standard for the exchange of rich material and look-development content across applications and renderers.", + "homepage": "https://www.materialx.org/", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b874e35b3e0131..410c7292e8cdc0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4412,6 +4412,10 @@ "baseline": "2022-03-02", "port-version": 0 }, + "materialx": { + "baseline": "1.38.4", + "port-version": 0 + }, "mathc": { "baseline": "2019-09-29", "port-version": 1 diff --git a/versions/m-/materialx.json b/versions/m-/materialx.json new file mode 100644 index 00000000000000..b2b5b234626189 --- /dev/null +++ b/versions/m-/materialx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f0dc3a4ac664a5b4fe18a946a35965b519c148e7", + "version": "1.38.4", + "port-version": 0 + } + ] +} From e9ac4bd503eed4cda037e4e8bc38d4a154969d51 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 11 May 2022 16:48:31 -0700 Subject: [PATCH 235/383] [azure-security-attestation-cpp] Update to 1.0.0-beta.2 (#24651) ## 1.0.0-beta.2 (2022-05-10) ### Breaking Changes - Renamed `AttestationOpenIdMetadata` type to `OpenIdMetadata`. - Renamed `AttestationSigningCertificateResult` type to `TokenValidationCertificateResult` to more accurately reflect the purpose of the type. - Removed the `AttestationTokenBase` class and moved its contents to the `AttestationToken` class. - Empty `AttestationToken` types are now represented with `AttestationToken` rather than `AttestationToken<>` to more idiomatically express the idea of a nullable attestation token. - Renamed `RuntimeClaims` field to `RunTimeClaims` to align with `InitTimeClaims` type name; standardized spelling of `InitTimeClaims`. - Changed input parameter to `AttestTpm` to be `AttestTpmOptions` instead of `std::string`. - Changed output parameter of `AttestTpm` to be `TpmAttestationResult` instead of `std::string`. - Renamed `AttestationTokenValidationOptions::ValidationTimeSlack` to `AttestationTokenValidationOptions::TimeValidationSlack` to improve consistency with other attestation SDKs. - Removed the unused `AttestationValidationCollateral` API. - Renamed `AttestOptions` to `AttestEnclaveOptions` - Renamed `TokenValidationOptions` field in various API Options structures to be `TokenValidationOptionsOverride` to better reflect the semantics of the field. - Renamed `PolicyCertificate` types to `IsolatedMode`. - `PolicyCertificateModificationResult` becomes `IsolatedModeCertificateModificationResult` - `PolicyCertificateListResult` becomes `IsolatedModeCertificateListResult` - `GetPolicyManagementCertificateOptions` becomes `GetIsolatedModeCertificatesOptions` - `AddPolicyManagementCertificatesOptions` becomes `AddIsolatedModeCertificatesOptions` - `RemovePolicyManagementCertificatesOptions` becomes `RemoveIsolatedModeCertificatesOptions` - `AttestationAdministrationClient::GetPolicyManagementCertificates` becomes `AttestationAdministrationClient::GetIsolatedModeCertificates`. - `AttestationAdministrationClient::AddPolicyManagementCertificate` becomes `AttestationAdministrationClient::AddIsolatedModeCertificate`. - `AttestationAdministrationClient::RemovePolicyManagementCertificate` becomes `AttestationAdministrationClient::RemoveIsolatedModeCertificate`. - Removed `ClientVersion` API from `AttestationClient` and `AttestationAdministrationClient` ### Other Changes - Added `Endpoint` property to `AttestationClient` and `AttestationAdministrationClient` --- ports/azure-security-attestation-cpp/portfile.cmake | 5 ++--- ports/azure-security-attestation-cpp/vcpkg.json | 2 +- versions/a-/azure-security-attestation-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/azure-security-attestation-cpp/portfile.cmake b/ports/azure-security-attestation-cpp/portfile.cmake index c6406d6e9b5a84..e2fc193d23815d 100644 --- a/ports/azure-security-attestation-cpp/portfile.cmake +++ b/ports/azure-security-attestation-cpp/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-attestation_1.0.0-beta.1 - SHA512 bb408ffa209c6d6416836296472f391d3418d6768f74d3fcf7962f93a991319f4f53b8588b2e82b2b366c060ad71cd1a2ad4a5515f19db97e5e5ef4bd222b926 + REF azure-security-attestation_1.0.0-beta.2 + SHA512 5a7e4ef8740f277e388d6d1d75a40723208c1b806ae8b8f7ba9c476259f6c968c08cbd8604321018acf659871b3411aed6be40a041141057978b6bb102338846 ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/sdk/attestation/azure-security-attestation/ OPTIONS - ${FEATURE_OPTIONS} -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-attestation-cpp/vcpkg.json b/ports/azure-security-attestation-cpp/vcpkg.json index 34c912c60d9877..ff8bb335673b85 100644 --- a/ports/azure-security-attestation-cpp/vcpkg.json +++ b/ports/azure-security-attestation-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-attestation-cpp", - "version-semver": "1.0.0-beta.1", + "version-semver": "1.0.0-beta.2", "description": [ "Microsoft Azure Attestation Service SDK for C++", "This library provides API access to the Microsoft Azure Attestation service." diff --git a/versions/a-/azure-security-attestation-cpp.json b/versions/a-/azure-security-attestation-cpp.json index 697ef92ba57801..9b9df7ba13f21c 100644 --- a/versions/a-/azure-security-attestation-cpp.json +++ b/versions/a-/azure-security-attestation-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e69adb1c996c0ae3b5bde53d32f619c51d0b95a5", + "version-semver": "1.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "9b6b2e71b9d94791a1481a40367fc5ec5607b8aa", "version-semver": "1.0.0-beta.1", diff --git a/versions/baseline.json b/versions/baseline.json index 410c7292e8cdc0..a029f24e10f3ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -337,7 +337,7 @@ "port-version": 0 }, "azure-security-attestation-cpp": { - "baseline": "1.0.0-beta.1", + "baseline": "1.0.0-beta.2", "port-version": 0 }, "azure-security-keyvault-certificates-cpp": { From bae8f8c7d837c631ca72daec4b14e243824135a5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 12 May 2022 01:51:06 +0200 Subject: [PATCH 236/383] [world rebuild] Move vcpkg-cmake-get-vars to its own port (#24636) * move vcpkg-cmake-get-vars to its own helper port * manifest format * version stuff * doc and version stuff * add missing include * version bump * remove coypright copying. * version stuff Co-authored-by: Alexander Neumann --- .../internal/z_vcpkg_setup_pkgconfig_path.md | 16 +++++++++++++ docs/maintainers/portfile-functions.md | 5 +++- .../maintainers/ports/vcpkg-cmake-get-vars.md | 3 +++ .../vcpkg_cmake_get_vars.md | 4 ++-- docs/regenerate.ps1 | 1 + .../boost-modular-build.cmake | 1 + ports/boost-modular-build-helper/vcpkg.json | 11 +++++++-- ports/ffmpeg/vcpkg.json | 4 ++-- ports/libgpiod/vcpkg.json | 3 ++- ports/vcpkg-cmake-get-vars/README.md | 3 +++ .../cmake_get_vars/CMakeLists.txt | 0 ports/vcpkg-cmake-get-vars/portfile.cmake | 14 +++++++++++ .../vcpkg-port-config.cmake | 2 ++ ports/vcpkg-cmake-get-vars/vcpkg.json | 11 +++++++++ .../vcpkg_cmake_get_vars.cmake | 0 ports/vcpkg-cmake/copyright | 23 ------------------- ports/vcpkg-cmake/portfile.cmake | 8 +++---- ports/vcpkg-cmake/vcpkg-port-config.cmake | 1 - ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-qmake/copyright | 23 ------------------- ports/vcpkg-qmake/portfile.cmake | 4 ++-- ports/vcpkg-qmake/vcpkg-port-config.cmake | 2 +- ports/vcpkg-qmake/vcpkg.json | 7 ++++-- versions/b-/boost-modular-build-helper.json | 5 ++++ versions/baseline.json | 14 +++++++---- versions/f-/ffmpeg.json | 5 ++++ versions/l-/libgpiod.json | 5 ++++ versions/v-/vcpkg-cmake-get-vars.json | 9 ++++++++ versions/v-/vcpkg-cmake.json | 5 ++++ versions/v-/vcpkg-qmake.json | 5 ++++ 30 files changed, 125 insertions(+), 71 deletions(-) create mode 100644 docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md create mode 100644 docs/maintainers/ports/vcpkg-cmake-get-vars.md rename docs/maintainers/ports/{vcpkg-cmake => vcpkg-cmake-get-vars}/vcpkg_cmake_get_vars.md (84%) create mode 100644 ports/vcpkg-cmake-get-vars/README.md rename ports/{vcpkg-cmake => vcpkg-cmake-get-vars}/cmake_get_vars/CMakeLists.txt (100%) create mode 100644 ports/vcpkg-cmake-get-vars/portfile.cmake create mode 100644 ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake create mode 100644 ports/vcpkg-cmake-get-vars/vcpkg.json rename ports/{vcpkg-cmake => vcpkg-cmake-get-vars}/vcpkg_cmake_get_vars.cmake (100%) delete mode 100644 ports/vcpkg-cmake/copyright delete mode 100644 ports/vcpkg-qmake/copyright create mode 100644 versions/v-/vcpkg-cmake-get-vars.json diff --git a/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md b/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md new file mode 100644 index 00000000000000..80c6654b76d55d --- /dev/null +++ b/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md @@ -0,0 +1,16 @@ +# z_vcpkg_setup_pkgconfig_path + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +`z_vcpkg_setup_pkgconfig_path` sets up environment variables to use `pkgconfig`, such as `PKG_CONFIG` and `PKG_CONFIG_PATH`. +The original values are restored with `z_vcpkg_restore_pkgconfig_path`. `BASE_DIRS` indicates the base directories to find `.pc` files; typically `${CURRENT_INSTALLED_DIR}`, or `${CURRENT_INSTALLED_DIR}/debug`. + +```cmake +z_vcpkg_setup_pkgconfig_path(BASE_DIRS <"${CURRENT_INSTALLED_DIR}" ...>) +# Build process that may transitively invoke pkgconfig +z_vcpkg_restore_pkgconfig_path() +``` + + +## Source +[scripts/cmake/z\_vcpkg\_setup\_pkgconfig\_path.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake) diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 0e6903a8072d25..b2b8a49ba6bb21 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -72,13 +72,16 @@ - [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md) - [vcpkg\_cmake\_configure](ports/vcpkg-cmake/vcpkg_cmake_configure.md) -- [vcpkg\_cmake\_get\_vars](ports/vcpkg-cmake/vcpkg_cmake_get_vars.md) - [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md) ### [vcpkg-cmake-config](ports/vcpkg-cmake-config.md) - [vcpkg\_cmake\_config\_fixup](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md) +### [vcpkg-cmake-get-vars](ports/vcpkg-cmake-get-vars.md) + +- [vcpkg\_cmake\_get\_vars](ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md) + ### [vcpkg-pkgconfig-get-modules](ports/vcpkg-pkgconfig-get-modules.md) - [x\_vcpkg\_pkgconfig\_get\_modules](ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md) diff --git a/docs/maintainers/ports/vcpkg-cmake-get-vars.md b/docs/maintainers/ports/vcpkg-cmake-get-vars.md new file mode 100644 index 00000000000000..4881c821851eae --- /dev/null +++ b/docs/maintainers/ports/vcpkg-cmake-get-vars.md @@ -0,0 +1,3 @@ +# vcpkg-cmake-get-vars + +This port contains a helper function to extract CMake variables into the scope of the portfile or other scripts diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md b/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md similarity index 84% rename from docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md rename to docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md index 50e7abde7c2ddd..a9d4a82b5dd490 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md +++ b/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md @@ -1,6 +1,6 @@ # vcpkg_cmake_get_vars -The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md). +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md). Runs a cmake configure with a dummy project to extract certain cmake variables @@ -38,4 +38,4 @@ message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CMAKE_CXX_FLAGS}") ``` ## Source -[ports/vcpkg-cmake/vcpkg\_cmake\_get\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake) +[ports/vcpkg-cmake-get-vars/vcpkg\_cmake\_get\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake) diff --git a/docs/regenerate.ps1 b/docs/regenerate.ps1 index f2f888a770046a..d3c9e241245934 100755 --- a/docs/regenerate.ps1 +++ b/docs/regenerate.ps1 @@ -28,6 +28,7 @@ class CMakeDocumentation { [String[]]$cmakeScriptsPorts = @( 'vcpkg-cmake' 'vcpkg-cmake-config' + 'vcpkg-cmake-get-vars' 'vcpkg-pkgconfig-get-modules' ) diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index dc192d7c7df78e..bb0fb6a1dd1902 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -1,5 +1,6 @@ include_guard(GLOBAL) include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake") get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY) diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 0c142cebc73aa4..04a067d5954547 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,11 +1,18 @@ { "name": "boost-modular-build-helper", "version": "1.79.0", - "port-version": 1, + "port-version": 2, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ "boost-uninstall", - "vcpkg-cmake" + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + } ] } diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index be2c4993a759a0..b179216734c5b2 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 12, + "port-version": 13, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -10,7 +10,7 @@ "license": null, "dependencies": [ { - "name": "vcpkg-cmake", + "name": "vcpkg-cmake-get-vars", "host": true }, { diff --git a/ports/libgpiod/vcpkg.json b/ports/libgpiod/vcpkg.json index bbbca0c71bd686..cf31258e3245fc 100644 --- a/ports/libgpiod/vcpkg.json +++ b/ports/libgpiod/vcpkg.json @@ -1,13 +1,14 @@ { "name": "libgpiod", "version": "1.6.3", + "port-version": 1, "description": "C library and tools for interacting with the linux GPIO character device", "homepage": "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git", "license": "LGPL-2.1-or-later", "supports": "linux & (x64 | arm64)", "dependencies": [ { - "name": "vcpkg-cmake", + "name": "vcpkg-cmake-get-vars", "host": true } ] diff --git a/ports/vcpkg-cmake-get-vars/README.md b/ports/vcpkg-cmake-get-vars/README.md new file mode 100644 index 00000000000000..4881c821851eae --- /dev/null +++ b/ports/vcpkg-cmake-get-vars/README.md @@ -0,0 +1,3 @@ +# vcpkg-cmake-get-vars + +This port contains a helper function to extract CMake variables into the scope of the portfile or other scripts diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt similarity index 100% rename from ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt rename to ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt diff --git a/ports/vcpkg-cmake-get-vars/portfile.cmake b/ports/vcpkg-cmake-get-vars/portfile.cmake new file mode 100644 index 00000000000000..4f3183adfd34ee --- /dev/null +++ b/ports/vcpkg-cmake-get-vars/portfile.cmake @@ -0,0 +1,14 @@ +if(VCPKG_CROSSCOMPILING) + # make FATAL_ERROR in CI when issue #16773 fixed + message(WARNING "vcpkg-cmake-get-vars is a host-only port; please mark it as a host port in your dependencies.") +endif() + +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake" + "${CMAKE_CURRENT_LIST_DIR}/cmake_get_vars" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) + diff --git a/ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake b/ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..d5b5c2b1ca7406 --- /dev/null +++ b/ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake") diff --git a/ports/vcpkg-cmake-get-vars/vcpkg.json b/ports/vcpkg-cmake-get-vars/vcpkg.json new file mode 100644 index 00000000000000..4121b30c2edcfd --- /dev/null +++ b/ports/vcpkg-cmake-get-vars/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "vcpkg-cmake-get-vars", + "version-date": "2022-05-10", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake b/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake similarity index 100% rename from ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake rename to ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake diff --git a/ports/vcpkg-cmake/copyright b/ports/vcpkg-cmake/copyright deleted file mode 100644 index 2e4eac8264fa4c..00000000000000 --- a/ports/vcpkg-cmake/copyright +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/ports/vcpkg-cmake/portfile.cmake b/ports/vcpkg-cmake/portfile.cmake index afc1ffbb47c81f..0b7dd502017ef7 100644 --- a/ports/vcpkg-cmake/portfile.cmake +++ b/ports/vcpkg-cmake/portfile.cmake @@ -1,4 +1,4 @@ -if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET) +if(VCPKG_CROSSCOMPILING) # make FATAL_ERROR in CI when issue #16773 fixed message(WARNING "vcpkg-cmake is a host-only port; please mark it as a host port in your dependencies.") endif() @@ -7,10 +7,8 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake" "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake" "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake" - "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake" - "${CMAKE_CURRENT_LIST_DIR}/cmake_get_vars" "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" - "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) diff --git a/ports/vcpkg-cmake/vcpkg-port-config.cmake b/ports/vcpkg-cmake/vcpkg-port-config.cmake index 2eb9f372339010..f2a973d4ebcba6 100644 --- a/ports/vcpkg-cmake/vcpkg-port-config.cmake +++ b/ports/vcpkg-cmake/vcpkg-port-config.cmake @@ -1,4 +1,3 @@ include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake") include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake") include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake") diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 3c3cebde55fdff..9687cf2eb9cb0f 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-05-06", + "version-date": "2022-05-10", "license": "MIT" } diff --git a/ports/vcpkg-qmake/copyright b/ports/vcpkg-qmake/copyright deleted file mode 100644 index 2e4eac8264fa4c..00000000000000 --- a/ports/vcpkg-qmake/copyright +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/ports/vcpkg-qmake/portfile.cmake b/ports/vcpkg-qmake/portfile.cmake index 78afac0870b3eb..d2ff5db1572795 100644 --- a/ports/vcpkg-qmake/portfile.cmake +++ b/ports/vcpkg-qmake/portfile.cmake @@ -1,7 +1,7 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg_qmake_configure.cmake" "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" - "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) diff --git a/ports/vcpkg-qmake/vcpkg-port-config.cmake b/ports/vcpkg-qmake/vcpkg-port-config.cmake index 763a7521f2edbd..325cba3b91df45 100644 --- a/ports/vcpkg-qmake/vcpkg-port-config.cmake +++ b/ports/vcpkg-qmake/vcpkg-port-config.cmake @@ -1,4 +1,4 @@ include_guard(GLOBAL) -include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake") include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_qmake_configure.cmake") diff --git a/ports/vcpkg-qmake/vcpkg.json b/ports/vcpkg-qmake/vcpkg.json index af140d3c24cbb4..ea5b8a11d32a7e 100644 --- a/ports/vcpkg-qmake/vcpkg.json +++ b/ports/vcpkg-qmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-qmake", - "version-date": "2022-02-14", + "version-date": "2022-05-10", "license": "MIT", "supports": "native", "dependencies": [ @@ -9,6 +9,9 @@ "name": "qtbase", "default-features": false }, - "vcpkg-cmake" + { + "name": "vcpkg-cmake-get-vars", + "host": true + } ] } diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 2502362696f90b..f79f065a705a1d 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e02a1f1b06a492d932f309feab8ac7751b0327ca", + "version": "1.79.0", + "port-version": 2 + }, { "git-tree": "dcb306fc661bfab322c75b55472e402387396099", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index a029f24e10f3ac..37dfe4cff9c2fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.79.0", - "port-version": 1 + "port-version": 2 }, "boost-move": { "baseline": "1.79.0", @@ -2206,7 +2206,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 12 + "port-version": 13 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -3610,7 +3610,7 @@ }, "libgpiod": { "baseline": "1.6.3", - "port-version": 0 + "port-version": 1 }, "libgpod": { "baseline": "2019-08-29", @@ -7329,13 +7329,17 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-05-06", + "baseline": "2022-05-10", "port-version": 0 }, "vcpkg-cmake-config": { "baseline": "2022-02-06", "port-version": 0 }, + "vcpkg-cmake-get-vars": { + "baseline": "2022-05-10", + "port-version": 0 + }, "vcpkg-get-python-packages": { "baseline": "2022-04-11", "port-version": 0 @@ -7353,7 +7357,7 @@ "port-version": 0 }, "vcpkg-qmake": { - "baseline": "2022-02-14", + "baseline": "2022-05-10", "port-version": 0 }, "vcpkg-tool-gn": { diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index cf2dda6d97f01c..a78b82a214556c 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad64f5ffe64b5fcd97e2e6d98273b70d498d6af0", + "version": "4.4.1", + "port-version": 13 + }, { "git-tree": "84064f1dfced06504fd3d76b60f8e21b37c22c2b", "version": "4.4.1", diff --git a/versions/l-/libgpiod.json b/versions/l-/libgpiod.json index 8737d8f5d0f017..f63117753037ad 100644 --- a/versions/l-/libgpiod.json +++ b/versions/l-/libgpiod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "014bb3350492c4259151f00b3419e2054f707401", + "version": "1.6.3", + "port-version": 1 + }, { "git-tree": "9a8b2a2d891f2435ff9ce3fbcea0bd870327bad0", "version": "1.6.3", diff --git a/versions/v-/vcpkg-cmake-get-vars.json b/versions/v-/vcpkg-cmake-get-vars.json new file mode 100644 index 00000000000000..992a7e24453c29 --- /dev/null +++ b/versions/v-/vcpkg-cmake-get-vars.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "181f509cdab757511233106aa44c529e04c0c29f", + "version-date": "2022-05-10", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index ecc5876cd29787..e9e3468fa82fbe 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8db2f70aa8b584aac932fcff65d91bf52d57731", + "version-date": "2022-05-10", + "port-version": 0 + }, { "git-tree": "46a5686341cf9136053ff01b9f213dbd2dbea8a6", "version-date": "2022-05-06", diff --git a/versions/v-/vcpkg-qmake.json b/versions/v-/vcpkg-qmake.json index 5a33b40061d1ff..a3e4ee7e744ece 100644 --- a/versions/v-/vcpkg-qmake.json +++ b/versions/v-/vcpkg-qmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f5f5955d901ed2c7caac9e3681d23338d8fe845", + "version-date": "2022-05-10", + "port-version": 0 + }, { "git-tree": "5096e32d02b21d8f2546edf3829cbb8ee2d50425", "version-date": "2022-02-14", From 1e24ff507492069fa2be89d6fb32d8b12b1fffd4 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 13 May 2022 07:22:01 +0800 Subject: [PATCH 237/383] [ignition-*] Update hashes (#24618) * [ignition-cmake0, ignition-cmake2] Update hash * x-add-version * Fix other ignition SHAs and use vcpkg-port-config.cmake modern machinery. * add license * x-add-version * format vcpkg.json * x-add-version * Add FILE_DISAMBIGUATOR Co-authored-by: Lily Wang Co-authored-by: Billy Robert O'Neal III --- ports/ignition-cmake0/portfile.cmake | 18 +++++----- ports/ignition-cmake0/vcpkg.json | 10 ++++-- ports/ignition-cmake2/portfile.cmake | 6 ++-- ports/ignition-cmake2/vcpkg.json | 8 +++-- ports/ignition-common1/portfile.cmake | 4 +-- ports/ignition-common1/vcpkg.json | 9 +++-- ports/ignition-common3/portfile.cmake | 4 +-- ports/ignition-common3/vcpkg.json | 10 ++++-- ports/ignition-fuel-tools1/portfile.cmake | 4 +-- ports/ignition-fuel-tools1/vcpkg.json | 9 +++-- ports/ignition-fuel-tools4/portfile.cmake | 4 +-- ports/ignition-fuel-tools4/vcpkg.json | 10 ++++-- ports/ignition-math4/portfile.cmake | 4 +-- ports/ignition-math4/vcpkg.json | 11 ++++-- ports/ignition-math6/portfile.cmake | 4 +-- ports/ignition-math6/vcpkg.json | 10 ++++-- ports/ignition-modularscripts/portfile.cmake | 11 +++--- ..._library.cmake => vcpkg-port-config.cmake} | 1 + ports/ignition-modularscripts/vcpkg.json | 6 ++-- ports/ignition-msgs1/portfile.cmake | 4 +-- ports/ignition-msgs1/vcpkg.json | 9 +++-- ports/ignition-msgs5/portfile.cmake | 4 +-- ports/ignition-msgs5/vcpkg.json | 8 +++-- ports/ignition-msgs6/portfile.cmake | 4 +-- ports/ignition-msgs6/vcpkg.json | 8 +++-- ports/ignition-plugin1/portfile.cmake | 4 +-- ports/ignition-plugin1/vcpkg.json | 10 ++++-- ports/ignition-transport4/portfile.cmake | 4 +-- ports/ignition-transport4/vcpkg.json | 8 +++-- ports/ignition-transport8/portfile.cmake | 4 +-- ports/ignition-transport8/vcpkg.json | 9 +++-- ports/ignition-transport9/portfile.cmake | 4 +-- ports/ignition-transport9/vcpkg.json | 7 +++- versions/baseline.json | 34 +++++++++---------- versions/i-/ignition-cmake0.json | 5 +++ versions/i-/ignition-cmake2.json | 5 +++ versions/i-/ignition-common1.json | 5 +++ versions/i-/ignition-common3.json | 5 +++ versions/i-/ignition-fuel-tools1.json | 5 +++ versions/i-/ignition-fuel-tools4.json | 5 +++ versions/i-/ignition-math4.json | 5 +++ versions/i-/ignition-math6.json | 5 +++ versions/i-/ignition-modularscripts.json | 5 +++ versions/i-/ignition-msgs1.json | 5 +++ versions/i-/ignition-msgs5.json | 5 +++ versions/i-/ignition-msgs6.json | 5 +++ versions/i-/ignition-plugin1.json | 5 +++ versions/i-/ignition-transport4.json | 5 +++ versions/i-/ignition-transport8.json | 5 +++ versions/i-/ignition-transport9.json | 5 +++ 50 files changed, 230 insertions(+), 114 deletions(-) rename ports/ignition-modularscripts/{ignition_modular_library.cmake => vcpkg-port-config.cmake} (99%) diff --git a/ports/ignition-cmake0/portfile.cmake b/ports/ignition-cmake0/portfile.cmake index c57d7b03e9f0b2..4e2d7dbaadd45a 100644 --- a/ports/ignition-cmake0/portfile.cmake +++ b/ports/ignition-cmake0/portfile.cmake @@ -1,26 +1,24 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - set(PACKAGE_VERSION "0.6.1") ignition_modular_library(NAME cmake - VERSION ${PACKAGE_VERSION} + VERSION ${PACKAGE_VERSION} REF "ignition-cmake_${PACKAGE_VERSION}" - SHA512 bd57cd43dd944fef264353b67fbbbab989d4bb638b684f80868a8b61fe0b854e156e00852b967c7caa8598315bea60bd8b27ff000410e93c4f04185a13c90489 + SHA512 9414db04ef6ce0206aba4eb1c8192524249761976b82654da89222e0931d1e2bbd63dcc7f4e6c6fddbc71e54911e9bf9fcbd159f51862e89419e0686bfb035e9 # Ensure that gtest is not compiled (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/163) PATCHES do-not-compile-gtest.patch - # Support for ARM64 (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/168) - support-arm64.patch - # Do not depend on pkg-config installed to find uuid + # Support for ARM64 (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/168) + support-arm64.patch + # Do not depend on pkg-config installed to find uuid uuid-do-not-require-pkg-config.patch # Fix FindIgnCURL.cmake (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/175) fix-find-ign-curl.patch - ) + ) # Permit empty include folder set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Remove unneccessary directory, as ignition-cmake is a pure CMake package -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") # Install custom usage -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/ignition-cmake0/vcpkg.json b/ports/ignition-cmake0/vcpkg.json index 4decf445a61339..6d97e8a6e88e7d 100644 --- a/ports/ignition-cmake0/vcpkg.json +++ b/ports/ignition-cmake0/vcpkg.json @@ -1,10 +1,14 @@ { "name": "ignition-cmake0", - "version-string": "0.6.2", - "port-version": 3, + "version": "0.6.2", + "port-version": 4, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", + "license": null, "dependencies": [ - "ignition-modularscripts" + { + "name": "ignition-modularscripts", + "host": true + } ] } diff --git a/ports/ignition-cmake2/portfile.cmake b/ports/ignition-cmake2/portfile.cmake index 454a84f1734052..cdf98d511d0d99 100644 --- a/ports/ignition-cmake2/portfile.cmake +++ b/ports/ignition-cmake2/portfile.cmake @@ -1,11 +1,9 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - set(PACKAGE_VERSION "2.5.0") ignition_modular_library(NAME cmake VERSION ${PACKAGE_VERSION} - SHA512 dc546e5e4deabba12faec5fb0162309dfce9b429a6bbd6637c058acdda3eb4fa1e44e9b71f55603d0cff77550117dafc3fc8475621ede65fa8aa915254beb463 + SHA512 e39ed44ae6f7ccc338412f466f1257f88989e0818bee801ddbe09350e906cd9ce709be24356310fdbfde22d1b5b5846fed0aa794c06dcf7caf82748a07b428d6 PATCHES FindGTS.patch) # Install custom usage -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/ignition-cmake2/vcpkg.json b/ports/ignition-cmake2/vcpkg.json index 52c91489255fb7..8f00a65bc3022d 100644 --- a/ports/ignition-cmake2/vcpkg.json +++ b/ports/ignition-cmake2/vcpkg.json @@ -1,10 +1,14 @@ { "name": "ignition-cmake2", "version": "2.5.0", - "port-version": 1, + "port-version": 2, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", + "license": null, "dependencies": [ - "ignition-modularscripts" + { + "name": "ignition-modularscripts", + "host": true + } ] } diff --git a/ports/ignition-common1/portfile.cmake b/ports/ignition-common1/portfile.cmake index 20567312381bad..6bea5e2e223078 100644 --- a/ports/ignition-common1/portfile.cmake +++ b/ports/ignition-common1/portfile.cmake @@ -1,6 +1,4 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME common VERSION "1.1.1" REF ignition-common_1.1.1 - SHA512 e96e82dc401281cd31843f4b0ae2c1d23589170869621ea62eb6d6b31b11bd622c14da7046b1993c8fc67a1d39bae9a96b9f8efc8923e305823f963d864975f7) + SHA512 3311a07fad8fdf809ff3f865de2493ec17c3dd157ee3297f283cf872090fb9e9f05b163416dca32f1bdf2bde02c9b4a9a7defc308344b747a8d113594f65f309) diff --git a/ports/ignition-common1/vcpkg.json b/ports/ignition-common1/vcpkg.json index a7df59922a9abb..bb85740f14822a 100644 --- a/ports/ignition-common1/vcpkg.json +++ b/ports/ignition-common1/vcpkg.json @@ -1,8 +1,9 @@ { "name": "ignition-common1", - "version-string": "1.1.1", - "port-version": 2, + "version": "1.1.1", + "port-version": 3, "description": "Common libraries for robotics applications", + "license": null, "dependencies": [ { "name": "dlfcn-win32", @@ -22,6 +23,10 @@ }, "ignition-cmake0", "ignition-math4", + { + "name": "ignition-modularscripts", + "host": true + }, { "name": "tinyxml2", "platform": "!windows & !uwp" diff --git a/ports/ignition-common3/portfile.cmake b/ports/ignition-common3/portfile.cmake index 93059ae239de58..1f460f1c567f7e 100644 --- a/ports/ignition-common3/portfile.cmake +++ b/ports/ignition-common3/portfile.cmake @@ -1,8 +1,6 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME common VERSION "3.9.0" - SHA512 8d052850cbb125e334494c9ad9b234c371fe310327dba997515651f29479d747dffa55b0aa822f2a78e6317a4df2d41389c7a07165cdc08894fdfb116e4d9756) + SHA512 1bae86efd7da10ac517d67a75ad1b612ea2046128eb75e0f0a134ffff7cc76431e850a9b46fdb7dc6603e2acb044f4204fdedaf38fc7bff82883db3f36830fb9) # Remove non-relocatable helper scripts (see https://github.com/ignitionrobotics/ign-common/issues/82) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ign_remotery_vis" "${CURRENT_PACKAGES_DIR}/debug/bin/ign_remotery_vis") diff --git a/ports/ignition-common3/vcpkg.json b/ports/ignition-common3/vcpkg.json index 700d243cb4bd98..341296b8481d04 100644 --- a/ports/ignition-common3/vcpkg.json +++ b/ports/ignition-common3/vcpkg.json @@ -1,9 +1,10 @@ { "name": "ignition-common3", - "version-string": "3.9.0", - "port-version": 2, + "version": "3.9.0", + "port-version": 3, "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", + "license": null, "dependencies": [ { "name": "dlfcn-win32", @@ -14,7 +15,10 @@ "gts", "ignition-cmake2", "ignition-math6", - "ignition-modularscripts", + { + "name": "ignition-modularscripts", + "host": true + }, { "name": "libuuid", "platform": "!windows & !uwp & !osx" diff --git a/ports/ignition-fuel-tools1/portfile.cmake b/ports/ignition-fuel-tools1/portfile.cmake index c7c310294557cf..3911029ed13b91 100644 --- a/ports/ignition-fuel-tools1/portfile.cmake +++ b/ports/ignition-fuel-tools1/portfile.cmake @@ -1,9 +1,7 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME fuel-tools VERSION "1.2.0" CMAKE_PACKAGE_NAME ignition-fuel_tools1 - SHA512 a656fed74fb2138b3bcf7d35b25ad06da95cfb9a3ad7ded2c9c54db385f55ea310fd1a72dcf6400b0a6199e376c1ba2d11ee2a08c66e3c2cc8b2ee1b25406986 + SHA512 44ce9215231981f393cf1f6f83071e3f1c5d29bef4fab8d6483eb136b6e2a2e4273e85845f8b2336c4d50ac5fdcc6eb028a972baa0950083c8fa700f85cc7078 # Ensure yaml is correctly linked (backport of https://bitbucket.org/ignitionrobotics/ign-fuel-tools/pull-requests/103/use-yaml_target-instead-of-yaml-yaml/diff) PATCHES link-correct-yaml-target.patch # This can be removed when the pc file of curl is fixed diff --git a/ports/ignition-fuel-tools1/vcpkg.json b/ports/ignition-fuel-tools1/vcpkg.json index 3c4435458b5186..1f4b69293731f3 100644 --- a/ports/ignition-fuel-tools1/vcpkg.json +++ b/ports/ignition-fuel-tools1/vcpkg.json @@ -1,12 +1,17 @@ { "name": "ignition-fuel-tools1", - "version-string": "1.2.0", - "port-version": 3, + "version": "1.2.0", + "port-version": 4, "description": "Tools for using fuel API to download robot models", + "license": null, "dependencies": [ "curl", "ignition-cmake0", "ignition-common1", + { + "name": "ignition-modularscripts", + "host": true + }, "jsoncpp", "libyaml", "libzip" diff --git a/ports/ignition-fuel-tools4/portfile.cmake b/ports/ignition-fuel-tools4/portfile.cmake index 3e88cbcc204e81..f542987fff9968 100644 --- a/ports/ignition-fuel-tools4/portfile.cmake +++ b/ports/ignition-fuel-tools4/portfile.cmake @@ -1,7 +1,5 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME fuel-tools VERSION "4.3.0" CMAKE_PACKAGE_NAME ignition-fuel_tools4 - SHA512 451d7bcd195a8ce41c3a7d64ad936c8c0812cbc7af03dbe75cbdc359599bf1f828595833c1758d4de8e37c37730bb852de95b2256ff9134af4ab197df2b66a8b + SHA512 1996e487bf8dcb29798064b1a12fe972931e84bcb19a4df2398d34cda9963bc9eef6dd14446c22c18f0de894dcdf35852669ce62b57562b1609045248f41ea0f ) diff --git a/ports/ignition-fuel-tools4/vcpkg.json b/ports/ignition-fuel-tools4/vcpkg.json index 093056ffbcdece..3b5b17a119c027 100644 --- a/ports/ignition-fuel-tools4/vcpkg.json +++ b/ports/ignition-fuel-tools4/vcpkg.json @@ -1,14 +1,18 @@ { "name": "ignition-fuel-tools4", - "version-string": "4.3.0", - "port-version": 1, + "version": "4.3.0", + "port-version": 2, "description": "Tools for using fuel API to download robot models", "homepage": "https://ignitionrobotics.org/libs/fuel_tools", + "license": null, "dependencies": [ "curl", "ignition-cmake2", "ignition-common3", - "ignition-modularscripts", + { + "name": "ignition-modularscripts", + "host": true + }, "ignition-msgs5", "jsoncpp", "libyaml", diff --git a/ports/ignition-math4/portfile.cmake b/ports/ignition-math4/portfile.cmake index 8d5148477ca3eb..352330d67695b6 100644 --- a/ports/ignition-math4/portfile.cmake +++ b/ports/ignition-math4/portfile.cmake @@ -1,5 +1,3 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME math VERSION "4.0.0" - SHA512 5996af60666a1166fc19b2db9715f7214341becb8eb6071c09315e1f71e759c6de4da99b44312829fc7b2bdef7e0f3671e4d2a92e0d2dd5d5fd782a6c46b012a) + SHA512 b0559c691335d43e4cbb986ff13cdee9c65ce59d8e3a15808d9b052fc064263560fece71d670d5417b4b713fcd7ac32f5b808703ff472979a7226e0c1b2089aa) diff --git a/ports/ignition-math4/vcpkg.json b/ports/ignition-math4/vcpkg.json index bcdab1843b2a7a..33466e29004dbf 100644 --- a/ports/ignition-math4/vcpkg.json +++ b/ports/ignition-math4/vcpkg.json @@ -1,10 +1,15 @@ { "name": "ignition-math4", - "version-string": "4.0.0", - "port-version": 2, + "version": "4.0.0", + "port-version": 3, "description": "Math API for robotic applications", "homepage": "https://ignitionrobotics.org/libs/math", + "license": null, "dependencies": [ - "ignition-cmake0" + "ignition-cmake0", + { + "name": "ignition-modularscripts", + "host": true + } ] } diff --git a/ports/ignition-math6/portfile.cmake b/ports/ignition-math6/portfile.cmake index b0254303f1feb0..fc9ac44696bb8e 100644 --- a/ports/ignition-math6/portfile.cmake +++ b/ports/ignition-math6/portfile.cmake @@ -1,6 +1,4 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME math VERSION "6.6.0" - SHA512 1b5f59b45256daa81cbfb7da4727200d0d6cb4a75fbc3b83b512c18ec6307b5bd78b8ee7a84f0f8a8c334717a1480766f62658bd213e9021c09c0ed22caa921d + SHA512 6c0a6e7098f31b3dc9abbcd8714808669eca10e385748d4c1b44aa06dcfa5701906bea0277a99c3132fdd1a8c9a8e9c593099ac0eedfe5dec370018b2b63bfec PATCHES fix-isspace.patch) diff --git a/ports/ignition-math6/vcpkg.json b/ports/ignition-math6/vcpkg.json index 9d934867b3d8e8..dc47d87539175b 100644 --- a/ports/ignition-math6/vcpkg.json +++ b/ports/ignition-math6/vcpkg.json @@ -1,12 +1,16 @@ { "name": "ignition-math6", - "version-string": "6.6.0", - "port-version": 2, + "version": "6.6.0", + "port-version": 3, "description": "Math API for robotic applications", "homepage": "https://ignitionrobotics.org/libs/math", + "license": null, "dependencies": [ "eigen3", "ignition-cmake2", - "ignition-modularscripts" + { + "name": "ignition-modularscripts", + "host": true + } ] } diff --git a/ports/ignition-modularscripts/portfile.cmake b/ports/ignition-modularscripts/portfile.cmake index 509240d7dde999..cabf97adcf7587 100644 --- a/ports/ignition-modularscripts/portfile.cmake +++ b/ports/ignition-modularscripts/portfile.cmake @@ -1,8 +1,7 @@ -file(COPY - ${CMAKE_CURRENT_LIST_DIR}/ignition_modular_library.cmake - DESTINATION - ${CURRENT_PACKAGES_DIR}/share/ignitionmodularscripts -) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/ignitionmodularscripts/copyright "") +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/ignition-modularscripts/ignition_modular_library.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake similarity index 99% rename from ports/ignition-modularscripts/ignition_modular_library.cmake rename to ports/ignition-modularscripts/vcpkg-port-config.cmake index 9492531e87e826..8a1729d50de368 100644 --- a/ports/ignition-modularscripts/ignition_modular_library.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -141,6 +141,7 @@ function(ignition_modular_library) SHA512 ${IML_SHA512} HEAD_REF ${IML_HEAD_REF} PATCHES ${IML_PATCHES} + FILE_DISAMBIGUATOR 1 ) # Build library diff --git a/ports/ignition-modularscripts/vcpkg.json b/ports/ignition-modularscripts/vcpkg.json index d6c0c638bb10c9..9384dc5b678f97 100644 --- a/ports/ignition-modularscripts/vcpkg.json +++ b/ports/ignition-modularscripts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ignition-modularscripts", - "version-string": "2020-11-23", - "port-version": 1, - "description": "Vcpkg helpers to package ignition libraries" + "version-date": "2022-05-11", + "description": "Vcpkg helpers to package ignition libraries", + "license": null } diff --git a/ports/ignition-msgs1/portfile.cmake b/ports/ignition-msgs1/portfile.cmake index 0b2215f4942819..fd8d1a227c0319 100644 --- a/ports/ignition-msgs1/portfile.cmake +++ b/ports/ignition-msgs1/portfile.cmake @@ -1,5 +1,3 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - # Explicitly disable cross-compilation until the upstream discussion # https://bitbucket.org/ignitionrobotics/ign-msgs/issues/34/add-support-for-cross-compilation is solved if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86") @@ -18,6 +16,6 @@ ignition_modular_library(NAME msgs VERSION "1.0.0" # See https://bitbucket.org/ignitionrobotics/ign-msgs/issues/33/the-ignition-msgs1_100-tag-does-not-match REF ignition-msgs_1.0.0 - SHA512 3a270f0ac988b947091d4626be48fe8cfed5ddfde5a37b9d0f08fddcbf278099ab231fca11e2dd2296ca54e0350ea14e3f685dc238f0827f18f10ab7b75039de + SHA512 18475cc76cc3b58e451faf7a57a0145a9b419cf3e4312627202d96982b066df48cbabcc9991b79a176c5180b90f019dc30114286ad5562c483759052cf63d945 # Fix linking order of protobuf libraries (backport of https://bitbucket.org/ignitionrobotics/ign-msgs/pull-requests/151) PATCHES fix-protobuf-static-link-order.patch) diff --git a/ports/ignition-msgs1/vcpkg.json b/ports/ignition-msgs1/vcpkg.json index f81434b7afec2b..cdbb4a9dc32e25 100644 --- a/ports/ignition-msgs1/vcpkg.json +++ b/ports/ignition-msgs1/vcpkg.json @@ -1,11 +1,16 @@ { "name": "ignition-msgs1", - "version-string": "1.0.0", - "port-version": 4, + "version": "1.0.0", + "port-version": 5, "description": "Middleware protobuf messages for robotics", + "license": null, "dependencies": [ "ignition-cmake0", "ignition-math4", + { + "name": "ignition-modularscripts", + "host": true + }, "protobuf" ] } diff --git a/ports/ignition-msgs5/portfile.cmake b/ports/ignition-msgs5/portfile.cmake index 23a05709d203aa..0a5dd24309fb0d 100644 --- a/ports/ignition-msgs5/portfile.cmake +++ b/ports/ignition-msgs5/portfile.cmake @@ -1,10 +1,8 @@ # Cross-compilation is disabled until the upstream discussion # https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME msgs VERSION "5.3.0" - SHA512 55c167d00b60ae6da0144a9495e9ac8aed61fcbdc61e057e75d31261e335c573543d60e28a7dc195a7c9849c5c6eb0e088d4f4e79fd927e83470a3f1fabef60e + SHA512 645ae5317fb4c3c1b452e98c3581363fc939b5b963dae8a2097bcee97584819bd80357397d88728c5917142dd4ac9beecc335862df44fc06a46d8aa62c54e389 PATCHES "01-protobuf.patch") diff --git a/ports/ignition-msgs5/vcpkg.json b/ports/ignition-msgs5/vcpkg.json index d215d8c47013ba..0614ee322b87df 100644 --- a/ports/ignition-msgs5/vcpkg.json +++ b/ports/ignition-msgs5/vcpkg.json @@ -1,13 +1,17 @@ { "name": "ignition-msgs5", "version": "5.3.0", - "port-version": 4, + "port-version": 5, "description": "Middleware protobuf messages for robotics", + "license": null, "supports": "!(arm | uwp)", "dependencies": [ "ignition-cmake2", "ignition-math6", - "ignition-modularscripts", + { + "name": "ignition-modularscripts", + "host": true + }, "protobuf", "tinyxml2" ] diff --git a/ports/ignition-msgs6/portfile.cmake b/ports/ignition-msgs6/portfile.cmake index 41f29fa1e61896..c7b6967060e251 100644 --- a/ports/ignition-msgs6/portfile.cmake +++ b/ports/ignition-msgs6/portfile.cmake @@ -1,8 +1,6 @@ # Cross-compilation is explicitly disabled until the upstream discussion # https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME msgs VERSION "6.0.0" - SHA512 d1d6f6602ae33ec95b36c5df7815b06970f349492ef0309d8aacbaf2dca0c3e7314bbd64890a2554485fbd52f148a90b7bf54dceb0b3a1dd40eeb1f5bdb9613c) + SHA512 d7b76b61d37bc4bb2fd1319e2e2d8313fbcc52f51253b7c487bcdb7dabffcf50653fc5c709eb356d8b6ae20500c1fd32ffabc1fcfb28dd14346a10030fb6cd46) diff --git a/ports/ignition-msgs6/vcpkg.json b/ports/ignition-msgs6/vcpkg.json index df11c0d2f49875..9e8b193ec22de3 100644 --- a/ports/ignition-msgs6/vcpkg.json +++ b/ports/ignition-msgs6/vcpkg.json @@ -1,13 +1,17 @@ { "name": "ignition-msgs6", "version": "6.0.0", - "port-version": 3, + "port-version": 4, "description": "Middleware protobuf messages for robotics", + "license": null, "supports": "!(arm | uwp)", "dependencies": [ "ignition-cmake2", "ignition-math6", - "ignition-modularscripts", + { + "name": "ignition-modularscripts", + "host": true + }, "protobuf", "tinyxml2" ] diff --git a/ports/ignition-plugin1/portfile.cmake b/ports/ignition-plugin1/portfile.cmake index daa626047409d1..106c8e7970161a 100644 --- a/ports/ignition-plugin1/portfile.cmake +++ b/ports/ignition-plugin1/portfile.cmake @@ -1,7 +1,5 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - set(PACKAGE_VERSION "1.1.0") ignition_modular_library(NAME plugin VERSION ${PACKAGE_VERSION} REF "ignition-plugin_${PACKAGE_VERSION}" - SHA512 0657c5816e67d02329a79364050b8a56957180e5b7481b01696c7369b063cbfedfc93793a8ad92d87d242d24e476283dc7847bd810a3de98d3ec5ae7d640568c) + SHA512 e932dd7e7b042e9fb4c0569cb8b4028e54c394228aadf6523fa60ab1b9f7f9a17d14c79886a76365e2c47423c221aaef9ca77df638d87e2b6edb82eea10c0a3d) diff --git a/ports/ignition-plugin1/vcpkg.json b/ports/ignition-plugin1/vcpkg.json index 58e42c8c1ef392..8a59e3a2d3e577 100644 --- a/ports/ignition-plugin1/vcpkg.json +++ b/ports/ignition-plugin1/vcpkg.json @@ -1,15 +1,19 @@ { "name": "ignition-plugin1", - "version-string": "1.1.0", - "port-version": 1, + "version": "1.1.0", + "port-version": 2, "description": "Library for registering plugin libraries and dynamically loading them at runtime", "homepage": "https://ignitionrobotics.org/libs/plugin", + "license": null, "dependencies": [ { "name": "dlfcn-win32", "platform": "windows | uwp" }, "ignition-cmake2", - "ignition-modularscripts" + { + "name": "ignition-modularscripts", + "host": true + } ] } diff --git a/ports/ignition-transport4/portfile.cmake b/ports/ignition-transport4/portfile.cmake index 09a868c14002d6..0f70168c9e1e8e 100644 --- a/ports/ignition-transport4/portfile.cmake +++ b/ports/ignition-transport4/portfile.cmake @@ -1,8 +1,6 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME transport VERSION "4.0.0" - SHA512 d4125044c21fdd6754f3b8b06f372df3f858080d5d33e97ed7a8ef8f6fb9857d562082aad41c89ea9146a33b1c3814305d33c5c8f8bcde66a16477b4a01655b4 + SHA512 581dd4700aebc455f6d7c01d8be17c6c4c802fd74b1504b2bd6544a0246b161231305fd318352904e230c986dfe072fa0608fccea9066b076e7216dc507a8510 # This can be removed when the pc file of libuuid on Windows is fixed DISABLE_PKGCONFIG_INSTALL PATCHES diff --git a/ports/ignition-transport4/vcpkg.json b/ports/ignition-transport4/vcpkg.json index b7e6b193e35925..2658f13ee1b744 100644 --- a/ports/ignition-transport4/vcpkg.json +++ b/ports/ignition-transport4/vcpkg.json @@ -1,12 +1,16 @@ { "name": "ignition-transport4", "version": "4.0.0", - "port-version": 5, + "port-version": 6, "description": "Transport middleware for robotics", + "license": null, "dependencies": [ "cppzmq", "ignition-cmake0", - "ignition-modularscripts", + { + "name": "ignition-modularscripts", + "host": true + }, "ignition-msgs1", { "name": "libuuid", diff --git a/ports/ignition-transport8/portfile.cmake b/ports/ignition-transport8/portfile.cmake index 1155a1ab52a559..a01b24ee2f71f8 100644 --- a/ports/ignition-transport8/portfile.cmake +++ b/ports/ignition-transport8/portfile.cmake @@ -1,7 +1,5 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME transport VERSION "8.1.0" - SHA512 eb64f18721190fcb79a5b45746fd44fa24274c6fe6c5021dd9306c15a327873377d07d4aa770633982038b84da650d3d0c8a56169222c0c88fa1318314fc4529 + SHA512 04b4cd954453505398da35b284e7db4b4691d9a705924c41e0082fd20e94176a3eaeae7329fd9992aaa50f90b2d8973c71daf763ccff58aa30d06be1da15189a # This can be removed when the pc file of sqlite3 is available ( https://github.com/microsoft/vcpkg/issues/14327 ) DISABLE_PKGCONFIG_INSTALL) diff --git a/ports/ignition-transport8/vcpkg.json b/ports/ignition-transport8/vcpkg.json index 8dd933199cfc7e..0c088bc709cbbf 100644 --- a/ports/ignition-transport8/vcpkg.json +++ b/ports/ignition-transport8/vcpkg.json @@ -1,11 +1,16 @@ { "name": "ignition-transport8", - "version-string": "8.1.0", - "port-version": 2, + "version": "8.1.0", + "port-version": 3, "description": "Transport middleware for robotics", + "license": null, "dependencies": [ "cppzmq", "ignition-cmake2", + { + "name": "ignition-modularscripts", + "host": true + }, "ignition-msgs5", { "name": "libuuid", diff --git a/ports/ignition-transport9/portfile.cmake b/ports/ignition-transport9/portfile.cmake index fcd8e6b46f1d26..0396815664ae87 100644 --- a/ports/ignition-transport9/portfile.cmake +++ b/ports/ignition-transport9/portfile.cmake @@ -1,8 +1,6 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME transport VERSION "9.0.0" - SHA512 c3edb7a8a063b4aa5826838ae08c8ec2b3d14563492022df632a719409c95272f4f6a43d91f0c317e44b85921b5aedc1685670b81a7baa949f01af3b3534d76e + SHA512 9add7a8d3a43a17b1b71e7d7d9320909057c1f79880bd969baa99949709cdbb63f00f0735990891358bb29efd9c0ab8b6725b7c340c324b9266dcc9b73d767d4 # This can be removed when the pc file of sqlite3 is available ( https://github.com/microsoft/vcpkg/issues/14327 ) DISABLE_PKGCONFIG_INSTALL PATCHES diff --git a/ports/ignition-transport9/vcpkg.json b/ports/ignition-transport9/vcpkg.json index cfbbf4d87902ea..59e5483f49522f 100644 --- a/ports/ignition-transport9/vcpkg.json +++ b/ports/ignition-transport9/vcpkg.json @@ -1,11 +1,16 @@ { "name": "ignition-transport9", "version": "9.0.0", - "port-version": 3, + "port-version": 4, "description": "Transport middleware for robotics", + "license": null, "dependencies": [ "cppzmq", "ignition-cmake2", + { + "name": "ignition-modularscripts", + "host": true + }, "ignition-msgs6", { "name": "libuuid", diff --git a/versions/baseline.json b/versions/baseline.json index 37dfe4cff9c2fc..31923abfb91580 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2842,67 +2842,67 @@ }, "ignition-cmake0": { "baseline": "0.6.2", - "port-version": 3 + "port-version": 4 }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 1 + "port-version": 2 }, "ignition-common1": { "baseline": "1.1.1", - "port-version": 2 + "port-version": 3 }, "ignition-common3": { "baseline": "3.9.0", - "port-version": 2 + "port-version": 3 }, "ignition-fuel-tools1": { "baseline": "1.2.0", - "port-version": 3 + "port-version": 4 }, "ignition-fuel-tools4": { "baseline": "4.3.0", - "port-version": 1 + "port-version": 2 }, "ignition-math4": { "baseline": "4.0.0", - "port-version": 2 + "port-version": 3 }, "ignition-math6": { "baseline": "6.6.0", - "port-version": 2 + "port-version": 3 }, "ignition-modularscripts": { - "baseline": "2020-11-23", - "port-version": 1 + "baseline": "2022-05-11", + "port-version": 0 }, "ignition-msgs1": { "baseline": "1.0.0", - "port-version": 4 + "port-version": 5 }, "ignition-msgs5": { "baseline": "5.3.0", - "port-version": 4 + "port-version": 5 }, "ignition-msgs6": { "baseline": "6.0.0", - "port-version": 3 + "port-version": 4 }, "ignition-plugin1": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "ignition-transport4": { "baseline": "4.0.0", - "port-version": 5 + "port-version": 6 }, "ignition-transport8": { "baseline": "8.1.0", - "port-version": 2 + "port-version": 3 }, "ignition-transport9": { "baseline": "9.0.0", - "port-version": 3 + "port-version": 4 }, "igraph": { "baseline": "0.9.8", diff --git a/versions/i-/ignition-cmake0.json b/versions/i-/ignition-cmake0.json index b2bb0cf30ca5d7..b342325754f350 100644 --- a/versions/i-/ignition-cmake0.json +++ b/versions/i-/ignition-cmake0.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd21340a3227e51353676cc9147ba3d759fcaf6d", + "version": "0.6.2", + "port-version": 4 + }, { "git-tree": "de484d582fc076a89f57fde7db6944eb57c006df", "version-string": "0.6.2", diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json index 42b3ed6132b782..67631a55d47549 100644 --- a/versions/i-/ignition-cmake2.json +++ b/versions/i-/ignition-cmake2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d146d55be3a48e481af0a87660c44ce2a7b5cb11", + "version": "2.5.0", + "port-version": 2 + }, { "git-tree": "6c12bb698575d2b7cff16d177c2601ab195041fa", "version": "2.5.0", diff --git a/versions/i-/ignition-common1.json b/versions/i-/ignition-common1.json index 6dafbea52176df..8ec4ff082e3300 100644 --- a/versions/i-/ignition-common1.json +++ b/versions/i-/ignition-common1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7759642adcf3e61cc1ce5b55699db02d31a94591", + "version": "1.1.1", + "port-version": 3 + }, { "git-tree": "6e4a5f2f998f4730002bd95e92251b77e757d6b2", "version-string": "1.1.1", diff --git a/versions/i-/ignition-common3.json b/versions/i-/ignition-common3.json index ccad732b957dbe..90153153e1b35a 100644 --- a/versions/i-/ignition-common3.json +++ b/versions/i-/ignition-common3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "929c84951a63b65c9dd48f73a4a7147ae5a1779b", + "version": "3.9.0", + "port-version": 3 + }, { "git-tree": "ee01029f1822c107fb6654c440aad50f5e5b97d3", "version-string": "3.9.0", diff --git a/versions/i-/ignition-fuel-tools1.json b/versions/i-/ignition-fuel-tools1.json index 539d737ff33852..4aa3ad3e025a28 100644 --- a/versions/i-/ignition-fuel-tools1.json +++ b/versions/i-/ignition-fuel-tools1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2809092ee332d969d0c3d7953010b2a3aed0b801", + "version": "1.2.0", + "port-version": 4 + }, { "git-tree": "9c9a312b5c09cc860b8cbc810d68ba5a17bd7afb", "version-string": "1.2.0", diff --git a/versions/i-/ignition-fuel-tools4.json b/versions/i-/ignition-fuel-tools4.json index ecb8fd1c3ba043..4819f0c7eb6450 100644 --- a/versions/i-/ignition-fuel-tools4.json +++ b/versions/i-/ignition-fuel-tools4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "168bd907379d81e0af580ea8f5cad0a9e448469e", + "version": "4.3.0", + "port-version": 2 + }, { "git-tree": "e6f7783701420adbe90b861a5a96130bd87f114e", "version-string": "4.3.0", diff --git a/versions/i-/ignition-math4.json b/versions/i-/ignition-math4.json index 0448bf757fe687..072a925ff234ad 100644 --- a/versions/i-/ignition-math4.json +++ b/versions/i-/ignition-math4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb3de1aed28c6b2599a41fa1fe4ef45fd447f988", + "version": "4.0.0", + "port-version": 3 + }, { "git-tree": "0312d0e2b91d2e465a1464c83a17dfb5fbe57e4a", "version-string": "4.0.0", diff --git a/versions/i-/ignition-math6.json b/versions/i-/ignition-math6.json index a1220d2ba439b2..4fa097963a2a82 100644 --- a/versions/i-/ignition-math6.json +++ b/versions/i-/ignition-math6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb148027e8b1f6b1c6a47500140fa02467911e26", + "version": "6.6.0", + "port-version": 3 + }, { "git-tree": "7fda0a4d654c39cd30c400919981ea71675f696f", "version-string": "6.6.0", diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 2ee4650be26509..6a158e1fd194aa 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d834091edb40475a3e9f55455ff532f3ac629142", + "version-date": "2022-05-11", + "port-version": 0 + }, { "git-tree": "0b00233924c15f702784cb2342b469771125c3a5", "version-string": "2020-11-23", diff --git a/versions/i-/ignition-msgs1.json b/versions/i-/ignition-msgs1.json index d0a2b784451a65..2c09e9871df25d 100644 --- a/versions/i-/ignition-msgs1.json +++ b/versions/i-/ignition-msgs1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b906441e45012934421ddd0ad823bb7324939dd8", + "version": "1.0.0", + "port-version": 5 + }, { "git-tree": "7155088669524bfd132aaab6af9f7257e8bfde54", "version-string": "1.0.0", diff --git a/versions/i-/ignition-msgs5.json b/versions/i-/ignition-msgs5.json index a2fcd4fd20982e..f872442a4f7752 100644 --- a/versions/i-/ignition-msgs5.json +++ b/versions/i-/ignition-msgs5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca89a878842c0d94483430295c59f9c24eb607bb", + "version": "5.3.0", + "port-version": 5 + }, { "git-tree": "a77594480a911b7648ca1ad24a575b826ddc2a9a", "version": "5.3.0", diff --git a/versions/i-/ignition-msgs6.json b/versions/i-/ignition-msgs6.json index 4d1447919c95d8..385aac055b8c95 100644 --- a/versions/i-/ignition-msgs6.json +++ b/versions/i-/ignition-msgs6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a15e3cd08c8481cb639dc9b741ea55df597f6cf8", + "version": "6.0.0", + "port-version": 4 + }, { "git-tree": "99d4ba95339db124ba068ea2b7fe9cf53d648da3", "version": "6.0.0", diff --git a/versions/i-/ignition-plugin1.json b/versions/i-/ignition-plugin1.json index 5a8a0a6c15d00a..b9db2a4785a7e3 100644 --- a/versions/i-/ignition-plugin1.json +++ b/versions/i-/ignition-plugin1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f04ba4b936f3f2885c7a463d2a86a1359990931", + "version": "1.1.0", + "port-version": 2 + }, { "git-tree": "71166ea18bf5f4d4de750b96836b780cd7395c0e", "version-string": "1.1.0", diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json index 916bf8f0664631..2911cc0792e02c 100644 --- a/versions/i-/ignition-transport4.json +++ b/versions/i-/ignition-transport4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "485717373dc99ab0f6f3a6b0ad8fec42bf8e9a9b", + "version": "4.0.0", + "port-version": 6 + }, { "git-tree": "17d4c446fb99c9510ee2324a03529b6fb1119a41", "version": "4.0.0", diff --git a/versions/i-/ignition-transport8.json b/versions/i-/ignition-transport8.json index c731867f20c6f8..fbfbbafb4be47f 100644 --- a/versions/i-/ignition-transport8.json +++ b/versions/i-/ignition-transport8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df4d904c15b18ca24200a42fdfc4e5930c91618a", + "version": "8.1.0", + "port-version": 3 + }, { "git-tree": "10fb9c7619753767ea31b84db43272712730f32c", "version-string": "8.1.0", diff --git a/versions/i-/ignition-transport9.json b/versions/i-/ignition-transport9.json index b121adedc90263..712a03c8121311 100644 --- a/versions/i-/ignition-transport9.json +++ b/versions/i-/ignition-transport9.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "918e7d23ff4ca98405b40bbdf55f9302b6cb0ed0", + "version": "9.0.0", + "port-version": 4 + }, { "git-tree": "abbc50866e79bb1566460eb88135358ed740268d", "version": "9.0.0", From 76bb15b9e404eddb8e26ff6b679b023c77ba0ae7 Mon Sep 17 00:00:00 2001 From: Charles Karney Date: Thu, 12 May 2022 19:27:56 -0400 Subject: [PATCH 238/383] [Geographiclib] update to v2.0 (#24587) * Update for geographiclib 2.0 * [geographiclib] Update to version 2.0 * Add license to ports/geographiclib/vcpkg.json * Update port-version to 1 * Update version database * Switch to vcpkg_cmake_config_fixup etc. Switch to vcpkg_cmake_configure vcpkg_cmake_install, vcpkg_cmake_config_fixup Revert to using vcpkg_fixup_pkgconfig Revert to port-version = 0 Revert to uwp exclusion to tools * run x-add-version * Formatting changes requested by dg0yt * Update version info * More cleanup * Update version info * Define LIB_OPTION, fix pkg install, etc. * Update version info * Fix pkgconfig call * Update version info * Use OFF instead of empty string for don't install * Update version info * Remove unneeded LIB_OPTION stuff. * Update version info * Add more precautionary quotes * Update version info --- ports/geographiclib/cxx-library-only.patch | 139 --------------------- ports/geographiclib/portfile.cmake | 82 ++++++------ ports/geographiclib/vcpkg.json | 14 ++- versions/baseline.json | 4 +- versions/g-/geographiclib.json | 5 + 5 files changed, 63 insertions(+), 181 deletions(-) delete mode 100644 ports/geographiclib/cxx-library-only.patch diff --git a/ports/geographiclib/cxx-library-only.patch b/ports/geographiclib/cxx-library-only.patch deleted file mode 100644 index d1201794b55597..00000000000000 --- a/ports/geographiclib/cxx-library-only.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eb08bd48..88552153 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -196,6 +196,11 @@ else () - set (DEVELOPER OFF) - endif () - -+set (INSTALL_TOOL_DIR "tools/geographiclib") -+file (RELATIVE_PATH PROJECT_LIB_DIR -+ "${CMAKE_INSTALL_PREFIX}/${INSTALL_TOOL_DIR}" -+ "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") -+ - if (NOT MSVC) - # Set the run time path for shared libraries for non-Windows machines. - # (1) include link path for external packages (not needed with -@@ -207,7 +212,7 @@ if (NOT MSVC) - # (2) include installed path for GeographicLib. - if (NOT APPLE) - # Use relative path so that package is relocatable -- set (CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LIB_SUFFIX}") -+ set (CMAKE_INSTALL_RPATH "\$ORIGIN/${PROJECT_LIB_DIR}") - else () - # cmake 2.8.12 introduced a way to make the package relocatable. - # See also INSTALL_RPATH property on the tools. -@@ -434,12 +439,12 @@ endif () - # documentation files into the source tree. Skip Apple here because - # man/makeusage.sh uses "head --lines -4" to drop the last 4 lines of a - # file and there's no simple equivalent for MacOSX --if (NOT WIN32 AND NOT APPLE) -+if (NOT WIN32 AND NOT APPLE AND FALSE) - find_program (HAVE_POD2MAN pod2man) - find_program (HAVE_POD2HTML pod2html) - find_program (HAVE_COL col) - endif () --if (HAVE_POD2MAN AND HAVE_POD2HTML AND HAVE_COL) -+if (HAVE_POD2MAN AND HAVE_POD2HTML AND HAVE_COL AND FALSE) - set (MAINTAINER ON) - else () - set (MAINTAINER OFF) -@@ -466,25 +471,34 @@ if (WIN32) - set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") - endif () - -+if (SKIP_TOOLS) -+ set (TOOLS) -+ set (SCRIPTS) -+else () - # The list of tools (to be installed into, e.g., /usr/local/bin) - set (TOOLS CartConvert ConicProj GeodesicProj GeoConvert GeodSolve - GeoidEval Gravity MagneticField Planimeter RhumbSolve TransverseMercatorProj) - # The list of scripts (to be installed into, e.g., /usr/local/sbin) - set (SCRIPTS geographiclib-get-geoids geographiclib-get-gravity - geographiclib-get-magnetic) -+endif () - - set_property (GLOBAL PROPERTY USE_FOLDERS ON) - - # The list of subdirectories to process - add_subdirectory (src) - add_subdirectory (include/GeographicLib) -+if (NOT SKIP_TOOLS) - add_subdirectory (tools) -+endif () -+if (FALSE) - add_subdirectory (man) - add_subdirectory (doc) - add_subdirectory (js) - add_subdirectory (matlab) - add_subdirectory (python/geographiclib) - add_subdirectory (examples) -+endif () - if (MSVC AND BUILD_NETGEOGRAPHICLIB) - if (GEOGRAPHICLIB_PRECISION EQUAL 2) - set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib) -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index fd0669f2..4744e08d 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -56,13 +56,7 @@ export (TARGETS - # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative - # path to the root from there. (Note that the whole install tree can - # be relocated.) --if (COMMON_INSTALL_PATH) -- # Install under lib${LIB_SUFFIX} so that 32-bit and 64-bit packages -- # can be installed on a single machine. -- set (INSTALL_CMAKE_DIR "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}") --else () -- set (INSTALL_CMAKE_DIR "cmake") --endif () -+set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME_LOWER}") - # Find root of install tree relative to INSTALL_CMAKE_DIR - file (RELATIVE_PATH PROJECT_ROOT_DIR - "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}") -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 3fa8ec6a..92c73946 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -1,7 +1,7 @@ - # Build the tools... - - # Where to find the *.usage files for the --help option. --include_directories (${PROJECT_BINARY_DIR}/man) -+include_directories (${PROJECT_SOURCE_DIR}/man) - # Only needed if target_compile_definitions is not supported - add_definitions (${PROJECT_DEFINITIONS}) - -@@ -16,7 +16,7 @@ foreach (TOOL ${TOOLS}) - add_dependencies (tools ${TOOL}) - - set_source_files_properties (${TOOL}.cpp PROPERTIES -- OBJECT_DEPENDS ${PROJECT_BINARY_DIR}/man/${TOOL}.usage) -+ OBJECT_DEPENDS ${PROJECT_SOURCE_DIR}/man/${TOOL}.usage) - - target_link_libraries (${TOOL} ${PROJECT_LIBRARIES} ${HIGHPREC_LIBRARIES}) - -@@ -31,11 +31,11 @@ endif () - if (APPLE) - # Ensure that the package is relocatable - set_target_properties (${TOOLS} PROPERTIES -- INSTALL_RPATH "@loader_path/../lib${LIB_SUFFIX}") -+ INSTALL_RPATH "@loader_path/${PROJECT_LIB_DIR}") - endif () - - # Specify where the tools are installed, adding them to the export targets --install (TARGETS ${TOOLS} EXPORT targets DESTINATION bin) -+install (TARGETS ${TOOLS} DESTINATION "${INSTALL_TOOL_DIR}") - - if (MSVC AND PACKAGE_DEBUG_LIBS) - # Possibly don't EXPORT the debug versions of the tools and then this -@@ -55,7 +55,7 @@ set_property (TARGET tools ${TOOLS} PROPERTY FOLDER tools) - # systems. This needs to substitute ${GEOGRAPHICLIB_DATA} as the - # default data directory. These are installed under sbin, because it is - # expected to be run with write access to /usr/local. --if (NOT WIN32) -+if (NOT WIN32 AND FALSE) - foreach (SCRIPT ${SCRIPTS}) - configure_file (${SCRIPT}.sh scripts/${SCRIPT} @ONLY) - add_custom_command (OUTPUT ${SCRIPT} diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index 592d0dc63312bc..f8dbff068c62bd 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -1,49 +1,55 @@ -vcpkg_from_sourceforge ( +vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO geographiclib - REF distrib - FILENAME "GeographicLib-1.52.tar.gz" - SHA512 98a4d33764db4a4755851a7db639fd9e055dcf4f1f949258e112fce2e198076b5896fcae2c1ea36b37fe1000d28eec326636a730e70f25bc19a1610423ba6859 - PATCHES cxx-library-only.patch + REF distrib-C++ + FILENAME "GeographicLib-2.0.tar.gz" + SHA512 7cf67174a64082372cdd249a64460e9f61c582aaf3d2a31e4e69d811f265e078ba62f945e9f1f44be6c58de4c20d0359dd46e0fd262ffac229df0ba2c6adc848 + ) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "tools" TOOLS ) -vcpkg_check_features ( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - "tools" SKIP_TOOLS +# GeographicLib's CMakeLists.txt allows the installation directories for +# all the components to be set independently. A "false" value, e.g., an +# empty string or OFF (-DBINDIR=OFF), indicates that the corresponding +# component should not be installed. +if(TOOLS) + set(TOOL_OPTION "-DBINDIR=tools/${PORT}") +else() + set(TOOL_OPTION -DBINDIR=OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${TOOL_OPTION} + "-DCMAKEDIR=share/${PORT}" + -DDOCDIR=OFF + -DEXAMPLEDIR=OFF + -DMANDIR=OFF + -DSBINDIR=OFF ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set (LIB_TYPE "SHARED") -else () - set (LIB_TYPE "STATIC") -endif () - -vcpkg_configure_cmake ( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - "-DGEOGRAPHICLIB_LIB_TYPE=${LIB_TYPE}" - ${FEATURE_OPTIONS} - PREFER_NINJA # Disable this option if project cannot be built with Ninja -) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() -vcpkg_install_cmake () -vcpkg_fixup_cmake_targets (CONFIG_PATH share/geographiclib) -vcpkg_copy_pdbs () +vcpkg_fixup_pkgconfig() -if (tools IN_LIST FEATURES) - vcpkg_copy_tool_dependencies (${CURRENT_PACKAGES_DIR}/tools/${PORT}) -endif () +if(tools IN_LIST FEATURES) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() -file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) -file (INSTALL ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") -# Install usage -configure_file (${CMAKE_CURRENT_LIST_DIR}/usage - ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) -vcpkg_fixup_pkgconfig() +# Install usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json index 321cd04ec5ece6..5e3b6a62a2ce01 100644 --- a/ports/geographiclib/vcpkg.json +++ b/ports/geographiclib/vcpkg.json @@ -1,9 +1,19 @@ { "name": "geographiclib", - "version": "1.52", - "port-version": 2, + "version": "2.0", "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "The GeographicLib tools", diff --git a/versions/baseline.json b/versions/baseline.json index 31923abfb91580..81d74603703684 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2461,8 +2461,8 @@ "port-version": 2 }, "geographiclib": { - "baseline": "1.52", - "port-version": 2 + "baseline": "2.0", + "port-version": 0 }, "geos": { "baseline": "3.10.2", diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json index 75c6083df8492e..d94a4f9ae2f4cf 100644 --- a/versions/g-/geographiclib.json +++ b/versions/g-/geographiclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "440bbb70d0e2bd4df26e6c4c8e80a9f1942f743e", + "version": "2.0", + "port-version": 0 + }, { "git-tree": "907cce8f399c32730fa20954780e16187bb28bd0", "version": "1.52", From 0c954fa00c049152cae1c0f9fbfa7d36baac0dac Mon Sep 17 00:00:00 2001 From: Umar Arshad Date: Thu, 12 May 2022 19:34:47 -0400 Subject: [PATCH 239/383] Add /usr/ to find_library for cudnn for ArchLinux (#24663) --- ports/cudnn/FindCUDNN.cmake | 2 +- ports/cudnn/portfile.cmake | 4 ++-- ports/cudnn/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cudnn.json | 5 +++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/cudnn/FindCUDNN.cmake b/ports/cudnn/FindCUDNN.cmake index 4e013bca705da4..c90f3a79189d95 100644 --- a/ports/cudnn/FindCUDNN.cmake +++ b/ports/cudnn/FindCUDNN.cmake @@ -28,7 +28,7 @@ find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include PATH_SUFFIXES cuda/include include) find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 - HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ + HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/ PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64) if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS) diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 5fd95634c40a3e..594c74fed6e6cb 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -19,7 +19,7 @@ find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h PATH_SUFFIXES cuda/include include) message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}") find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 - HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ + HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/ PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64) message(STATUS "CUDNN_LIBRARY: ${CUDNN_LIBRARY}") if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") @@ -73,4 +73,4 @@ endif() file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) \ No newline at end of file +file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json index 50b47fe7a01878..ffb97ee1723f8d 100644 --- a/ports/cudnn/vcpkg.json +++ b/ports/cudnn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cudnn", "version": "7.6.5", - "port-version": 5, + "port-version": 6, "description": "NVIDIA's cuDNN deep neural network acceleration library.", "homepage": "https://developer.nvidia.com/cudnn", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 81d74603703684..1cb0aac565e90f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1738,7 +1738,7 @@ }, "cudnn": { "baseline": "7.6.5", - "port-version": 5 + "port-version": 6 }, "cunit": { "baseline": "2.1.3", diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index 9fa8f53a35d661..7c7b0ef9a93491 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa008ef1b1c958146532dbbdabd76b62f9558653", + "version": "7.6.5", + "port-version": 6 + }, { "git-tree": "62f2616b19fe2b3b7dbc8a81e190900819f2ba3e", "version": "7.6.5", From d49b6d5887256aee701e2894a3e61e138fa6d220 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 13 May 2022 01:52:08 +0200 Subject: [PATCH 240/383] [docs] Fix typo (#24673) --- docs/maintainers/internal/vcpkg_catalog_release_process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/maintainers/internal/vcpkg_catalog_release_process.md b/docs/maintainers/internal/vcpkg_catalog_release_process.md index 0ea8922d58cb62..5acd12b375a617 100644 --- a/docs/maintainers/internal/vcpkg_catalog_release_process.md +++ b/docs/maintainers/internal/vcpkg_catalog_release_process.md @@ -1,4 +1,4 @@ -# vcpkg_tool_release_process +# vcpkg_catalog_release_process This document describes the acceptance criteria / process we use when doing a vcpkg release. From f68e901854ee3e6d04961594af0fea77883ec98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 12 May 2022 23:53:26 +0000 Subject: [PATCH 241/383] [vcpkg docs] Add double quotes to toolchain path (#24649) * [vcpkg docs] Add double quotes to toolchain path * Apply changes --- README.md | 6 +++--- README_es.md | 6 +++--- README_fr.md | 6 +++--- README_ko_KR.md | 7 +++---- README_zh_CN.md | 6 +++--- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index d4d1bb19588d72..3f17ba137753b7 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ In order to use vcpkg with CMake outside of an IDE, you can use the toolchain file: ```cmd -> cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [build directory] ``` @@ -163,7 +163,7 @@ $ ./vcpkg/vcpkg search [search term] In order to use vcpkg with CMake, you can use the toolchain file: ```sh -$ cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" $ cmake --build [build directory] ``` @@ -256,7 +256,7 @@ you can add the following to your CMakeLists.txt before the first `project()` ca instead of passing `CMAKE_TOOLCHAIN_FILE` to the cmake invocation. ```cmake -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") ``` diff --git a/README_es.md b/README_es.md index 0ffcb3a49b3a15..a10aa7adddf071 100644 --- a/README_es.md +++ b/README_es.md @@ -111,7 +111,7 @@ Para utilizar Vcpkg con CMake sin un IDE, puede utilizar el archivo de herramientas incluido: ```cmd -> cmake -B [directorio de compilaciĆ³n] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [directorio de compilaciĆ³n] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [directorio de compilaciĆ³n] ``` @@ -168,7 +168,7 @@ $ ./vcpkg/vcpkg search [tĆ©rmino de bĆŗsqueda] Para usar vcpkg con CMake, tiene que usar el siguiente archivo toolchain: ```sh -$ cmake -B [directorio de compilaciĆ³n] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +$ cmake -B [directorio de compilaciĆ³n] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" $ cmake --build [directorio de compilaciĆ³n] ``` @@ -261,7 +261,7 @@ puede agregar lo siguiente as su CMakeLists,txt antes de la primera llamada a `p en vez de pasar `CMAKE_TOOLCHAIN_FILE` a la invocaciĆ³n de CMake. ```cmake -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") ``` diff --git a/README_fr.md b/README_fr.md index f39c09b03d942a..35f3c46c9ee525 100644 --- a/README_fr.md +++ b/README_fr.md @@ -92,7 +92,7 @@ Si vous utilisez CMake avec Visual Studio continuez [ici](#vcpkg-avec-cmake-et-v Afin d'utiliser vcpkg en dehors d'un IDE, vous pouvez utiliser le fichier de toolchain : ```cmd -> cmake -B [dossier de build] -S . -DCMAKE_TOOLCHAIN_FILE=[chemin vers vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [dossier de build] -S . "-DCMAKE_TOOLCHAIN_FILE=[chemin vers vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [dossier de build] ``` @@ -138,7 +138,7 @@ $ ./vcpkg/vcpkg search [terme de recherche] Pour utiliser vcpkg en dehors d'un IDE, vous pouvez utiliser le fichier de toolchain : ```cmd -> cmake -B [dossier de build] -S . -DCMAKE_TOOLCHAIN_FILE=[chemin vers vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [dossier de build] -S . "-DCMAKE_TOOLCHAIN_FILE=[chemin vers vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [dossier de build] ``` @@ -238,7 +238,7 @@ Malheureusement, vous devrez le refaire pour chaque projet. Quand vous utilisez vcpkg comme un sous-module de votre projet, vous pouvez l'ajouter Ć  votre CMakeLists.txt avant le premier appel de `project()`, au lieu d'utiliser `CMAKE_TOOLCHAIN_FILE` dans les paramĆØtres d'appel de cmake. ```cmake -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") ``` diff --git a/README_ko_KR.md b/README_ko_KR.md index a7a71fa1e0fdf9..8ab8cf116b4a1f 100644 --- a/README_ko_KR.md +++ b/README_ko_KR.md @@ -119,8 +119,7 @@ IDE ģ™øė¶€ģ—ģ„œ CMakeģ™€ ķ•Øź»˜ vcpkgė„¼ ģ‚¬ģš©ķ•˜ė ¤ė©“, ė‹¤ģŒź³¼ ź°™ģ“ ķˆ“ģ²“ģø ķŒŒģ¼ģ„ ģ‚¬ģš©ķ•  ģˆ˜ ģžˆģŠµė‹ˆė‹¤. ```cmd -> cmake -B [build directory] -S . -DCMAKE_TOOLCH -AIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [build directory] ``` @@ -163,7 +162,7 @@ $ ./vcpkg/vcpkg search [search term] CMakeģ™€ ķ•Øź»˜ vcpkgė„¼ ģ‚¬ģš©ķ•˜ė ¤ė©“ ķˆ“ģ²“ģø ķŒŒģ¼ģ„ ģ“ģš©ķ•“ ė³“ģ„øģš”. ```sh -$ cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" $ cmake --build [build directory] ``` @@ -254,7 +253,7 @@ cmake ģ‹¤ķ–‰ ģ‹œ `CMAKE_TOOLCHAIN_FILE`ģ„ ģ „ė‹¬ķ•˜ėŠ” ėŒ€ģ‹ , ģ²« ė²ˆģ§ø `project()` ķ˜øģ¶œ ģ „ģ— CMakeLists.txtģ— ė‹¤ģŒģ„ ģ¶”ź°€ķ•˜ėŠ” ė°©ė²•ė„ ģžˆģŠµė‹ˆė‹¤. ```cmake -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") ``` diff --git a/README_zh_CN.md b/README_zh_CN.md index 5c4ddc57860b19..7fbd913b4b829f 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -109,7 +109,7 @@ vcpkgå›¢é˜Ÿå’Œč“”ēŒ®č€…åÆ仄ēœ‹åˆ°å®ƒēš„åœ°ę–¹ļ¼Œ äøŗäŗ†åœØIDE仄外åœØcmakeäø­ä½æē”Øvcpkgļ¼Œę‚Øéœ€č¦ä½æē”Ø仄äø‹å·„å…·é“¾ę–‡ä»¶: ```cmd -> cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [build directory] ``` @@ -150,7 +150,7 @@ $ ./vcpkg/vcpkg search [search term] äøŗäŗ†åœØcmakeäø­ä½æē”Øvcpkgļ¼Œę‚Øéœ€č¦ä½æē”Ø仄äø‹å·„å…·é“¾ę–‡ä»¶: ```sh -$ cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" $ cmake --build [build directory] ``` @@ -238,7 +238,7 @@ $ xcode-select --install č€Œę— éœ€å°† `CMAKE_TOOLCHAIN_FILE` 传递ē»™cmake调ē”Ø怂 ```cmake -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") ``` From 673c55fb043ebef6397235e87b39bd86305450c2 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 13 May 2022 08:06:27 +0800 Subject: [PATCH 242/383] [OpenImageIO] Fix featrue ffmpeg install (#24623) * [OpenImageIO] Enable featrue ffmpeg with oiio * x-add-version * Also disable docs. Co-authored-by: Lily Wang Co-authored-by: Billy Robert O'Neal --- ports/openimageio/fix-ffmpeg-tool.patch | 17 +++++++++++++++++ ports/openimageio/portfile.cmake | 3 +++ ports/openimageio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 +++++ 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 ports/openimageio/fix-ffmpeg-tool.patch diff --git a/ports/openimageio/fix-ffmpeg-tool.patch b/ports/openimageio/fix-ffmpeg-tool.patch new file mode 100644 index 00000000000000..e185a3003193c8 --- /dev/null +++ b/ports/openimageio/fix-ffmpeg-tool.patch @@ -0,0 +1,17 @@ +diff --git a/src/ffmpeg.imageio/CMakeLists.txt b/src/ffmpeg.imageio/CMakeLists.txt +index 5840206..cc52e4c 100644 +--- a/src/ffmpeg.imageio/CMakeLists.txt ++++ b/src/ffmpeg.imageio/CMakeLists.txt +@@ -2,9 +2,10 @@ + # SPDX-License-Identifier: BSD-3-Clause + # https://github.com/OpenImageIO/oiio + +-if (FFmpeg_FOUND) ++if (USE_FFMPEG) ++ find_package(FFMPEG REQUIRED) + add_oiio_plugin (ffmpeginput.cpp +- INCLUDE_DIRS ${FFMPEG_INCLUDES} ++ INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} + LINK_LIBRARIES ${FFMPEG_LIBRARIES} + ${BZIP2_LIBRARIES} + DEFINITIONS "-DUSE_FFMPEG" diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 4f93c86cf99dcc..950ebf63a7ff2d 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix-dependencies.patch fix-config-cmake.patch fix-openjpeg-linkage.patch + fix-ffmpeg-tool.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") @@ -53,6 +54,8 @@ vcpkg_cmake_configure( -DBUILD_MISSING_DEPS=OFF -DSTOP_ON_WARNING=OFF -DVERBOSE=ON + -DBUILD_DOCS=OFF + -DINSTALL_DOCS=OFF ) vcpkg_cmake_install() diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index e361f995522d5b..9136d46481f7d5 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.3.10.1", - "port-version": 3, + "port-version": 4, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 1cb0aac565e90f..6beb053629ddd2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5142,7 +5142,7 @@ }, "openimageio": { "baseline": "2.3.10.1", - "port-version": 3 + "port-version": 4 }, "openjpeg": { "baseline": "2.4.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 821542404b5f77..0fac6cd2e73d8a 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c60e9a4adf07bdd6ff8bf766f295af17d8a0818", + "version": "2.3.10.1", + "port-version": 4 + }, { "git-tree": "2fa8debd832d46f5ad96798be8a335b8a251c2ca", "version": "2.3.10.1", From 8d25063dbfce4cc98ac306399609c33a8116181f Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 13 May 2022 02:09:09 +0200 Subject: [PATCH 243/383] [curl] Update to 7.83.1 (#24687) * [curl] Update to 7.83.1 * version --- ports/curl/portfile.cmake | 4 ++-- ports/curl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index bb637af3f040cf..09297cab157f40 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF curl-7_83_0 - SHA512 7acb6f524b1045afa045a6f21d72e1410becadf6c3c1228378451f9436b7bac9c15aad4472193d36e9d075937aee641d186c5d0e9ba5f3e4d3af623ec78ad0e9 + REF curl-7_83_1 + SHA512 f4ede3c829aaa1142358d956cba4b33f06d3f0319c9f1cd65b63413de60a8690165e10fcb876fc413a20fcfa53bba2a064bb4b8c3070dbf474c2f2288eeab019 HEAD_REF master PATCHES 0002_fix_uwp.patch diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index eddc9c86987895..016b2c1899b699 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "curl", - "version": "7.83.0", + "version": "7.83.1", "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 6beb053629ddd2..7ad3c08135e712 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1745,7 +1745,7 @@ "port-version": 7 }, "curl": { - "baseline": "7.83.0", + "baseline": "7.83.1", "port-version": 0 }, "curlpp": { diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 5efa8e666adedf..74f57726b8244b 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f536c70dc927199fe430fde4e93f8d66d53b6f6", + "version": "7.83.1", + "port-version": 0 + }, { "git-tree": "d72a11c8c3990818ba5987cc1ceee799046de9be", "version": "7.83.0", From f5905e204c7d72f235a2a011e7caa56b436ca73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Fri, 13 May 2022 04:33:47 +0200 Subject: [PATCH 244/383] [libslirp] update to 4.7.0 (#24689) * [libslirp] update to 4.7.0 * [libslirp] updated versions --- ports/libslirp/portfile.cmake | 4 ++-- ports/libslirp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libslirp.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libslirp/portfile.cmake b/ports/libslirp/portfile.cmake index 8862f1b3024efe..0bd6e252c7e9db 100644 --- a/ports/libslirp/portfile.cmake +++ b/ports/libslirp/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/ OUT_SOURCE_PATH SOURCE_PATH REPO slirp/libslirp - REF v4.6.1 - SHA512 04a9dd88cd58c849a24b9cff405d951952760d99ea2bef0b070463dff088d79f44557a13c9427ba0043f58d4b9e06b68ff64a4f23a7b0d66df594e32e1521cae + REF v4.7.0 + SHA512 387f4a6dad240ce633df2640bb49c6cb0041c8b3afc8d0ef38186d385f00dd9e4ef4443e93e1b71dbf05e22892b6f2771a87a202e815d8ec899ab5c147a1f09f HEAD_REF master ) diff --git a/ports/libslirp/vcpkg.json b/ports/libslirp/vcpkg.json index 470194d07f14dd..032e5cc5dfe5b6 100644 --- a/ports/libslirp/vcpkg.json +++ b/ports/libslirp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libslirp", - "version-semver": "4.6.1", - "port-version": 1, + "version-semver": "4.7.0", "description": "libslirp is a user-mode networking library used by virtual machines, containers or various tools.", "homepage": "https://gitlab.freedesktop.org/slirp/libslirp", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 7ad3c08135e712..420ee2a412dcb5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4001,8 +4001,8 @@ "port-version": 1 }, "libslirp": { - "baseline": "4.6.1", - "port-version": 1 + "baseline": "4.7.0", + "port-version": 0 }, "libsmb2": { "baseline": "2021-04-29", diff --git a/versions/l-/libslirp.json b/versions/l-/libslirp.json index a46de194d5047e..0a600351efb222 100644 --- a/versions/l-/libslirp.json +++ b/versions/l-/libslirp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6946f40e08a89013e998d3bf397613bdf08cb581", + "version-semver": "4.7.0", + "port-version": 0 + }, { "git-tree": "3230fcf2c1b8018c5eac033b618f2cb35217772f", "version-semver": "4.6.1", From 6be82cfac67649a31d4c3eba56d2fafa9dc6736a Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 13 May 2022 10:36:04 +0800 Subject: [PATCH 245/383] [apr] provides CMake targets (#23499) * [apr] provides CMake targets * update version * update patch * update version * Export CMake files * x-add-version * update vcpkg.json * x-add-version * update patch * x-add-version * remove target export * x-add-version Co-authored-by: Lily Wang --- ports/apr/fix-configcmake.patch | 62 +++++++++++++++++++++++++++++++++ ports/apr/portfile.cmake | 22 +++--------- ports/apr/vcpkg.json | 7 +++- versions/a-/apr.json | 5 +++ versions/baseline.json | 2 +- 5 files changed, 79 insertions(+), 19 deletions(-) create mode 100644 ports/apr/fix-configcmake.patch diff --git a/ports/apr/fix-configcmake.patch b/ports/apr/fix-configcmake.patch new file mode 100644 index 00000000000000..8104810d05f75e --- /dev/null +++ b/ports/apr/fix-configcmake.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b4632c3..0b86d12 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -259,27 +259,35 @@ SET(install_targets) + SET(install_bin_pdb) + + # libapr-1 is shared, apr-1 is static ++IF(BUILD_SHARED_LIBS) + ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) + SET(install_targets ${install_targets} libapr-1) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb) + TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS}) + SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT") + ADD_DEPENDENCIES(libapr-1 test_char_header) +- ++TARGET_INCLUDE_DIRECTORIES(libapr-1 INTERFACE $) ++ELSE() + ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} apr-1) + TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS}) + SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT") + ADD_DEPENDENCIES(apr-1 test_char_header) ++TARGET_INCLUDE_DIRECTORIES(apr-1 INTERFACE $) ++ENDIF() + + # libaprapp-1 and aprapp-1 are static ++IF(BUILD_SHARED_LIBS) + ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} libaprapp-1) + SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") +- ++TARGET_INCLUDE_DIRECTORIES(libaprapp-1 INTERFACE $) ++ELSE() + ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} aprapp-1) + SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") ++TARGET_INCLUDE_DIRECTORIES(aprapp-1 INTERFACE $) ++ENDIF() + + IF(APR_BUILD_TESTAPR) + ENABLE_TESTING() +@@ -385,12 +393,18 @@ ENDIF (APR_BUILD_TESTAPR) + + # Installation + +-INSTALL(TARGETS ${install_targets} ++INSTALL(TARGETS ${install_targets} EXPORT unofficial-apr-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) + ++INSTALL(EXPORT unofficial-apr-config ++ NAMESPACE unofficial::apr:: ++ DESTINATION share/unofficial-apr ++ FILE unofficial-apr-config.cmake ++) ++ + IF(INSTALL_PDB) + INSTALL(FILES ${install_bin_pdb} + DESTINATION bin diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index d6253544acacb6..924d6ee7fc6239 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -10,12 +10,14 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES + fix-configcmake.patch ) if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - private-headers INSTALL_PRIVATE_H + private-headers APR_INSTALL_PRIVATE_H ) vcpkg_cmake_configure( @@ -24,29 +26,14 @@ if (VCPKG_TARGET_IS_WINDOWS) -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON - -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H} ${FEATURE_OPTIONS} ) vcpkg_cmake_install() - + vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-apr CONFIG_PATH share/unofficial-apr) # There is no way to suppress installation of the headers in debug builds. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - # Both dynamic and static are built, so keep only the one needed - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/apr-1.lib" - "${CURRENT_PACKAGES_DIR}/lib/aprapp-1.lib" - "${CURRENT_PACKAGES_DIR}/debug/lib/apr-1.lib" - "${CURRENT_PACKAGES_DIR}/debug/lib/aprapp-1.lib") - else() - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libapr-1.lib" - "${CURRENT_PACKAGES_DIR}/lib/libaprapp-1.lib" - "${CURRENT_PACKAGES_DIR}/debug/lib/libapr-1.lib" - "${CURRENT_PACKAGES_DIR}/debug/lib/libaprapp-1.lib") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() - vcpkg_copy_pdbs() else() # To cross-compile you will need a triplet file that locates the tool chain and sets --host and --cache parameters of "./configure". @@ -93,6 +80,7 @@ else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\"" "") endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() # Handle copyright diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index 08e5c701fcca78..f8efdea9b9b32d 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "apr", "version": "1.7.0", - "port-version": 8, + "port-version": 9, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", "license": "Apache-2.0", @@ -11,6 +11,11 @@ "name": "vcpkg-cmake", "host": true, "platform": "windows" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "platform": "windows" } ], "features": { diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 67541a0adaf40b..63a44a486e9b0c 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "419034d960a2d9d932f18154e386d1ce4947d514", + "version": "1.7.0", + "port-version": 9 + }, { "git-tree": "9fd8035a5cce96ad1b89000ac34431551ca39458", "version": "1.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index 420ee2a412dcb5..bef0ab7a3db20f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -110,7 +110,7 @@ }, "apr": { "baseline": "1.7.0", - "port-version": 8 + "port-version": 9 }, "apr-util": { "baseline": "1.6.1", From ad06b4e8699074cc1867e8ca154bf7ad3c9a6f34 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 13 May 2022 12:48:28 -0700 Subject: [PATCH 246/383] [catch2] Fix missing # in portfile.cmake. (#24705) --- ports/catch2/portfile.cmake | 4 ++-- ports/catch2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index f4c9abc30ce299..6e32b3877d1895 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF 62fd660583d3ae7a7886930b413c3c570e89786c v2.13.9 + REF 62fd660583d3ae7a7886930b413c3c570e89786c # v2.13.9 SHA512 70805a37183917bc1534899dec828f786bc5e60c5742364b700b02d4965aba6ac7d03d98218275c07854f963bf80bdf3f0f26f3c90d12882520b078638d5c703 HEAD_REF devel - PATCHES + PATCHES fix-install-path.patch ) diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index 8aa91edf9fc4ad..cae923ef38bfc1 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "catch2", "version-semver": "2.13.9", + "port-version": 1, "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index bef0ab7a3db20f..23144ee175bd8d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1274,7 +1274,7 @@ }, "catch2": { "baseline": "2.13.9", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index faa75d401e3c7a..a7869358e949ce 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed81e9ef2d6ef2020605ec6ba1092a2ab631305a", + "version-semver": "2.13.9", + "port-version": 1 + }, { "git-tree": "6cc0b5f2cef9c98ad5c3152ebfbe85f1b9baceed", "version-semver": "2.13.9", From 32d25e6b8586c6bd467c1553251b4782b02871c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 13 May 2022 22:02:20 +0000 Subject: [PATCH 247/383] [lua] Fix library type and usage (#24436) * [lua] Fix library type and usage * version * Use c code in executables * version * Apply suggestion * version * Add an extra CMakeLists.txt to avoid scope pollution of SET_SOURCE_FILES_PROPERTIES * version * Apply suggestions * version * Various nitpicks: * Use "supports" on features rather than if tests plus message FATAL_ERROR * Deduplicate ENABLE_LUA_CPP and COMPILE_AS_CPP * Add quotes. * Use file(INSTALL rather than configure_file(COPYONLY) Co-authored-by: Billy Robert O'Neal III --- ports/lua/CMakeLists-cpp.txt | 28 +++++++++ ports/lua/CMakeLists.txt | 82 ++++++++------------------ ports/lua/portfile.cmake | 18 +----- ports/lua/vcpkg-cmake-wrapper.cmake.in | 2 +- ports/lua/vcpkg.json | 9 ++- versions/baseline.json | 2 +- versions/l-/lua.json | 5 ++ 7 files changed, 69 insertions(+), 77 deletions(-) create mode 100644 ports/lua/CMakeLists-cpp.txt diff --git a/ports/lua/CMakeLists-cpp.txt b/ports/lua/CMakeLists-cpp.txt new file mode 100644 index 00000000000000..88e128ffff9222 --- /dev/null +++ b/ports/lua/CMakeLists-cpp.txt @@ -0,0 +1,28 @@ +SET(SRC_LIBLUACPP ${SRC_LIBLUA}) +ADD_LIBRARY ( lua-cpp ${SRC_LIBLUACPP} ${HDR_LIBLUACPP} ) +SET_TARGET_PROPERTIES(lua-cpp PROPERTIES OUTPUT_NAME "lua-c++") +SET_SOURCE_FILES_PROPERTIES(${SRC_LIBLUACPP} PROPERTIES LANGUAGE CXX) +TARGET_INCLUDE_DIRECTORIES(lua-cpp PRIVATE $ PUBLIC $) +IF (BUILD_SHARED_LIBS AND WIN32) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_BUILD_AS_DLL ) +ENDIF () +IF (UNIX) + IF (APPLE) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) + ELSE () + FIND_LIBRARY (LIB_DLOPEN NAMES dl) + IF (LIB_DLOPEN) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) + TARGET_LINK_LIBRARIES (lua-cpp ${LIB_DLOPEN}) + ENDIF () + ENDIF () +ENDIF () + +INSTALL ( TARGETS lua-cpp + EXPORT unofficial-lua-cpp-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +INSTALL(EXPORT unofficial-lua-cpp-config DESTINATION share/unofficial-lua-cpp) diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt index 8e93eb1ab7c6a4..ac52d7e8052570 100644 --- a/ports/lua/CMakeLists.txt +++ b/ports/lua/CMakeLists.txt @@ -10,32 +10,16 @@ PROJECT ( lua ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) - -SET (HDR_LIBLUA -src/lapi.h src/lauxlib.h src/lcode.h src/lctype.h src/ldebug.h src/ldo.h src/lfunc.h -src/lgc.h src/llex.h src/llimits.h src/lmem.h src/lobject.h src/lopcodes.h src/lparser.h -src/lstate.h src/lstring.h src/ltable.h src/ltm.h src/lua.h src/luaconf.h src/lualib.h -src/lundump.h src/lvm.h src/lzio.h -) +CMAKE_MINIMUM_REQUIRED(VERSION 3.18) # Build Libraries -SET (SRC_LIBLUA -src/lapi.c src/lauxlib.c src/lbaselib.c src/lcode.c src/lcorolib.c -src/lctype.c src/ldblib.c src/ldebug.c src/ldo.c src/ldump.c src/lfunc.c src/lgc.c -src/linit.c src/liolib.c src/llex.c src/lmathlib.c src/lmem.c src/loadlib.c src/lobject.c -src/lopcodes.c src/loslib.c src/lparser.c src/lstate.c src/lstring.c src/lstrlib.c -src/ltable.c src/ltablib.c src/ltm.c src/lundump.c src/lutf8lib.c src/lvm.c src/lzio.c -) - -IF (COMPILE_AS_CPP) - SET_SOURCE_FILES_PROPERTIES(${SRC_LIBLUA} src/lua.c src/luac.c PROPERTIES LANGUAGE CXX) -ELSE () - SET (CMAKE_C_STANDARD 99) -ENDIF () +FILE(GLOB HDR_LIBLUA "${CMAKE_SOURCE_DIR}/src/*.h") +# For luac.c +LIST(REMOVE_ITEM HDR_LIBLUA "${CMAKE_SOURCE_DIR}/src/lopnames.h") -# append headers to sources to make them show up in MSVC GUI -LIST(APPEND SRC_LIBLUA ${HDR_LIBLUA}) +FILE(GLOB SRC_LIBLUA "${CMAKE_SOURCE_DIR}/src/*.c") +# Executables luac and luai +LIST(REMOVE_ITEM SRC_LIBLUA "${CMAKE_SOURCE_DIR}/src/luac.c" "${CMAKE_SOURCE_DIR}/src/lua.c") IF (WIN32) # remove warnings @@ -50,9 +34,13 @@ IF (UNIX) ENDIF () ENDIF () -#DLL -ADD_LIBRARY ( lua ${SRC_LIBLUA} ) +# C library +SET (CMAKE_C_STANDARD 99) +SET(SRC_LIBLUAC ${SRC_LIBLUA}) +ADD_LIBRARY ( lua ${SRC_LIBLUAC} ${HDR_LIBLUA} ) +TARGET_INCLUDE_DIRECTORIES(lua PRIVATE $ PUBLIC $) SET_PROPERTY (TARGET lua PROPERTY POSITION_INDEPENDENT_CODE ON) +SET_SOURCE_FILES_PROPERTIES(${SRC_LIBLUAC} PROPERTIES LANGUAGE C) IF (BUILD_SHARED_LIBS AND WIN32) TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_BUILD_AS_DLL ) @@ -72,45 +60,25 @@ ENDIF () INSTALL ( TARGETS lua EXPORT unofficial-lua-config - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ) install(EXPORT unofficial-lua-config DESTINATION share/unofficial-lua) +# CXX library IF (COMPILE_AS_CPP) - ADD_LIBRARY ( lua-cpp ${SRC_LIBLUA} ) - SET_TARGET_PROPERTIES(lua-cpp PROPERTIES OUTPUT_NAME "lua-c++") - IF (BUILD_SHARED_LIBS AND WIN32) - TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_BUILD_AS_DLL ) - ENDIF () - IF (UNIX) - IF (APPLE) - TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) - ELSE () - FIND_LIBRARY (LIB_DLOPEN NAMES dl) - IF (LIB_DLOPEN) - TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) - TARGET_LINK_LIBRARIES (lua-cpp ${LIB_DLOPEN}) - ENDIF () - ENDIF () - ENDIF () - - INSTALL ( TARGETS lua-cpp - EXPORT unofficial-lua-cpp-config - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - ) - - install(EXPORT unofficial-lua-cpp-config DESTINATION share/unofficial-lua-cpp) + ADD_SUBDIRECTORY(cpp) ENDIF() IF (INSTALL_TOOLS) - ADD_EXECUTABLE ( luac src/luac.c ${SRC_LIBLUA} ) # compiler uses non-exported APIs, so must include sources directly. - ADD_EXECUTABLE ( luai src/lua.c ) # interpreter - TARGET_LINK_LIBRARIES ( luai lua ) + # compiler uses non-exported APIs, so must include sources directly. + ADD_EXECUTABLE ( luac ${CMAKE_SOURCE_DIR}/src/luac.c ${SRC_LIBLUA} ${CMAKE_SOURCE_DIR}/src/lopnames.h ) + ADD_EXECUTABLE ( luai ${CMAKE_SOURCE_DIR}/src/lua.c ) # interpreter + + TARGET_INCLUDE_DIRECTORIES(luac PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src) + TARGET_LINK_LIBRARIES ( luai PRIVATE lua ) SET_TARGET_PROPERTIES ( luai PROPERTIES OUTPUT_NAME lua PDB_NAME luai ) IF (UNIX) IF (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) @@ -127,7 +95,7 @@ IF (INSTALL_TOOLS) ENDIF () ENDIF () ENDIF () - INSTALL ( TARGETS luai luac RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/lua ) + INSTALL ( TARGETS luai luac RUNTIME DESTINATION tools/lua ) ENDIF () IF (NOT SKIP_INSTALL_HEADERS) diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index 0a034611ab35b7..e607a6f61f5dc0 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -5,31 +5,20 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES vs2015-impl-c99.patch fix-ios-system.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -# Used in cmake wrapper -set(ENABLE_LUA_CPP 0) -if ("cpp" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature cpp does not support uwp.") - endif() - set(ENABLE_LUA_CPP 1) -endif() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CMakeLists-cpp.txt" DESTINATION "${SOURCE_PATH}/cpp" RENAME "CMakeLists.txt") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - cpp COMPILE_AS_CPP + cpp COMPILE_AS_CPP # Also used in cmake wrapper tools INSTALL_TOOLS ) -if(VCPKG_TARGET_IS_IOS AND "tools" IN_LIST FEATURES) - message(FATAL_ERROR "lua[tools] is not supported for iOS platform build") -endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -62,5 +51,4 @@ endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -# Handle copyright file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lua/vcpkg-cmake-wrapper.cmake.in b/ports/lua/vcpkg-cmake-wrapper.cmake.in index 74973eca35126b..eec21fdb365eef 100644 --- a/ports/lua/vcpkg-cmake-wrapper.cmake.in +++ b/ports/lua/vcpkg-cmake-wrapper.cmake.in @@ -7,7 +7,7 @@ endforeach() _find_package(unofficial-lua CONFIG ${REQUIRES}) -if (@ENABLE_LUA_CPP@) +if (@COMPILE_AS_CPP@) _find_package(unofficial-lua-cpp CONFIG ${REQUIRES}) endif() diff --git a/ports/lua/vcpkg.json b/ports/lua/vcpkg.json index 2017af76562172..d7c7d2d57c71ef 100644 --- a/ports/lua/vcpkg.json +++ b/ports/lua/vcpkg.json @@ -1,9 +1,10 @@ { "name": "lua", "version": "5.4.4", - "port-version": 1, + "port-version": 2, "description": "A powerful, fast, lightweight, embeddable scripting language", "homepage": "https://www.lua.org", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", @@ -16,10 +17,12 @@ ], "features": { "cpp": { - "description": "Builds Lua for C++ linkage" + "description": "Builds Lua for C++ linkage", + "supports": "!uwp" }, "tools": { - "description": "Builds Lua compiler and interpreter" + "description": "Builds Lua compiler and interpreter", + "supports": "!ios" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 23144ee175bd8d..2a8dea10e648b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4302,7 +4302,7 @@ }, "lua": { "baseline": "5.4.4", - "port-version": 1 + "port-version": 2 }, "luabridge": { "baseline": "2.6", diff --git a/versions/l-/lua.json b/versions/l-/lua.json index 9ee6c7e2580ede..5fb64a0a474ecc 100644 --- a/versions/l-/lua.json +++ b/versions/l-/lua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1443185b76c2f6e0e74c425ed0b3176e98a5fb01", + "version": "5.4.4", + "port-version": 2 + }, { "git-tree": "26701e6e610ff6eaee198ca1aaa0b9125e4b2d6f", "version": "5.4.4", From b25a13c57862e55619c4649702f4f789863b4208 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Sat, 14 May 2022 00:46:37 +0200 Subject: [PATCH 248/383] [freetds, unixodbc] Update (#24279) * [freetds] Update to 1.3.10 * version * Add dependence on mysql * version * mysql patch * version * Add warning for required system libs * version * Remove mysql dependence * version * Fix supports * version * Add mysql dependence * version * Add feature tools * version * Add dependency on unixodbc * format * version * remove mysql * version * Update unixodbc * version * remove man * version * fix cmake * version * test * fix path * version * disable wide characters on UNIX * add to ci baseline * version * don't check for UWP * version * remove unixodbc from ci baseline * Fix deprecated license * version * Unsupported on unix * version --- ports/freetds/disable-tests.patch | 94 +++++++++++++++++++++++++++++++ ports/freetds/portfile.cmake | 67 +++++++++------------- ports/freetds/vcpkg.json | 21 ++++++- ports/unixodbc/portfile.cmake | 26 +++++---- ports/unixodbc/usage | 4 +- ports/unixodbc/vcpkg.json | 4 +- scripts/ci.baseline.txt | 7 --- versions/baseline.json | 8 +-- versions/f-/freetds.json | 5 ++ versions/u-/unixodbc.json | 5 ++ 10 files changed, 173 insertions(+), 68 deletions(-) create mode 100644 ports/freetds/disable-tests.patch diff --git a/ports/freetds/disable-tests.patch b/ports/freetds/disable-tests.patch new file mode 100644 index 00000000000000..0cf0c6ee06a869 --- /dev/null +++ b/ports/freetds/disable-tests.patch @@ -0,0 +1,94 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ac6cc58..1a6a4f0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,9 +64,9 @@ math(EXPR BUILD_NUMBER "${BUILD_NUMBER}") + + set(FREETDS_TOPDIR ${CMAKE_CURRENT_LIST_DIR}) + +-enable_testing() +-set(CMAKE_CTEST_COMMAND ctest) +-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) ++#enable_testing() ++#set(CMAKE_CTEST_COMMAND ctest) ++#add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) + + # TODO depends on configure + add_definitions(-D_REENTRANT -D_THREAD_SAFE) +@@ -459,9 +459,11 @@ add_subdirectory(src/tds) + add_subdirectory(src/ctlib) + add_subdirectory(src/dblib) + add_subdirectory(src/odbc) +-add_subdirectory(src/apps) ++if(WITH_TOOLS) ++ add_subdirectory(src/apps) ++ add_subdirectory(src/pool) ++endif() + add_subdirectory(src/server) +-add_subdirectory(src/pool) + + configure_file(${CMAKE_BINARY_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/include/config.h) + configure_file(${CMAKE_SOURCE_DIR}/include/tds_sysdep_public.h.in ${CMAKE_BINARY_DIR}/include/tds_sysdep_public.h) +diff --git a/src/ctlib/CMakeLists.txt b/src/ctlib/CMakeLists.txt +index e83b0b1a..017d571a 100644 +--- a/src/ctlib/CMakeLists.txt ++++ b/src/ctlib/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + set(static_lib_name ct) + if(WIN32) +diff --git a/src/dblib/CMakeLists.txt b/src/dblib/CMakeLists.txt +index 5f1766f4..c70e87a3 100644 +--- a/src/dblib/CMakeLists.txt ++++ b/src/dblib/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + if(WIN32) + set(win_SRCS winmain.c dblib.def dbopen.c) +diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt +index ec8eaadd..6f9f32c9 100644 +--- a/src/odbc/CMakeLists.txt ++++ b/src/odbc/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + # TODO checks + add_definitions(-DUNIXODBC -DHAVE_SQLGETPRIVATEPROFILESTRING) +diff --git a/src/replacements/CMakeLists.txt b/src/replacements/CMakeLists.txt +index 48d7e536..f7b490f8 100644 +--- a/src/replacements/CMakeLists.txt ++++ b/src/replacements/CMakeLists.txt +@@ -41,7 +41,7 @@ if (NOT WIN32) + set_target_properties(replacements PROPERTIES POSITION_INDEPENDENT_CODE ON) + endif() + +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + + INSTALL(TARGETS replacements +diff --git a/src/tds/CMakeLists.txt b/src/tds/CMakeLists.txt +index 134a30cb..5426571b 100644 +--- a/src/tds/CMakeLists.txt ++++ b/src/tds/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + if(PERL_FOUND AND NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tds_willconvert.h") + if (NOT GPERF) +diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt +index 2a1935c9..a46483e0 100644 +--- a/src/utils/CMakeLists.txt ++++ b/src/utils/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + if(WIN32) + set(add_SRCS md5.c) diff --git a/ports/freetds/portfile.cmake b/ports/freetds/portfile.cmake index 41f2426b05f7b1..b2cc9db38b47ea 100644 --- a/ports/freetds/portfile.cmake +++ b/ports/freetds/portfile.cmake @@ -1,19 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO freetds/freetds - REF 16f7a6280c7a19bfe5c60e5d61cc08e3f2dff991 # See https://github.com/microsoft/vcpkg/pull/14120#issuecomment-715896755 + REF v1.3.10 HEAD_REF master - SHA512 34ff10764156bac24444a74b636fafa56adc0097a62a3f3249d4bc09a0cdcaa88aa0c4f26761260c56dd47edf738ff68f647e045f32cac28e0be7f6760f7f90b + SHA512 78b494c04e3436bfdc4997e6f0196baef27246bb7ad825c487a16f247d13c99324a39d52bfe8f5306164ae3f5c7eb43ca83944b24a3ce6b4bcd733849b4064ad + PATCHES + disable-tests.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES openssl WITH_OPENSSL + tools WITH_TOOLS ) vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) -vcpkg_add_to_path(${PERL_PATH}) +vcpkg_add_to_path("${PERL_PATH}") if (VCPKG_TARGET_IS_WINDOWS) vcpkg_find_acquire_program(GPERF) @@ -25,48 +28,34 @@ else() endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +set(_WCHAR_SUPPORT ON) +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(_WCHAR_SUPPORT OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DENABLE_ODBC_WIDE=${_WCHAR_SUPPORT} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql) +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES bsqldb bsqlodbc datacopy defncopy freebcp tdspool tsql AUTO_CLEAN) + if(EXISTS "${CURRENT_PACKAGES_DIR}/etc") + file(INSTALL "${CURRENT_PACKAGES_DIR}/etc" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/etc") + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/debug/etc") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/freetds/vcpkg.json b/ports/freetds/vcpkg.json index 498c5d5dd990ba..73b7bffb24fa97 100644 --- a/ports/freetds/vcpkg.json +++ b/ports/freetds/vcpkg.json @@ -1,10 +1,24 @@ { "name": "freetds", - "version": "1.2.11", - "port-version": 2, + "version": "1.3.10", "description": "Implementation of the Tabular Data Stream protocol", "homepage": "https://www.freetds.org", + "license": "GPL-2.0-only", "supports": "windows & !uwp", + "dependencies": [ + { + "name": "libmysql", + "platform": "windows" + }, + { + "name": "unixodbc", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], "default-features": [ "openssl" ], @@ -14,6 +28,9 @@ "dependencies": [ "openssl" ] + }, + "tools": { + "description": "Build tools" } } } diff --git a/ports/unixodbc/portfile.cmake b/ports/unixodbc/portfile.cmake index f2e726b8cdc4c4..46d59a1b9cae8e 100644 --- a/ports/unixodbc/portfile.cmake +++ b/ports/unixodbc/portfile.cmake @@ -1,9 +1,8 @@ - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lurcher/unixODBC - REF v2.3.9 - SHA512 473f8d39f5976b4c34394d880d6e511b73e33a1fbd6b828a0929787983cd9b5fe7e16776ed51776ce44b54aa61c62be689c0731489b3989acb99c135fb492ec5 + REF 6c8071b1bef4e4991e7b3023a1c1c712168a818e # v2.3.11 + SHA512 5c5b189e3b62935fdee5e25f5cf9b41fb2bc68fc9bd1652cab1b109032ab586978ba14d19e83328838b55e773f099046344bb4c84ec99edac309650ed863543e HEAD_REF master ) @@ -35,16 +34,19 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc" "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man1" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man5" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man7" ) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unixodbcConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/unixodbc/usage b/ports/unixodbc/usage index 7901a3ef2a32c7..9e6f2f5cf9e487 100644 --- a/ports/unixodbc/usage +++ b/ports/unixodbc/usage @@ -1,4 +1,4 @@ The package unixodbc is compatible with built-in CMake targets: - FIND_PACKAGE(unixodbc REQUIRED) - TARGET_LINK_LIBRARIES(main PRIVATE UNIX::odbc) for linkage + find_package(unixodbc REQUIRED) + target_link_libraries(main PRIVATE UNIX::odbc) diff --git a/ports/unixodbc/vcpkg.json b/ports/unixodbc/vcpkg.json index e844edf3c4412a..3602c057d753eb 100644 --- a/ports/unixodbc/vcpkg.json +++ b/ports/unixodbc/vcpkg.json @@ -1,8 +1,8 @@ { "name": "unixodbc", - "version": "2.3.9", - "port-version": 1, + "version": "2.3.11", "description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX", "homepage": "https://github.com/lurcher/unixODBC", + "license": "LGPL-2.1-only", "supports": "osx | linux" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2e54d9f5f1cf3c..ae04dad517a681 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1183,13 +1183,6 @@ unicorn-lib:x64-uwp=fail unittest-cpp:arm64-windows=fail unittest-cpp:arm-uwp=fail unittest-cpp:x64-uwp=fail -unixodbc:arm64-windows=fail -unixodbc:arm-uwp=fail -unixodbc:x64-uwp=fail -unixodbc:x64-windows=fail -unixodbc:x64-windows-static=fail -unixodbc:x64-windows-static-md=fail -unixodbc:x86-windows=fail urdfdom:x64-windows-static=fail usd:x86-windows=fail uthenticode:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2a8dea10e648b9..357f1f6ad9eabd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2337,8 +2337,8 @@ "port-version": 0 }, "freetds": { - "baseline": "1.2.11", - "port-version": 2 + "baseline": "1.3.10", + "port-version": 0 }, "freetype": { "baseline": "2.11.1", @@ -7213,8 +7213,8 @@ "port-version": 3 }, "unixodbc": { - "baseline": "2.3.9", - "port-version": 1 + "baseline": "2.3.11", + "port-version": 0 }, "unqlite": { "baseline": "1.1.9", diff --git a/versions/f-/freetds.json b/versions/f-/freetds.json index 19513003f0a784..64d7d576e5c420 100644 --- a/versions/f-/freetds.json +++ b/versions/f-/freetds.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c388be84a1c4bb7156aaf173f1ee348d500db8ad", + "version": "1.3.10", + "port-version": 0 + }, { "git-tree": "d3cbd323de7835a0dc5239e8b51b20f783121bdb", "version": "1.2.11", diff --git a/versions/u-/unixodbc.json b/versions/u-/unixodbc.json index 6b6e135c31f850..0c8f6a98b59611 100644 --- a/versions/u-/unixodbc.json +++ b/versions/u-/unixodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3042b55f1c0ecd0d27336b24754a6f5f3a746c03", + "version": "2.3.11", + "port-version": 0 + }, { "git-tree": "68ea55f1c4679d7585ab6482d1641bfb6b106b23", "version": "2.3.9", From 0e6728a8bfa8f71c22b21b4528377e0d2465eb02 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 13 May 2022 15:47:04 -0700 Subject: [PATCH 249/383] Build "fixes" 2022-05-13 (#24707) PASSING, REMOVE FROM FAIL LIST: akali:x64-windows-static-md (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). Probably fixed by https://github.com/microsoft/vcpkg/pull/24648 REGRESSION: angle:x64-windows-static-md failed with BUILD_FAILED. If expected, add angle:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: angle:arm-uwp failed with BUILD_FAILED. If expected, add angle:arm-uwp=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. ICE :( https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1472813 --- scripts/ci.baseline.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ae04dad517a681..09583f6c2528cf 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1268,7 +1268,6 @@ lapack-reference:x64-uwp=skip # failures for x64-windows-static-md ace:x64-windows-static-md=fail -akali:x64-windows-static-md=fail fastcgi:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail @@ -1303,3 +1302,13 @@ dimcli:x64-windows-static=fail zeroc-ice:arm64-windows=fail zeroc-ice:arm-uwp=fail zeroc-ice:x64-uwp=fail + +# ANGLE triggers an intermittent ice in C1XX +# https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1472813 +angle:x86-windows=skip +angle:x64-windows=skip +angle:x64-windows-static=skip +angle:x64-windows-static-md=skip +angle:x64-uwp=skip +angle:arm64-windows=skip +angle:arm-uwp=skip From 66444e6324af76931e2e7caaa861a91a343889c5 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 14 May 2022 07:50:32 +0800 Subject: [PATCH 250/383] [marble] update to 22.04.0 (#24691) * [marble] update to 22.04.0 * update version * Add license * update version * add option * update version --- ports/marble/portfile.cmake | 41 +++++++++++++-------- ports/marble/qtfix.patch | 71 +++---------------------------------- ports/marble/vcpkg.json | 4 +-- versions/baseline.json | 4 +-- versions/m-/marble.json | 5 +++ 5 files changed, 41 insertions(+), 84 deletions(-) diff --git a/ports/marble/portfile.cmake b/ports/marble/portfile.cmake index 7136b47c2cd6cf..d24c4c603fa30a 100644 --- a/ports/marble/portfile.cmake +++ b/ports/marble/portfile.cmake @@ -2,10 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/marble - REF 552cb9ae1f34482d1ec56532a703e0d820856286 #v20.04.3 - SHA512 ac6106a6db53534c96d7281b1a07624c2852ed8c78cce0b91c5f865b106487f1f49aaa4c72d00ffb1f79a761d8d2eca18129ef9517bef463a1840554ed3e51fb + REF 7def3b68fd5de9b7f0734410a9f955bd1082097b #v22.04.0 + SHA512 2977a051a7f91603dea5960ddf0fed2fd5a991d554bce899ce4d8a0d3648546ff2c4c75bebcd3704d07d875b656ab7dc64c567b1bc9f6975745be327375faa90 HEAD_REF master - PATCHES "qtfix.patch" + PATCHES + qtfix.patch ) vcpkg_cmake_configure( @@ -25,22 +26,34 @@ file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*") file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*") -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins) -file(COPY ${PLUGINS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/plugins) -file(COPY "${CURRENT_PACKAGES_DIR}/data" DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) # have to keep folder structure here -file(COPY ${MKSPECS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/mkspecs) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins") +file(COPY ${PLUGINS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/plugins") +file(COPY "${CURRENT_PACKAGES_DIR}/data" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") # have to keep folder structure here +file(COPY ${MKSPECS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/mkspecs") # remove plugin folder file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins - ${CURRENT_PACKAGES_DIR}/data ${CURRENT_PACKAGES_DIR}/debug/data - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/mkspecs ${CURRENT_PACKAGES_DIR}/debug/mkspecs - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/lib/plugins + "${CURRENT_PACKAGES_DIR}/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins" + "${CURRENT_PACKAGES_DIR}/data" "${CURRENT_PACKAGES_DIR}/debug/data" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/mkspecs" "${CURRENT_PACKAGES_DIR}/debug/mkspecs" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/lib/plugins" + "${CURRENT_PACKAGES_DIR}/debug/marble-qt.exe" ) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") +file(RENAME "${CURRENT_PACKAGES_DIR}/astro.dll" "${CURRENT_PACKAGES_DIR}/bin/astro.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/marbledeclarative.dll" "${CURRENT_PACKAGES_DIR}/bin/marbledeclarative.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/marblewidget-qt5.dll" "${CURRENT_PACKAGES_DIR}/bin/marblewidget-qt5.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/marble-qt.exe" "${CURRENT_PACKAGES_DIR}/tools/marble/marble-qt.exe") + +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/astrod.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/astrod.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/marbledeclaratived.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/marbledeclaratived.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/marblewidget-qt5d.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/marblewidget-qt5d.dll") + vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/marble/qtfix.patch b/ports/marble/qtfix.patch index 39a420be02ce3a..8c923ff2c1f9fa 100644 --- a/ports/marble/qtfix.patch +++ b/ports/marble/qtfix.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3b2139dc..1f9a10513 100644 +index 65b58c4..a8f024c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -171,7 +171,7 @@ set (PEDANTIC FALSE CACHE BOOL "Determines if we should compile with -Wall -Werr +@@ -184,7 +184,7 @@ set (PEDANTIC FALSE CACHE BOOL "Determines if we should compile with -Wall -Werr set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build plugins for Qt Designer") add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO") @@ -11,73 +11,12 @@ index a3b2139dc..1f9a10513 100644 if (NOT QT_PLUGINS_DIR) set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins) endif() -@@ -248,7 +248,7 @@ add_definitions( - -DQT_NO_URL_CAST_FROM_STRING - -DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_BYTEARRAY -- -DQT_STRICT_ITERATORS -+# -DQT_STRICT_ITERATORS - -DQT_DISABLE_DEPRECATED_BEFORE=0x050700 - ) - -diff --git a/src/apps/marble-qt/CMakeLists.txt b/src/apps/marble-qt/CMakeLists.txt -index d28e3aa5e..7bbf4a63c 100644 ---- a/src/apps/marble-qt/CMakeLists.txt -+++ b/src/apps/marble-qt/CMakeLists.txt -@@ -48,7 +48,7 @@ if(STATIC_BUILD) - endif(STATIC_BUILD) - - if(WIN32) --install (TARGETS marble-qt RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}) -+ install (TARGETS marble-qt RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/marble) - else(WIN32) - if (APPLE) - # No need for this when installing to a bundle -diff --git a/src/lib/astro/CMakeLists.txt b/src/lib/astro/CMakeLists.txt -index 5e1afd60f..fc53985f4 100644 ---- a/src/lib/astro/CMakeLists.txt -+++ b/src/lib/astro/CMakeLists.txt -@@ -50,7 +50,7 @@ target_include_directories(astro - - # choose the correct target install library path - if(WIN32) -- INSTALL(TARGETS astro EXPORT AstroTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib) -+ INSTALL(TARGETS astro EXPORT AstroTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - elseif(APPLE) - INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) - else() -diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt -index 7d27be94b..f1f377967 100644 ---- a/src/lib/marble/CMakeLists.txt -+++ b/src/lib/marble/CMakeLists.txt -@@ -448,7 +448,7 @@ target_include_directories(marblewidget - - # choose the correct target install library path - if(WIN32) -- install(TARGETS marblewidget EXPORT MarbleTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib) -+ install(TARGETS marblewidget EXPORT MarbleTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - elseif(APPLE) - install(TARGETS marblewidget LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) - else() -diff --git a/src/lib/marble/declarative/CMakeLists.txt b/src/lib/marble/declarative/CMakeLists.txt -index dd5d519c4..482a02ad5 100644 ---- a/src/lib/marble/declarative/CMakeLists.txt -+++ b/src/lib/marble/declarative/CMakeLists.txt -@@ -53,7 +53,7 @@ if(Qt5Positioning_FOUND) - endif() - - if(WIN32) -- install(TARGETS marbledeclarative RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib) -+ install(TARGETS marbledeclarative RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - else() - install(TARGETS marbledeclarative LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() diff --git a/src/plugins/positionprovider/CMakeLists.txt b/src/plugins/positionprovider/CMakeLists.txt -index 85591098e..87011876e 100644 +index ec2ba1a..cc8e52e 100644 --- a/src/plugins/positionprovider/CMakeLists.txt +++ b/src/plugins/positionprovider/CMakeLists.txt @@ -12,12 +12,12 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} - COMPONENTS + OPTIONAL_COMPONENTS Positioning ) -marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" ) @@ -88,7 +27,7 @@ index 85591098e..87011876e 100644 -endif() +#marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" ) +#marble_set_package_properties( Qt5Positioning PROPERTIES URL "https://www.qt.io/developers/" ) -+#arble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" ) ++#marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" ) +#if(Qt5Positioning_FOUND) +# ADD_SUBDIRECTORY( qtpositioning ) +#endif() diff --git a/ports/marble/vcpkg.json b/ports/marble/vcpkg.json index 96ee0b95b91bc6..5486e7af729083 100644 --- a/ports/marble/vcpkg.json +++ b/ports/marble/vcpkg.json @@ -1,9 +1,9 @@ { "name": "marble", - "version-string": "19.08.2", - "port-version": 3, + "version-string": "22.04.0", "description": "Marble KDE library", "homepage": "https://marble.kde.org", + "license": "LGPL-2.1-or-later", "supports": "windows & x64 & !static", "dependencies": [ "qt5-base", diff --git a/versions/baseline.json b/versions/baseline.json index 357f1f6ad9eabd..d8bb700166645d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4405,8 +4405,8 @@ "port-version": 2 }, "marble": { - "baseline": "19.08.2", - "port-version": 3 + "baseline": "22.04.0", + "port-version": 0 }, "marl": { "baseline": "2022-03-02", diff --git a/versions/m-/marble.json b/versions/m-/marble.json index 69ee45563ac678..b7507773fc59a5 100644 --- a/versions/m-/marble.json +++ b/versions/m-/marble.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a6e4d655adaa7043e8b347841b11472c9b36a6a", + "version-string": "22.04.0", + "port-version": 0 + }, { "git-tree": "eb15f05858eaff46b5d7b142d3c874f889d26557", "version-string": "19.08.2", From 88d95a6b5aa519727f6bd25b24338a49b6616ea0 Mon Sep 17 00:00:00 2001 From: Anders Wind Date: Sat, 14 May 2022 01:51:33 +0200 Subject: [PATCH 251/383] Update portfile.cmake (#24578) --- ports/mpmcqueue/portfile.cmake | 15 ++++++++------- ports/mpmcqueue/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/m-/mpmcqueue.json | 5 +++++ 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ports/mpmcqueue/portfile.cmake b/ports/mpmcqueue/portfile.cmake index f1fe1d3a0327f2..5ea35ba3f58ab4 100644 --- a/ports/mpmcqueue/portfile.cmake +++ b/ports/mpmcqueue/portfile.cmake @@ -3,15 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rigtorp/MPMCQueue - REF 5883e32b07e8a60c22d532d9120ea5c11348aea9 - SHA512 4adbbe5e014e0ef5c7030aaa9faa4e07e2c65753cd89c770da250811c13776576c4f1caf4144542318c41ebc7433b106e802c482a5d44572963a5ab59047257e + REF 28d05c021d68fc5280b593329d1982ed02f9d7b3 + SHA512 e3305ecac05d48814d75adcb85fa165eec3a439a17dd99f8b0d2c095e40b2f98bd4bcf167cf8268f84d09aa172ab66b30573d9d3ad4908c10dc5bec632529b8a HEAD_REF master ) -file(COPY - ${SOURCE_PATH}/include/rigtorp/MPMCQueue.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include/rigtorp -) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/MPMCQueue) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/mpmcqueue/vcpkg.json b/ports/mpmcqueue/vcpkg.json index 4a6075538f15d6..f01f42881b1e60 100644 --- a/ports/mpmcqueue/vcpkg.json +++ b/ports/mpmcqueue/vcpkg.json @@ -1,7 +1,17 @@ { "name": "mpmcqueue", - "version-string": "2019-07-26", - "port-version": 1, + "version-date": "2021-12-01", "description": "A bounded multi-producer multi-consumer lock-free queue written in C++11", - "homepage": "https://github.com/rigtorp/MPMCQueue" + "homepage": "https://github.com/rigtorp/MPMCQueue", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index d8bb700166645d..017900024c58e9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4661,8 +4661,8 @@ "port-version": 0 }, "mpmcqueue": { - "baseline": "2019-07-26", - "port-version": 1 + "baseline": "2021-12-01", + "port-version": 0 }, "mqtt-cpp": { "baseline": "12.0.0", diff --git a/versions/m-/mpmcqueue.json b/versions/m-/mpmcqueue.json index 7e226ceda34aa9..2234a129fcc002 100644 --- a/versions/m-/mpmcqueue.json +++ b/versions/m-/mpmcqueue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7986416e7dd33174b060331018a3b8aeee3018f0", + "version-date": "2021-12-01", + "port-version": 0 + }, { "git-tree": "1953040343e61f40deb621b5ca28aed36ebc2008", "version-string": "2019-07-26", From 81134652a6548502c2e8ef324e99615f88e619e1 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Sat, 14 May 2022 02:51:51 +0300 Subject: [PATCH 252/383] [qt5] Update to 5.15.4 (#24660) * [qt5] Update to 5.15.4 https://lists.qt-project.org/pipermail/development/2022-May/042437.html * Deprecate "latest" feature Also update "qt5" port when updating versions Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/qt5-3d/vcpkg.json | 2 +- ports/qt5-activeqt/vcpkg.json | 2 +- ports/qt5-androidextras/vcpkg.json | 2 +- ports/qt5-base/cmake/qt_port_functions.cmake | 5 - ports/qt5-base/cmake/qt_port_hashes.cmake | 96 ++++++++++--------- .../cmake/qt_port_hashes_latest.cmake | 67 ------------- ports/qt5-base/portfile.cmake | 31 +----- ports/qt5-base/vcpkg.json | 5 +- ports/qt5-charts/vcpkg.json | 2 +- ports/qt5-connectivity/vcpkg.json | 2 +- ports/qt5-datavis3d/vcpkg.json | 2 +- ports/qt5-declarative/portfile.cmake | 2 +- ports/qt5-declarative/vcpkg.json | 2 +- ports/qt5-doc/vcpkg.json | 2 +- ports/qt5-gamepad/vcpkg.json | 2 +- ports/qt5-graphicaleffects/vcpkg.json | 2 +- ports/qt5-imageformats/vcpkg.json | 3 +- ports/qt5-location/vcpkg.json | 2 +- ports/qt5-macextras/vcpkg.json | 2 +- ports/qt5-mqtt/vcpkg.json | 2 +- ports/qt5-multimedia/vcpkg.json | 2 +- ports/qt5-networkauth/vcpkg.json | 2 +- ports/qt5-purchasing/vcpkg.json | 2 +- ports/qt5-quickcontrols/vcpkg.json | 2 +- ports/qt5-quickcontrols2/vcpkg.json | 2 +- ports/qt5-remoteobjects/vcpkg.json | 2 +- ports/qt5-script/vcpkg.json | 2 +- ports/qt5-scxml/vcpkg.json | 2 +- ports/qt5-sensors/vcpkg.json | 2 +- ports/qt5-serialbus/vcpkg.json | 2 +- ports/qt5-serialport/vcpkg.json | 2 +- ports/qt5-speech/vcpkg.json | 2 +- ports/qt5-svg/vcpkg.json | 2 +- ports/qt5-tools/vcpkg.json | 2 +- ports/qt5-translations/vcpkg.json | 2 +- ports/qt5-virtualkeyboard/vcpkg.json | 2 +- ports/qt5-wayland/vcpkg.json | 2 +- ports/qt5-webchannel/vcpkg.json | 2 +- ports/qt5-webengine/vcpkg.json | 3 +- ports/qt5-webglplugin/vcpkg.json | 2 +- ports/qt5-websockets/vcpkg.json | 2 +- ports/qt5-webview/vcpkg.json | 2 +- ports/qt5-winextras/vcpkg.json | 3 +- ports/qt5-x11extras/vcpkg.json | 2 +- ports/qt5-xmlpatterns/vcpkg.json | 2 +- ports/qt5/vcpkg.json | 14 +-- versions/baseline.json | 92 +++++++++--------- versions/q-/qt5-3d.json | 5 + versions/q-/qt5-activeqt.json | 5 + versions/q-/qt5-androidextras.json | 5 + versions/q-/qt5-base.json | 5 + versions/q-/qt5-charts.json | 5 + versions/q-/qt5-connectivity.json | 5 + versions/q-/qt5-datavis3d.json | 5 + versions/q-/qt5-declarative.json | 5 + versions/q-/qt5-doc.json | 5 + versions/q-/qt5-gamepad.json | 5 + versions/q-/qt5-graphicaleffects.json | 5 + versions/q-/qt5-imageformats.json | 5 + versions/q-/qt5-location.json | 5 + versions/q-/qt5-macextras.json | 5 + versions/q-/qt5-mqtt.json | 5 + versions/q-/qt5-multimedia.json | 5 + versions/q-/qt5-networkauth.json | 5 + versions/q-/qt5-purchasing.json | 5 + versions/q-/qt5-quickcontrols.json | 5 + versions/q-/qt5-quickcontrols2.json | 5 + versions/q-/qt5-remoteobjects.json | 5 + versions/q-/qt5-script.json | 5 + versions/q-/qt5-scxml.json | 5 + versions/q-/qt5-sensors.json | 5 + versions/q-/qt5-serialbus.json | 5 + versions/q-/qt5-serialport.json | 5 + versions/q-/qt5-speech.json | 5 + versions/q-/qt5-svg.json | 5 + versions/q-/qt5-tools.json | 5 + versions/q-/qt5-translations.json | 5 + versions/q-/qt5-virtualkeyboard.json | 5 + versions/q-/qt5-wayland.json | 5 + versions/q-/qt5-webchannel.json | 5 + versions/q-/qt5-webengine.json | 5 + versions/q-/qt5-webglplugin.json | 5 + versions/q-/qt5-websockets.json | 5 + versions/q-/qt5-webview.json | 5 + versions/q-/qt5-winextras.json | 5 + versions/q-/qt5-x11extras.json | 5 + versions/q-/qt5-xmlpatterns.json | 5 + versions/q-/qt5.json | 5 + 88 files changed, 350 insertions(+), 248 deletions(-) delete mode 100644 ports/qt5-base/cmake/qt_port_hashes_latest.cmake diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index 282d07e0e613ea..3d57f3ad8dc24b 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-3d", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", "license": null, "dependencies": [ diff --git a/ports/qt5-activeqt/vcpkg.json b/ports/qt5-activeqt/vcpkg.json index 8935f1e5e7f4e4..9e1d2627df8cee 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-activeqt", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 ActiveQt Module - ActiveX components", "license": null, "supports": "windows", diff --git a/ports/qt5-androidextras/vcpkg.json b/ports/qt5-androidextras/vcpkg.json index 15e043cd59eae6..66e4cc46bbeb5d 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-androidextras", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 androidextras Module;", "license": null, "supports": "android", diff --git a/ports/qt5-base/cmake/qt_port_functions.cmake b/ports/qt5-base/cmake/qt_port_functions.cmake index 921f194a540c92..19f53f98bd7fc3 100644 --- a/ports/qt5-base/cmake/qt_port_functions.cmake +++ b/ports/qt5-base/cmake/qt_port_functions.cmake @@ -2,11 +2,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") #Basic setup include(qt_port_hashes) -if(QT_BUILD_LATEST) # only set in qt5-base - include(qt_port_hashes_latest) -elseif(NOT PORT STREQUAL "qt5-base") - include(qt_port_hashes_latest OPTIONAL) # will only be available for the other qt ports if qt5-base was build with latest -endif() #Fixup scripts include(qt_fix_makefile_install) include(qt_fix_cmake) diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index c7d0cba8c57429..dffbb5b158436d 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,61 +1,60 @@ -#Every update requires an update of these hashes and the version within the control file of each of the 32 ports. -#So it is probably better to have a central location for these hashes and let the ports update via a script +# Every update requires an update of these hashes and the version within the control file of each of the 32 ports. +# So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 3) +set(QT_PATCH_VER 4) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-base 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079) -set(QT_HASH_qt5-3d 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c) -set(QT_HASH_qt5-activeqt 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a) -set(QT_HASH_qt5-androidextras 45957b9afccf147dfe75c210e77e7b12cd3d1c34855052773a8ccce62020acd06e9e8f5b848f32f1fdbdb8fa614877909b9a1517530aad643b8954200ec030ca) -set(QT_HASH_qt5-charts 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48) -set(QT_HASH_qt5-connectivity 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534) -set(QT_HASH_qt5-datavis3d d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3) -set(QT_HASH_qt5-declarative c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597) -set(QT_HASH_qt5-doc bb23d6d65a7c39ed9119e0bf30810a94ad937cc3f9ab0004d0c3fda712a6fbe009fdef74f5fe1212bc68ad0851ada37592c11f6ef754b81eff2d9c453b3a995b) -set(QT_HASH_qt5-gamepad 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa) -set(QT_HASH_qt5-graphicaleffects 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98) -set(QT_HASH_qt5-imageformats f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e) -set(QT_HASH_qt5-location 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886) -set(QT_HASH_qt5-macextras 26ff64206d6b491271a2db8a6932b30fc8df6ff121ef272edca5e2ec61d98668e326102d529f9335eab98bb3e5e3261cb50db2b2f78f751226bb9d4aa84e499b) -set(QT_HASH_qt5-mqtt df91daf1accdf93d05bad33b9abb4a69f2b3fcd91f6dbcd71d6c74c21b0f0b2aeabc83f64aa5c149321b1a700cde3d81a4cbfc8fad7cdd8b0d8c0cc073299f82) -set(QT_HASH_qt5-multimedia 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668) -set(QT_HASH_qt5-networkauth 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654) -set(QT_HASH_qt5-purchasing 33ce166c6f4e626fef4cc17e902a5117225fa87799687e6c0956898bf80e04df4f3fa447b466e43c9fac58e879a7c9fd0e8c18006e8aa69f0e8762b258c81674) -set(QT_HASH_qt5-quickcontrols 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e) -set(QT_HASH_qt5-quickcontrols2 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb) -set(QT_HASH_qt5-remoteobjects a20699353269dd1d61ea9a45191aa6c438d597783c7461ee41c1bbde0d6043f2be138dd0f46744c1a3081c4098e66e78543f0397eb18b72aab99808de7855bd9) -set(QT_HASH_qt5-script ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9) -set(QT_HASH_qt5-scxml 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1) -set(QT_HASH_qt5-sensors c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2) -set(QT_HASH_qt5-serialbus af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87) -set(QT_HASH_qt5-serialport 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a) -set(QT_HASH_qt5-speech 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a) -set(QT_HASH_qt5-svg 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527) -set(QT_HASH_qt5-tools 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47) -set(QT_HASH_qt5-translations d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc) -set(QT_HASH_qt5-virtualkeyboard f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2) -set(QT_HASH_qt5-webchannel 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415) -set(QT_HASH_qt5-webengine d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c) -set(QT_HASH_qt5-webglplugin 01860ca3ce27630ca1a92eb6deb933959a3679fb579d4cb8a06884f51a672c355f6929355aa6d45f4c5d8ac026b4cecdc7a26d5b2e897ca75bb7a9331e2d3e0d) -set(QT_HASH_qt5-websockets a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea) -set(QT_HASH_qt5-webview 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030) -set(QT_HASH_qt5-x11extras eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133) -set(QT_HASH_qt5-xmlpatterns 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4) -set(QT_HASH_qt5-wayland 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89) -set(QT_HASH_qt5-winextras d0707f865552645e82a493265b142171f14c126bd99325471b5d94593c95763d606be89fcc72f74f3192446e024c9be904c7d95816b2dd8e8cc7cf9f34a02f77) - +set(QT_HASH_qt5-base 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3) +set(QT_HASH_qt5-3d cb2ea961109a153e78147450310408f4f573186d12412ebdd71511eb273ca78113d3aede583ec8aa44fe19f5268bb6fab3386c5501142ad6a22e10890ce52f62) +set(QT_HASH_qt5-activeqt 39ef01523583cbdea80143fae25afb1cfeb7131769430ab153a82edd6c5478383c558a06ea7053b8d99b8945a6422c4f38765ffb72cd87f0f34cc9ad78ebc603) +set(QT_HASH_qt5-androidextras 527471c0dc9b51ffccdb6c8134b78be4f6d2039bc8dee22529a117457e8153aaf1b081e23704864cc6999ba3059876a85bd3a27b9bcc9fbfda618816c92b719b) +set(QT_HASH_qt5-charts e7a4cac3b3a0c60c7ab509d5a533521dd8dc0cb5ad69d66a87f12671c73c1928d902e0be377efb77e0ddadefe1ef8800c0cf07e8213f44367bcd80a787342bcf) +set(QT_HASH_qt5-connectivity 3f2c0a59ff6be9531f5ebc81a4344e0b12c8ef92fbfa466f2777d4ed3b4b08657214e93e0aada856a0c6475b6b760aeeb06f0b2be894e61cd7b344c49fefaf95) +set(QT_HASH_qt5-datavis3d 044cdee342ef4d9beb62b910cee59f9cb362c85d517e19a1c0327dfa2b518b2fa484e36756ee9302fb043cc506340b501202861a858d374a5f69cbcddec18301) +set(QT_HASH_qt5-declarative 8a4ff61238fde7cc563f9d94b5d1f4fd71ecb95ace447e57d08f71da82400b37c42f4f1ecdcd561116bffa1ed483219e06fb550f91c90842e5a43487bc4706b6) +set(QT_HASH_qt5-doc 2552501dfbc5ad8e42f211a621340902fa85634bc8a2a62ce457029d6f7cbd534a29a671c33aa1d034198a1491fd6d257db7177b0ca5e1ef57b84272a392cf06) +set(QT_HASH_qt5-gamepad 37eaad5338b6c5114571c6983fb806ff6537ba7d3dc4bf8d02899e693198a22ce17b0b3ddf2aa52447fcebb0ef97a3baa8e1bc3a7e3f265ad047509f53160ee9) +set(QT_HASH_qt5-graphicaleffects 00cf02057dfc1624c84079e1a08a65ceb6fb7df712f05ac9cb0006de0add9241e56a8e3909eeb04d1f6a90d5032909a41d59341e002750ab99d2449f635e64e3) +set(QT_HASH_qt5-imageformats 388a9ceebdca6d32f606615af37233f2d8394856d067c9a80486b88ad5714eac90263cd6555a3efd9c1b5fdcc27431b7f99eed6fc02760b1a9974515bfe70274) +set(QT_HASH_qt5-location 6208052d6ac173d19dc77496d8108558e7f31696dc5792fcbbeef2029539db76a60c5a51a7d198f54ea6c0ec23977a57cd8c8f8fa80fe5eac9528d2510c3dbb3) +set(QT_HASH_qt5-macextras 93985001db49985c69360dc58f6260ce2e26f861696c2f5989be9da3e239292fa5b954e0d036869a2e3d6fb046053e39ae113e4307ec762d8db1aa17af1998f5) +set(QT_HASH_qt5-mqtt 7a81d0bec0c59cb5574e96a2f9b33c0eea04789731909247544d14c87a0fa854214b8bfd35ee69831747e9487b616b75bbc9dfd9e78f33acd6b7a69dfaacdd75) +set(QT_HASH_qt5-multimedia bb0ada7560093b89751b5b3c0e1a573de215a388d621d356bc3c0e1acfffc2d696230c67b7a7cef037b18c4da900c7eb3d315bd2e73ce12f9aedd0e340399117) +set(QT_HASH_qt5-networkauth a36ce21151cb98bcbc99a819e873ef10f68d988aebfbae9aaaa7dc85bd4a693ad7510c47627f0f3841c5ef50173b21cdebe6a602fa429839fd9ad9bcc02d6c3c) +set(QT_HASH_qt5-purchasing 6455cff7b3dd2bbf5fc85ba9067b86bb042723b73d0b8984ab43ffdf444e50b5a68bb992ec82b133ac0e0cc3e18ca784cff8357e1e61ffe9fbbef1ff0f21a55f) +set(QT_HASH_qt5-quickcontrols 887a8f5fdcd3764575f9068ec8428526a049bb09ae0c214daef3652527d5e448baa53738dccf316b20ccf18f36951ecebd570aee3a27f9c32b9213ef7629de10) +set(QT_HASH_qt5-quickcontrols2 4ebbb0199db156307140406b6da4fa83c47aee2105e8c46c0da96313ddc4d6d7ea2f1f85691856144eb8c5109c108bb6810ba0693a2d2411b4feaeed1ec9a8f4) +set(QT_HASH_qt5-remoteobjects 6702f9419d5198572e37f0ee6883c2af38f4a249036365d9e084cd4acb30478f6935835493330b101482e998153d4e4f515004e0ffd428b64a86bba17eb203d6) +set(QT_HASH_qt5-script 01d3b03eec23f462a7931e268eb8572d85ed560dd8b24f85b420ff8ebb1932d4c18f47c8d5fad7b7c09c147158b02b6cceb9c571b10249ba4008b363e23d7f95) +set(QT_HASH_qt5-scxml 2664e4e707fd10aa2ef832fdfc133695da3f6f80c2a611dc94b4e22b34c3226d5baa1e5afc77db2115317c654460ebb60896c006aa93b324fe67d6860ae9b431) +set(QT_HASH_qt5-sensors b8b9ffedfdcd392bd5c1ab76db3f621d16094f444e14900726378a289c04c08a75b82628cb61f4ca66bba8c1eeba2a56d9f90d9a82adfdc90fc00ac1b579c63e) +set(QT_HASH_qt5-serialbus 931362b171799fd8e449d418c3ae80c029c39edffc66b5c3fa054991332950241803d282e1ae1e5f72c8395f88f9d82d6a2d04f00b3907b5e9f7fb5be4f555e7) +set(QT_HASH_qt5-serialport d8bc3d0b89bb4fc05bfe27a4c76bc3732ef5f8ba889400c8116f18c2ed58db7a3b99c4bda1cd60d1e8051121d31a4b55b95d20e89578a6e523d527e6182262ba) +set(QT_HASH_qt5-speech 6582fe36950aee8428c72582ff2eda2dae433ad969c323e0c6e8be611be7d81766ceb1cae85a10dcd4d266e33a0cf782fe857e1502d7f3863e0dfb2306af2aed) +set(QT_HASH_qt5-svg 364400e17cdc659ff1a521f7bd171c5dfe537136f263cd5f64c6b5e27b0398d83ae0b5fe46e77847f3a2feccf0ea75f9591ff4b932d0250e5859272630b5a31c) +set(QT_HASH_qt5-tools 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e) +set(QT_HASH_qt5-translations 56b20c0174cb68c3e4def85ec6c113576bc8872d1cdac318bc3d9a121645f67ce68e9bd3a73e32fd53617fcef641fb95831b37c40f1250c1c05e109e55b41ee2) +set(QT_HASH_qt5-virtualkeyboard 870279299a5e166badea0746a2d4badc758c66f8404e36d1df05997dcfeb66733154fc2a9830c433fbacf885b7afb44bc8dc8a5aacc02713966630ce98231ba3) +set(QT_HASH_qt5-wayland 58ae262f7aa0455fb577a36fe9413a969398a2043160642501bac064d6fbc3280f76aa566e62b9d73c67a8c3606849b1b97bcb9b0250d26c269ec921112f40e4) +set(QT_HASH_qt5-webchannel 18d5e6f44b780c7dfc94e1620ba76d7b0731d671df537b2e29fef062a0775e8dc973deb6c949b37000f5e8a49bdd31a723aa069bafcb9ecdc3259d0bf97e5a26) +set(QT_HASH_qt5-webengine 935c5a21ec2529d8cc3dbaf906e1f68f6e0879da212719d2da9fc1c97efd572563e8d12a6742a0a995efa5014ce5378235833eafb8d463ebe4060b60a590c476) +set(QT_HASH_qt5-webglplugin e637abc9388f6c9c6641a38c7f33cef781320616be7d181d7fc63aa6f3ed6d378ec3cef91c8feebda52ff669bb3eb2df771bc2a2e447d482ce940abe4c1edce9) +set(QT_HASH_qt5-websockets 01714b9927c3a234fac9386a596aa3dc3833d9cfe8cc152892fec969e51b428bed00f501c16b8e4f810452739ff8491e5c64f9b936aa10e1a839c09c8f2832ce) +set(QT_HASH_qt5-webview fb5177f0e8f79490598120f01b6cdd78ce5cbac8f313c0e088ded7b4daada290d2c058ecd6eebdba76fd15efd2e198bc03cbaf544fba664d49efb55709703be6) +set(QT_HASH_qt5-winextras cac1b2b2194f3c21cba73e0c49384957a40e3297965b3fcf625eba0d069e3955202cae5e545a6186a9fad51df18afddd27fe55535265d2acf15fe2ba9e71a1d5) +set(QT_HASH_qt5-x11extras 79c718eff9daba9ff3f361d38f828f8f3c447b87486d652d4ed1f964ec686259ae4d0a1a50b7b6b9349453ba3f8b56b3c20c8a5f26971d5cc3c8f99d668744d6) +set(QT_HASH_qt5-xmlpatterns fc4b4723407f6a1e765933d9d76ec4ffe874cb4a70e47bc4110def2c4a491b86fa753c33ef31ef95ad1a6eaa3de1fadbc49deb7783d32d8fc2f51672670d5a87) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) if("${PORT}" MATCHES "qt5-base") - foreach(_current_qt_port ${QT_PORT_LIST}) - set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/vcpkg.json") + function(update_qt_version_in_manifest _port_name) + set(_current_control "${VCPKG_ROOT_DIR}/ports/${_port_name}/vcpkg.json") file(READ ${_current_control} _control_contents) #message(STATUS "Before: \n${_control_contents}") string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") @@ -63,6 +62,11 @@ if(QT_UPDATE_VERSION) #message(STATUS "After: \n${_control_contents}") file(WRITE ${_current_control} "${_control_contents}") configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) + endfunction() + + update_qt_version_in_manifest("qt5") + foreach(_current_qt_port_basename ${QT_PORT_LIST}) + update_qt_version_in_manifest("qt5-${_current_qt_port_basename}") endforeach() endif() endif() diff --git a/ports/qt5-base/cmake/qt_port_hashes_latest.cmake b/ports/qt5-base/cmake/qt_port_hashes_latest.cmake deleted file mode 100644 index 61d8e0ac81a6f9..00000000000000 --- a/ports/qt5-base/cmake/qt_port_hashes_latest.cmake +++ /dev/null @@ -1,67 +0,0 @@ -#Every update requires an update of these hashes and the version within the control file of each of the 32 ports. -#So it is probably better to have a central location for these hashes and let the ports update via a script -set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 3) -set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. - -set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth - purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets - webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) - -set(QT_HASH_qt5-base 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079) -set(QT_HASH_qt5-3d 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c) -set(QT_HASH_qt5-activeqt 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a) -set(QT_HASH_qt5-androidextras 45957b9afccf147dfe75c210e77e7b12cd3d1c34855052773a8ccce62020acd06e9e8f5b848f32f1fdbdb8fa614877909b9a1517530aad643b8954200ec030ca) -set(QT_HASH_qt5-charts 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48) -set(QT_HASH_qt5-connectivity 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534) -set(QT_HASH_qt5-datavis3d d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3) -set(QT_HASH_qt5-declarative c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597) -set(QT_HASH_qt5-doc bb23d6d65a7c39ed9119e0bf30810a94ad937cc3f9ab0004d0c3fda712a6fbe009fdef74f5fe1212bc68ad0851ada37592c11f6ef754b81eff2d9c453b3a995b) -set(QT_HASH_qt5-gamepad 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa) -set(QT_HASH_qt5-graphicaleffects 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98) -set(QT_HASH_qt5-imageformats f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e) -set(QT_HASH_qt5-location 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886) -set(QT_HASH_qt5-macextras 26ff64206d6b491271a2db8a6932b30fc8df6ff121ef272edca5e2ec61d98668e326102d529f9335eab98bb3e5e3261cb50db2b2f78f751226bb9d4aa84e499b) -set(QT_HASH_qt5-mqtt df91daf1accdf93d05bad33b9abb4a69f2b3fcd91f6dbcd71d6c74c21b0f0b2aeabc83f64aa5c149321b1a700cde3d81a4cbfc8fad7cdd8b0d8c0cc073299f82) -set(QT_HASH_qt5-multimedia 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668) -set(QT_HASH_qt5-networkauth 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654) -set(QT_HASH_qt5-purchasing 33ce166c6f4e626fef4cc17e902a5117225fa87799687e6c0956898bf80e04df4f3fa447b466e43c9fac58e879a7c9fd0e8c18006e8aa69f0e8762b258c81674) -set(QT_HASH_qt5-quickcontrols 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e) -set(QT_HASH_qt5-quickcontrols2 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb) -set(QT_HASH_qt5-remoteobjects a20699353269dd1d61ea9a45191aa6c438d597783c7461ee41c1bbde0d6043f2be138dd0f46744c1a3081c4098e66e78543f0397eb18b72aab99808de7855bd9) -set(QT_HASH_qt5-script ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9) -set(QT_HASH_qt5-scxml 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1) -set(QT_HASH_qt5-sensors c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2) -set(QT_HASH_qt5-serialbus af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87) -set(QT_HASH_qt5-serialport 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a) -set(QT_HASH_qt5-speech 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a) -set(QT_HASH_qt5-svg 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527) -set(QT_HASH_qt5-tools 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47) -set(QT_HASH_qt5-translations d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc) -set(QT_HASH_qt5-virtualkeyboard f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2) -set(QT_HASH_qt5-webchannel 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415) -set(QT_HASH_qt5-webengine d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c) -set(QT_HASH_qt5-webglplugin 01860ca3ce27630ca1a92eb6deb933959a3679fb579d4cb8a06884f51a672c355f6929355aa6d45f4c5d8ac026b4cecdc7a26d5b2e897ca75bb7a9331e2d3e0d) -set(QT_HASH_qt5-websockets a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea) -set(QT_HASH_qt5-webview 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030) -set(QT_HASH_qt5-x11extras eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133) -set(QT_HASH_qt5-xmlpatterns 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4) -set(QT_HASH_qt5-wayland 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89) -set(QT_HASH_qt5-winextras d0707f865552645e82a493265b142171f14c126bd99325471b5d94593c95763d606be89fcc72f74f3192446e024c9be904c7d95816b2dd8e8cc7cf9f34a02f77) - -if(QT_UPDATE_VERSION) - message(STATUS "Running Qt in automatic version port update mode!") - set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) - if("${PORT}" MATCHES "qt5-base") - foreach(_current_qt_port ${QT_PORT_LIST}) - set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/vcpkg.json") - file(READ ${_current_control} _control_contents) - #message(STATUS "Before: \n${_control_contents}") - string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") - string(REGEX REPLACE "\n \"port-version\": [0-9]+," "" _control_contents "${_control_contents}") - #message(STATUS "After: \n${_control_contents}") - file(WRITE ${_current_control} "${_control_contents}") - configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) - endforeach() - endif() -endif() diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index f686611f2f7264..2dff4f2ceff130 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -21,21 +21,6 @@ endif() list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) -if("latest" IN_LIST FEATURES) # latest = core currently - set(QT_BUILD_LATEST ON) - set(PATCHES - patches/Qt5BasicConfig.patch - patches/Qt5PluginTarget.patch - patches/create_cmake.patch - ) -else() - set(PATCHES - patches/Qt5BasicConfig.patch - patches/Qt5PluginTarget.patch - patches/create_cmake.patch - ) -endif() - set(WITH_PGSQL_PLUGIN OFF) if("postgresqlplugin" IN_LIST FEATURES) set(WITH_PGSQL_PLUGIN ON) @@ -84,9 +69,11 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the #the windows supplied gl.h header and the angle gl.h otherwise. - #CMake fixes - ${PATCHES} - patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt + # CMake fixes + patches/Qt5BasicConfig.patch + patches/Qt5PluginTarget.patch + patches/create_cmake.patch + patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt patches/limits_include.patch # Add missing includes to build with gcc 11 ) @@ -494,14 +481,6 @@ if(VCPKG_TARGET_IS_LINUX) file(WRITE "${_file}" "${_contents}") endif() -if(QT_BUILD_LATEST) - file(COPY - ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_hashes_latest.cmake - DESTINATION - ${CURRENT_PACKAGES_DIR}/share/qt5 - ) -endif() - vcpkg_fixup_pkgconfig() if(VCPKG_TARGET_IS_OSX) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 71b1b9488d70a6..5334144f5db566 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-base", - "version": "5.15.3", - "port-version": 3, + "version": "5.15.4", "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, @@ -41,7 +40,7 @@ ], "features": { "latest": { - "description": "Build latest qt version (5.15.2) instead of LTS (latest and LTS are currently the same)" + "description": "(deprecated)" }, "mysqlplugin": { "description": "Build the sql plugin for connecting to mysql databases", diff --git a/ports/qt5-charts/vcpkg.json b/ports/qt5-charts/vcpkg.json index adbd870105802e..b7535bb57cfb63 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-charts", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", "license": null, "dependencies": [ diff --git a/ports/qt5-connectivity/vcpkg.json b/ports/qt5-connectivity/vcpkg.json index 79a85b47a81503..cc3ed00899c786 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-connectivity", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", "license": null, "dependencies": [ diff --git a/ports/qt5-datavis3d/vcpkg.json b/ports/qt5-datavis3d/vcpkg.json index 1d551e375b8ada..3092cb9596c560 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-datavis3d", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", "license": null, "dependencies": [ diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index 7432d0f28489df..f01e38143e4fbf 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -2,5 +2,5 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH PATCHES limits_include.patch) if(NOT QT_UPDATE_VERSION) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/5.15.3/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") endif() diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index 2b0b4abcd6e9a2..dcd1966ac2a6be 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-declarative", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", "license": null, "dependencies": [ diff --git a/ports/qt5-doc/vcpkg.json b/ports/qt5-doc/vcpkg.json index a4f655ca179be9..330a79cebc0cdc 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-doc", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 doc Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index a1de0a3dda4e07..a37497d0bd61f0 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-gamepad", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", "license": null, "dependencies": [ diff --git a/ports/qt5-graphicaleffects/vcpkg.json b/ports/qt5-graphicaleffects/vcpkg.json index 8f6bc2d3fd330a..1ca41fbe49b7b6 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-graphicaleffects", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 GraphicalEffects Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index 208f381440cff2..7342d9ce9ce61c 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-imageformats", - "version": "5.15.3", - "port-version": 1, + "version": "5.15.4", "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index fd0b1e89160e7a..2d12a4a926e99b 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-location", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", "license": null, "dependencies": [ diff --git a/ports/qt5-macextras/vcpkg.json b/ports/qt5-macextras/vcpkg.json index fd4552617512ba..d9ada4bfdd991b 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-macextras", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", "license": null, "supports": "osx", diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json index 438929f9b38323..7b8c661dec52e5 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-mqtt", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 MQTT module.", "license": null, "dependencies": [ diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index 6b2e45a2cc23f5..bbd6b93a7076fe 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-multimedia", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", "license": null, "dependencies": [ diff --git a/ports/qt5-networkauth/vcpkg.json b/ports/qt5-networkauth/vcpkg.json index 4ecdeb1504cb80..65a7ff01731545 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-networkauth", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Network Authorization Module", "license": null, "dependencies": [ diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index f2e59ed2127914..933a0dd9cc85fd 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-purchasing", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols/vcpkg.json b/ports/qt5-quickcontrols/vcpkg.json index 711c177858633a..dac21339882dd3 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 QuickControls Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index a87e806c97ec86..88179828a6584c 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols2", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 QuickControls2 Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index 6b8738ff029b8f..cef6bad78fc009 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-remoteobjects", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.", "license": null, "dependencies": [ diff --git a/ports/qt5-script/vcpkg.json b/ports/qt5-script/vcpkg.json index 260a2c1527aa05..88254060e3d637 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-script", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Script Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index 5c7c5307267ee5..61fc9159dfd6bb 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-scxml", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", "license": null, "dependencies": [ diff --git a/ports/qt5-sensors/vcpkg.json b/ports/qt5-sensors/vcpkg.json index 1c7ef5d77a74b9..63fa677d348aa1 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-sensors", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", "license": null, "dependencies": [ diff --git a/ports/qt5-serialbus/vcpkg.json b/ports/qt5-serialbus/vcpkg.json index 9d0d3f38879f0c..f2cc2c5121bbb0 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialbus", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Serialbus Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json index 5d91085737bd73..49637d5d475131 100644 --- a/ports/qt5-serialport/vcpkg.json +++ b/ports/qt5-serialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialport", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", "license": null, "dependencies": [ diff --git a/ports/qt5-speech/vcpkg.json b/ports/qt5-speech/vcpkg.json index f9898c0f64d82a..3379fa84babb9f 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-speech", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Speech Module", "license": null, "dependencies": [ diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index f32761483611ab..2cf571f20f80ef 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-svg", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", "license": null, "dependencies": [ diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index df212fc048cd0f..cbb1026a3a7b99 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-tools", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", "license": null, "dependencies": [ diff --git a/ports/qt5-translations/vcpkg.json b/ports/qt5-translations/vcpkg.json index cfc49dc2cb5c4d..9f8c614d21cee8 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-translations", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 translations module", "license": null, "dependencies": [ diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index 07cd620afa6b26..4c1394ef98420b 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-virtualkeyboard", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", "license": null, "dependencies": [ diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index 76eb173096fefe..f7f56ecd782767 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-wayland", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 wayland Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index 1ba42163984175..14d04063e868f3 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webchannel", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.", "license": null, "dependencies": [ diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index f6349b28bf7832..c601cbf0231737 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-webengine", - "version": "5.15.3", - "port-version": 1, + "version": "5.15.4", "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index 518136852df14c..06dadeda5724ad 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webglplugin", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 webglplugin Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index 69e6af408a36a7..7820c57874fe6d 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-websockets", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", "license": null, "dependencies": [ diff --git a/ports/qt5-webview/vcpkg.json b/ports/qt5-webview/vcpkg.json index 8b8c4dbd4fd74d..0fc59fd56e3886 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webview", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", "license": null, "dependencies": [ diff --git a/ports/qt5-winextras/vcpkg.json b/ports/qt5-winextras/vcpkg.json index 3ed0e5fdf26a4b..ff8c8cd6b0c9fc 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-winextras", - "version": "5.15.3", - "port-version": 1, + "version": "5.15.4", "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", "license": null, "supports": "windows", diff --git a/ports/qt5-x11extras/vcpkg.json b/ports/qt5-x11extras/vcpkg.json index 7660c0c15a3076..826f2694c2a618 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-x11extras", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 x11extras Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index 2ceb26459e0f31..d2b80778620842 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-xmlpatterns", - "version": "5.15.3", + "version": "5.15.4", "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", "license": null, "dependencies": [ diff --git a/ports/qt5/vcpkg.json b/ports/qt5/vcpkg.json index fdffcde2e97d4a..62fde57198bbb9 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5", - "version": "5.15.3", - "port-version": 1, + "version": "5.15.4", "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", "license": null, @@ -193,16 +192,7 @@ ] }, "latest": { - "description": "Build latest qt version (5.15.2) instead of LTS (Currently latest==LTS)", - "dependencies": [ - { - "name": "qt5-base", - "default-features": false, - "features": [ - "latest" - ] - } - ] + "description": "(deprecated)" }, "location": { "description": [], diff --git a/versions/baseline.json b/versions/baseline.json index 017900024c58e9..c045b6928cdb18 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5685,67 +5685,67 @@ "port-version": 0 }, "qt5": { - "baseline": "5.15.3", - "port-version": 1 + "baseline": "5.15.4", + "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-base": { - "baseline": "5.15.3", - "port-version": 3 + "baseline": "5.15.4", + "port-version": 0 }, "qt5-canvas3d": { "baseline": "0", "port-version": 1 }, "qt5-charts": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.3", - "port-version": 1 + "baseline": "5.15.4", + "port-version": 0 }, "qt5-location": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-modularscripts": { @@ -5753,107 +5753,107 @@ "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-script": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.3", - "port-version": 1 + "baseline": "5.15.4", + "port-version": 0 }, "qt5-webglplugin": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.3", - "port-version": 1 + "baseline": "5.15.4", + "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.3", + "baseline": "5.15.4", "port-version": 0 }, "qt5compat": { diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index f1bdb8731854c2..4a1b650fa7e9e0 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad54e2c1049e5ec47c24815f9b1a1039588c4017", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "5538f55e5cb938c965447c3a5ce67b243f5d97f1", "version": "5.15.3", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index 35044981c9702d..7216c377631e60 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d849c962c3692fa2177966c6ac225eefe7306001", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "ebae9d515816c48a9bbb2550acd02d02bfcfddc7", "version": "5.15.3", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index 1c72b66eac7dce..2af8e96e5d1af1 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c014160f25591285ae1b0274e7d4453a152e9fed", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "b0e32e6213649f8645b05c868b81dc3c982bfb30", "version": "5.15.3", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 324f49b931495d..4ba8768956ab82 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64b643c8e9f807cdfdba86d59f39e1b19e747d62", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "7518c5eeb84d3bbfaaa88cb19795b693fd0923f7", "version": "5.15.3", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index 4a69f2305d4f4e..6ccc4b9a331115 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ab20682c7d2ce50527abe1e4a41830a57635f65", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "a4fa404a600c749529faae7807d2f24f5a6f8673", "version": "5.15.3", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 9e4118aede8013..5fe8e3d0dc6513 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1388a9a144fb9766f4f8a6a0e6bc5a0224b1487e", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "8929178e2d3f0d544b21ed4bd1ad635e81fdefc5", "version": "5.15.3", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index db45fe7b362010..69e522992f55d9 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e87b00cc75098f24a1b23bbb567996d0bc2ac4ae", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "8300805371f9fb2d98a2a2ace37e9e93149483e7", "version": "5.15.3", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index 734ecb9697232d..9810bf5a4ca11d 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0afa58af62ea8090c207a56f417280b856aced78", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "51388bc681cd6616f0d2ecb29b1f3901b2e66613", "version": "5.15.3", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index df590ce00b568a..75d4b1c23df5fc 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b3cf5737faae5d92d5fd379da81a63257ca13ab", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "5cecc56a1a87cf86f87dcde5bc650f8de1e53b60", "version": "5.15.3", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index d937d0954bb827..13a6803c7b4a4a 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95df0183bac4852f40548ff3b973ad15535f184f", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "53e4e7090cc36a827b518f376c485aacade15d37", "version": "5.15.3", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index fc40fa1637df02..b0a2a8a70810ff 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac4547abb371e952a7f87e72a4c8db590ec08345", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "9bb49ed2d96c2ad0d18a0508f2c170a0ef0a51cf", "version": "5.15.3", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 30012615502661..9f460f7ebada0a 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e0f8ff607322745113d3b7de494b81a54173320", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "6035880bd5e6bd0954d738de1bb2e2b79f66953c", "version": "5.15.3", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index a3db41f5aea654..f79891013dc026 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50e02b320624cc5b4be62d2b209d4d0abe1e05fb", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "374ad16cce9ae4eee7c91f701a72c21ede178794", "version": "5.15.3", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index b342d08f982f30..be06273fcc2657 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e6ba9a1b53eb509b3ffc5ae091b51464e94aa94", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "35696a5675057de9b50f3bbb2215b3f0879d3261", "version": "5.15.3", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index 6d45e47f213b52..58155c7e482782 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f29a8cf672c3aad83d34ee1dd6c9e659cfd4f588", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "c8622cf28b900e34394e7c67ee272a0f0ae1a945", "version": "5.15.3", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index 9248263492824e..3eb5a89ce36062 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa127acc620f472f3ba8726783ccfb44d93d95af", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "8336d9a40e956b24f846b25c7b017cfac417f1d8", "version": "5.15.3", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index 71860f30e08a19..79bf848fcc647d 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b50130d7dcfb78270c759b6ad397ccdb4eb42f4c", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "fed32ceb703389b16ddbf6843597358c92ff27e2", "version": "5.15.3", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index e95c72dd4816f1..aaef8d54251856 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86878fc58b27e1f6f2e8cad31f27aadf3bf77fb2", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "c1507aeba5c46c35cccbf662602be9bcfe6d4bc1", "version": "5.15.3", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index cf1e69cbdd78b4..0e138158ffb45b 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c24b1552fada859bf5061ab7c004ea12edca056", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "0023d4eae57568295996c372c262c746fce54cd1", "version": "5.15.3", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index c499391c83d1f0..700a1d7f33dec3 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e491e24d5c90d6de8efed680903b4f37445ddc0", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "da9577fcd83a97070fbb31e9723645e1a353e780", "version": "5.15.3", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index f51c7a4acf2412..2545c30016f666 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d41a95abf4f754152c887c40057c54c4ffcacc1", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "cc4b1cc8e132e4c53c32401e8eaea14140f39906", "version": "5.15.3", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index 491fdc3d47c6da..e2cf61cf4336d1 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bccc52e9aa61f98d1d15e818dd67652012275a9", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "450d4c10bbd324c74ddca59e7d16c6cb215aa077", "version": "5.15.3", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index 8ed279f7efc002..d35308ac1b09fb 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "079580ac857fbceeecbcdab6677ff32cb7f78858", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "894ab2a120cd88e276b795234c66715ac787e4ab", "version": "5.15.3", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index 8604dd80b1fb23..ab64c62c33106a 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b395d40c215c61a382c9dd411675bb6b1eb5bc1", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "d7faff943ee0ed0c4be86730ded240b322d2b829", "version": "5.15.3", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index 70492fed04eede..60a62eb63f6570 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a6f465b80e92aa05547bf139fa964e8488ab154", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "e16c9b0f5f3bb86c3fe988f049069901ae578d0e", "version": "5.15.3", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index dbe0967192778b..ecd571b113929a 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b93f29b611b30ac02780e3136af4f4699074446", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "cc7ba67e09a801eca90691b7c7db4baf43369a09", "version": "5.15.3", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 07c2e5ae9ac37b..edbc72937968ab 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9b3f529af35b50682be46af4b5937b1425f60da", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "bf21b1bb4dc124cba22d170e77ceb78315ab7de2", "version": "5.15.3", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index f57f54bc12f860..8711f2aa18b83b 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3052785787495ab14b0fc4b25aa480d18a906bb4", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "6a43bcf48e884abdd82502f747342962e2a2c4b8", "version": "5.15.3", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index a5deb8aa64418b..9549f5ac035c1a 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8a761a89f1f3aabb2c3e990b40cc69d0b7ea543", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "0f3066692eacc724dde9d8f17d4cb67f019ecc75", "version": "5.15.3", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index b2f540c9e3c00d..5d1a95590ef051 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19e19e3a353b093bfbc1ffb94beeea19f94c6a00", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "4a0df59e14f9c24d2584e7f0424424f50eb4c9f7", "version": "5.15.3", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index 81eb34974bcdb9..8d572c1a3acca0 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96468c13c2c783e1a63d16877de3c88228ca3f36", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "8c8514424cbc1c746ec7149ec383fbdd5174a0e4", "version": "5.15.3", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 77179d15c5c29e..65800d67c13445 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b9afbc817fbb9ea46c53398b1db93331792913f", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "4e8f0ffa97c7f3d1dfe627808bcafc4d4a77d3e2", "version": "5.15.3", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index 28d7cc5a6d655a..f49964a884ef0e 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "214b6e50c9919b3aca6b9d7b18a49707a6f78cc8", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "cd0f8bbb8bb85bc208907a24c82fe9db0b902922", "version": "5.15.3", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 159af06521d1b0..229b7b9fad75da 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f210713d4af04f690a79188949467c8ba9b2597e", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "533cd8995acbdf2a8cc24a96da7515777dfe7c38", "version": "5.15.3", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index 0c8b2fb9e1e264..599d1088094c0e 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "618744f2944d1d1d8acfc4bf018a11306f515316", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "3d081435832cdf86757d280e7fbf1bf2b5780199", "version": "5.15.3", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index ec5af0ba63cc8b..bb6fde7a60e162 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c2886a76834ca95953a47fcf460fd14970c10a4", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "c0380195d2431d25311a4fa542d3437d05f339da", "version": "5.15.3", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index d1dac375d4f01b..4db8858337ab2b 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6f90b47550c95897af8ca9a2508d54d918bad6e", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "bb6129ae1fa4b8945885ca352eca1bde34e1a345", "version": "5.15.3", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 144d13db8ad687..da98f2ca10aa78 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "030018d2b9c2466e483af9dd86fea69ae46f72ee", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "5a7881475902048fa453bff04c347caa7e9a615b", "version": "5.15.3", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index 2a5fc9c4420005..d9b65543b79940 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "446335809ddbe1ca22e25789061b4fbe7c931583", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "5321c86715348b879cee60dc4323c2e1d8fc9fe9", "version": "5.15.3", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index 27f8c21d64a568..d89596f4e3dbb5 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1452531e0230ac6fc5e7a16f4f7c43fc167c747b", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "b87833daca4ff1492a4890d0f73bcbb416dfc615", "version": "5.15.3", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index 2f4ee258a2d281..23a3f53adef2b8 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15bce9bdfce0d88dafafa166be4f56c2c4883877", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "979ef9acc281793cef4f43f1e1eaed177ed9b408", "version": "5.15.3", From 38910e67f310b48ef90509644a1d2b9df21ae5a1 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 14 May 2022 07:52:17 +0800 Subject: [PATCH 253/383] Add feature JSON_Diagnostics (#24672) --- ports/nlohmann-json/portfile.cmake | 11 ++++++++--- ports/nlohmann-json/vcpkg.json | 10 ++++++++-- versions/baseline.json | 2 +- versions/n-/nlohmann-json.json | 5 +++++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index 19343c426146df..81e434b0d423d9 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -10,9 +10,14 @@ if(NOT DEFINED nlohmann-json_IMPLICIT_CONVERSIONS) set(nlohmann-json_IMPLICIT_CONVERSIONS ON) endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "diagnostics" JSON_Diagnostics +) + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} -DJSON_Install=ON -DJSON_MultipleHeaders=ON -DJSON_BuildTests=OFF @@ -27,7 +32,7 @@ vcpkg_replace_string( "{_IMPORT_PREFIX}/nlohmann_json.natvis" "{_IMPORT_PREFIX}/share/nlohmann_json/nlohmann_json.natvis" ) -if(EXISTS ${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis) +if(EXISTS "${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis") file(RENAME "${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis" "${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_json.natvis" diff --git a/ports/nlohmann-json/vcpkg.json b/ports/nlohmann-json/vcpkg.json index bccb3d74bc6610..ac382db2fc2b6b 100644 --- a/ports/nlohmann-json/vcpkg.json +++ b/ports/nlohmann-json/vcpkg.json @@ -1,9 +1,10 @@ { "name": "nlohmann-json", "version-semver": "3.10.5", - "port-version": 2, + "port-version": 3, "description": "JSON for Modern C++", "homepage": "https://github.com/nlohmann/json", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", @@ -13,5 +14,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "diagnostics": { + "description": "Build json_diagnostics" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index c045b6928cdb18..f882081357fbe9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4862,7 +4862,7 @@ }, "nlohmann-json": { "baseline": "3.10.5", - "port-version": 2 + "port-version": 3 }, "nlopt": { "baseline": "2.7.1", diff --git a/versions/n-/nlohmann-json.json b/versions/n-/nlohmann-json.json index 2b6fa1d436915a..b476b41881b4f9 100644 --- a/versions/n-/nlohmann-json.json +++ b/versions/n-/nlohmann-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91f188e19b106e7d316de593e98f3319f8f5ec25", + "version-semver": "3.10.5", + "port-version": 3 + }, { "git-tree": "becf6a86f7e28342840fc807840c68b133c6fad8", "version-semver": "3.10.5", From 4491ca9143fded469c0f97bf1de3ab9c101c98dc Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Sat, 14 May 2022 07:52:53 +0800 Subject: [PATCH 254/383] [entt] Install natvis files (#24675) * [entt] Install natvis files * x-add-version Co-authored-by: Lily Wang --- ports/entt/portfile.cmake | 11 +++++++---- ports/entt/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/entt.json | 5 +++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index d74c5b70b89688..ab578ea3808d07 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -15,7 +15,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DENTT_BUILD_TESTING=OFF @@ -23,13 +23,16 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() vcpkg_cmake_config_fixup(CONFIG_PATH lib/EnTT/cmake) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Install natvis files +file(INSTALL "${SOURCE_PATH}/natvis/entt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/natvis") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/entt/vcpkg.json b/ports/entt/vcpkg.json index d9311239eee71e..4bec827d48773f 100644 --- a/ports/entt/vcpkg.json +++ b/ports/entt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "entt", "version": "3.10.1", + "port-version": 1, "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", "homepage": "https://github.com/skypjack/entt", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index f882081357fbe9..f6e30e95083c7a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2086,7 +2086,7 @@ }, "entt": { "baseline": "3.10.1", - "port-version": 0 + "port-version": 1 }, "epsilon": { "baseline": "0.9.2", diff --git a/versions/e-/entt.json b/versions/e-/entt.json index 0e6c75a8fcf044..5fce9683b0bf7e 100644 --- a/versions/e-/entt.json +++ b/versions/e-/entt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac258cd82d39f21b9a55ec179f02517f29802cdb", + "version": "3.10.1", + "port-version": 1 + }, { "git-tree": "f2c6e6ca727e3e843f0eb07544c81305175dc973", "version": "3.10.1", From 0cf5b4305ba811d069d3ce328261eeb54bf61c3a Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Sat, 14 May 2022 01:53:24 +0200 Subject: [PATCH 255/383] [pkgconf] Remove docs (#24688) * [pkgconf] Remove docs * version * license * version --- ports/pkgconf/portfile.cmake | 4 +++- ports/pkgconf/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/pkgconf.json | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/pkgconf/portfile.cmake b/ports/pkgconf/portfile.cmake index 7c5ccb242b3bac..0f269dc13b702e 100644 --- a/ports/pkgconf/portfile.cmake +++ b/ports/pkgconf/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" NO_PKG_CONFIG OPTIONS -Dtests=false - ) +) set(systemsuffix "") set(architectureprefix "") @@ -69,6 +69,8 @@ vcpkg_fixup_pkgconfig(SKIP_CHECK) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pkgconf/libpkgconf/libpkgconf-api.h" "#if defined(PKGCONFIG_IS_STATIC)" "#if 1") diff --git a/ports/pkgconf/vcpkg.json b/ports/pkgconf/vcpkg.json index 8ea4e30e7598c8..e8beeb95ba340b 100644 --- a/ports/pkgconf/vcpkg.json +++ b/ports/pkgconf/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pkgconf", "version": "1.8.0", - "port-version": 2, + "port-version": 3, "description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.", "homepage": "https://github.com/pkgconf/pkgconf", + "license": null, "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index f6e30e95083c7a..be1589060dae56 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5434,7 +5434,7 @@ }, "pkgconf": { "baseline": "1.8.0", - "port-version": 2 + "port-version": 3 }, "platform-folders": { "baseline": "4.1.0", diff --git a/versions/p-/pkgconf.json b/versions/p-/pkgconf.json index 87f63902cf5e65..d602da96ddaf51 100644 --- a/versions/p-/pkgconf.json +++ b/versions/p-/pkgconf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0408f161d8a23907635840add678d5946024d09", + "version": "1.8.0", + "port-version": 3 + }, { "git-tree": "5b599bd7dbbbc7837f7dbcf1b111478da076e2a4", "version": "1.8.0", From 5e7cbdceacd2b3cb85e057963fdb605136805bd3 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 16 May 2022 12:21:02 +0800 Subject: [PATCH 256/383] [sdl2] update to 2.0.22 (#24694) * [sdl2] update to 2.0.22 * update version Co-authored-by: FrankXie --- ...-creation-of-pkg-cfg-file-on-windows.patch | 22 ++++----- ports/sdl2/0005-Fix-uwp-joystick.patch | 25 ----------- ports/sdl2/0006-Update-SDL_sysurl.cpp.patch | 15 ------- ...pten-declaration-after-statement-err.patch | 45 ------------------- ports/sdl2/portfile.cmake | 7 +-- ports/sdl2/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/s-/sdl2.json | 5 +++ 8 files changed, 23 insertions(+), 104 deletions(-) delete mode 100644 ports/sdl2/0005-Fix-uwp-joystick.patch delete mode 100644 ports/sdl2/0006-Update-SDL_sysurl.cpp.patch delete mode 100644 ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch diff --git a/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch b/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch index 269f8f5ef73906..967b433aa67b53 100644 --- a/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch +++ b/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch @@ -1,14 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 644715a..6eacfb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2555,7 +2555,6 @@ endif() +@@ -2670,8 +2670,6 @@ endif() configure_file("${SDL2_SOURCE_DIR}/include/SDL_revision.h.cmake" "${SDL2_BINARY_DIR}/include/SDL_revision.h") -if(NOT WINDOWS OR CYGWIN OR MINGW) - +- set(prefix ${CMAKE_INSTALL_PREFIX}) -@@ -2590,7 +2590,7 @@ Libs.private:") + set(exec_prefix "\${prefix}") +@@ -2705,7 +2703,7 @@ Libs.private:") set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS}) listtostrrev(SDL_LIBS _SDL_LIBS) set(SDL_LIBS ${_SDL_LIBS}) @@ -17,7 +20,7 @@ listtostr(EXTRA_LIBS _EXTRA_LIBS "-l") set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS}) list(REMOVE_DUPLICATES SDL_STATIC_LIBS) -@@ -2611,7 +2611,6 @@ Libs.private:") +@@ -2726,7 +2724,6 @@ Libs.private:") "${SDL2_BINARY_DIR}/sdl2-config" @ONLY) configure_file("${SDL2_SOURCE_DIR}/SDL2.spec.in" "${SDL2_BINARY_DIR}/SDL2.spec" @ONLY) @@ -25,12 +28,11 @@ macro(check_add_debug_flag FLAG SUFFIX) check_c_compiler_flag(${FLAG} HAS_C_FLAG_${SUFFIX}) -@@ -2956,6 +2956,7 @@ if(NOT (WINDOWS OR CYGWIN) OR MINGW) - # TODO: what about the .spec file? Is it only needed for RPM creation? - install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/aclocal") +@@ -3075,6 +3072,7 @@ if(NOT SDL2_DISABLE_INSTALL) + # TODO: what about the .spec file? Is it only needed for RPM creation? + install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/aclocal") + endif() ++ install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig") endif() -+install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig") ##### Uninstall target ##### - - \ No newline at end of file diff --git a/ports/sdl2/0005-Fix-uwp-joystick.patch b/ports/sdl2/0005-Fix-uwp-joystick.patch deleted file mode 100644 index eb67d882ddfb69..00000000000000 --- a/ports/sdl2/0005-Fix-uwp-joystick.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1755,8 +1755,10 @@ elseif(WINDOWS) - list(APPEND EXTRA_LIBS dinput8) - endif() - if(HAVE_XINPUT_H) -- set(SDL_JOYSTICK_XINPUT 1) -- set(HAVE_XINPUT TRUE) -+ if(NOT WINDOWS_STORE) -+ set(SDL_JOYSTICK_XINPUT 1) -+ set(HAVE_XINPUT TRUE) -+ endif() - if(HAVE_WINDOWS_GAMING_INPUT_H) - set(SDL_JOYSTICK_WGI 1) - endif() -@@ -1764,7 +1766,7 @@ elseif(WINDOWS) - set(HAVE_SDL_JOYSTICK TRUE) - - if(SDL_HAPTIC) -- if(HAVE_DINPUT_H OR HAVE_XINPUT_H) -+ if((HAVE_DINPUT_H OR HAVE_XINPUT_H) AND NOT WINDOWS_STORE) - file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/windows/*.c) - if(HAVE_DINPUT_H) - set(SDL_HAPTIC_DINPUT 1) - diff --git a/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch b/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch deleted file mode 100644 index 84a58f31838c27..00000000000000 --- a/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/misc/winrt/SDL_sysurl.cpp -+++ b/src/misc/winrt/SDL_sysurl.cpp -@@ -18,10 +18,9 @@ - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - */ --#include - --#include "../../core/windows/SDL_windows.h" - #include "../SDL_sysurl.h" -+#include "../../core/windows/SDL_windows.h" - - int - SDL_SYS_OpenURL(const char *url) - diff --git a/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch b/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch deleted file mode 100644 index 39665a9b84cd3f..00000000000000 --- a/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 99af3281ee11ff947a82c561c2a275627ccea90c Mon Sep 17 00:00:00 2001 -From: Charlie Birks -Date: Sat, 22 Jan 2022 12:27:43 +0000 -Subject: [PATCH] timer: Fix Emscripten declaration-after-statement error - ---- - src/timer/unix/SDL_systimer.c | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/src/timer/unix/SDL_systimer.c b/src/timer/unix/SDL_systimer.c -index 57fdab09c..2cf26764c 100644 ---- a/src/timer/unix/SDL_systimer.c -+++ b/src/timer/unix/SDL_systimer.c -@@ -187,13 +187,6 @@ SDL_GetPerformanceFrequency(void) - void - SDL_Delay(Uint32 ms) - { --#ifdef __EMSCRIPTEN__ -- if (emscripten_has_asyncify() && SDL_GetHintBoolean(SDL_HINT_EMSCRIPTEN_ASYNCIFY, SDL_TRUE)) { -- /* pseudo-synchronous pause, used directly or through e.g. SDL_WaitEvent */ -- emscripten_sleep(ms); -- return; -- } --#endif - int was_error; - - #if HAVE_NANOSLEEP -@@ -203,6 +196,14 @@ SDL_Delay(Uint32 ms) - Uint64 then, now, elapsed; - #endif - -+#ifdef __EMSCRIPTEN__ -+ if (emscripten_has_asyncify() && SDL_GetHintBoolean(SDL_HINT_EMSCRIPTEN_ASYNCIFY, SDL_TRUE)) { -+ /* pseudo-synchronous pause, used directly or through e.g. SDL_WaitEvent */ -+ emscripten_sleep(ms); -+ return; -+ } -+#endif -+ - /* Set the timeout interval */ - #if HAVE_NANOSLEEP - elapsed.tv_sec = ms / 1000; --- -2.35.1 - diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index a69dcdaaace424..3eaca1dec0453c 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -2,17 +2,14 @@ set(SDL2_VERSION 2.0.20) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL - REF release-2.0.20 - SHA512 f8558057a06d4507190b369b2067aee55c22ab796b90bb663fbc36218e66ec14e2feb0ecd55f9b798bfd24fc94e2b4cb93eddc52a59f0709d6cb0ebdb6d9309b + REF 53dea9830964eee8b5c2a7ee0a65d6e268dc78a1 #vrelease-2.0.22 + SHA512 809ac18aeb739cfc6558dc11a7b3abbdad62a8e651ae2bfc157f26947b0df063a34c117ea8bd003428b5618fa6ce21a655fda073f1ef15aa34bc4a442a578523 HEAD_REF master PATCHES 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch 0002-sdl2-skip-ibus-on-linux.patch 0003-sdl2-disable-sdlmain-target-search-on-uwp.patch 0004-Define-crt-macros.patch - 0005-Fix-uwp-joystick.patch - 0006-Update-SDL_sysurl.cpp.patch - 0007-timer-Fix-Emscripten-declaration-after-statement-err.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 95f045e65b20a1..3e7fce247a30b5 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,9 +1,9 @@ { "name": "sdl2", - "version": "2.0.20", - "port-version": 3, + "version": "2.0.22", "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index be1589060dae56..e1b624d5d9787a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6393,8 +6393,8 @@ "port-version": 4 }, "sdl2": { - "baseline": "2.0.20", - "port-version": 3 + "baseline": "2.0.22", + "port-version": 0 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index bbabe4f468583a..17383fd1719fc1 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d875fe2feac0480f61fcf890136e045c12429f1", + "version": "2.0.22", + "port-version": 0 + }, { "git-tree": "24fc8b7ae34a3a363c76820d4ca50f715648a0b2", "version": "2.0.20", From ccf682927e645f91218a94c95faecbc875989f99 Mon Sep 17 00:00:00 2001 From: Li Zeyang Date: Tue, 17 May 2022 02:39:42 +0800 Subject: [PATCH 257/383] [rttr] static compile fix (#23013) * updated libunifex version * remove comment * run x-add-versions --all * Update ports/libunifex/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * rerun x-add-version libunifex * Update versions/l-/libunifex.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update libunifex to 12-07 * x-add-version * libunifex port update force cpp20 as cpp17 build doesn't work with msvc. added a compile fix for externConstexpr and removed warnings with /EHsc * Update libunifex.json version update * Update fix-compile-error.patch relax clang warnings * Update libunifex.json git x-add-version libunifex * remove unused * x-add-versions * remove old version log * fixed static compile option * bumped port version * run x-add-version --all * Hook up RTTR's actual build settings. * Add license. * Remove ci.baseline skips. * Put ci.baseline.txt skips back with a comment. * Be less pessimistic in cmake config handling, fix typo, and add indents. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/rttr/portfile.cmake | 66 +++++++++++++++++++++------------------ ports/rttr/vcpkg.json | 16 ++++++++-- scripts/ci.baseline.txt | 4 +++ versions/baseline.json | 2 +- versions/r-/rttr.json | 5 +++ 5 files changed, 58 insertions(+), 35 deletions(-) diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake index 56700768b9377f..9b8f01ca08162a 100644 --- a/ports/rttr/portfile.cmake +++ b/ports/rttr/portfile.cmake @@ -10,44 +10,48 @@ vcpkg_from_github( remove-owner-read-perms.patch ) -#Handle static lib -set(BUILD_STATIC_LIB OFF) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILD_STATIC_LIB ON) +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") + set(BUILD_STATIC ON) + set(BUILD_RTTR_DYNAMIC OFF) + set(BUILD_WITH_STATIC_RUNTIME_LIBS OFF) +elseif("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") + set(BUILD_STATIC OFF) + set(BUILD_RTTR_DYNAMIC OFF) + set(BUILD_WITH_STATIC_RUNTIME_LIBS ON) +elseif("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "dynamic") + set(BUILD_STATIC OFF) + set(BUILD_RTTR_DYNAMIC ON) + set(BUILD_WITH_STATIC_RUNTIME_LIBS OFF) else() - set(BUILD_STATIC_LIB OFF) + message(FATAL_ERROR "rttr's build system does not support this configuration: VCPKG_LIBRARY_LINKAGE: ${VCPKG_LIBRARY_LINKAGE} VCPKG_CRT_LINKAGE: ${VCPKG_CRT_LINKAGE}") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_BENCHMARKS=OFF - -DBUILD_UNIT_TESTS=OFF - -DBUILD_STATIC=${BUILD_STATIC_LIB} + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_BENCHMARKS=OFF + -DBUILD_UNIT_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_DOCUMENTATION=OFF + -DBUILD_STATIC=${BUILD_STATIC} + -DBUILD_RTTR_DYNAMIC=${BUILD_RTTR_DYNAMIC} + -DBUILD_WITH_STATIC_RUNTIME_LIBS=${BUILD_WITH_STATIC_RUNTIME_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - vcpkg_fixup_cmake_targets(CONFIG_PATH share/rttr/cmake) -elseif(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - message(FATAL_ERROR "RTTR does not support this platform") -endif() - -#Handle static lib -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + vcpkg_cmake_config_fixup(CONFIG_PATH share/rttr/cmake) endif() -#Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/README.md - ${CURRENT_PACKAGES_DIR}/debug/LICENSE.txt - ${CURRENT_PACKAGES_DIR}/LICENSE.txt - ${CURRENT_PACKAGES_DIR}/README.md + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/README.md" + "${CURRENT_PACKAGES_DIR}/debug/LICENSE.txt" + "${CURRENT_PACKAGES_DIR}/LICENSE.txt" + "${CURRENT_PACKAGES_DIR}/README.md" ) diff --git a/ports/rttr/vcpkg.json b/ports/rttr/vcpkg.json index fc7ff33bca8daa..d1d1389cd5b042 100644 --- a/ports/rttr/vcpkg.json +++ b/ports/rttr/vcpkg.json @@ -1,10 +1,20 @@ { "name": "rttr", - "version-string": "0.9.6", - "port-version": 3, + "version": "0.9.6", + "port-version": 4, "description": "an easy and intuitive way to use reflection in C++", "homepage": "https://github.com/rttrorg/rttr", + "license": "MIT", + "supports": "(static & staticcrt) | (!static & staticcrt) | (!static & !staticcrt)", "dependencies": [ - "rapidjson" + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 09583f6c2528cf..064ab1b704d053 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1024,6 +1024,10 @@ rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail rtlsdr:x64-linux=fail rtlsdr:x64-osx=fail + +# rttr's build fails in CI with +# D:\buildtrees\rttr\src\v0.9.6-9229bdee1f.clean\src\rttr\detail\library\library_win.cpp(236): error C3861: 'LoadLibraryW': identifier not found +# .... but it succeeds when I try building it locally. rttr:arm-uwp=fail rttr:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index e1b624d5d9787a..b1b367af03422b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6290,7 +6290,7 @@ }, "rttr": { "baseline": "0.9.6", - "port-version": 3 + "port-version": 4 }, "rxcpp": { "baseline": "4.1.0", diff --git a/versions/r-/rttr.json b/versions/r-/rttr.json index ca08fdf0bc6108..a3dccce7947609 100644 --- a/versions/r-/rttr.json +++ b/versions/r-/rttr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14ae0cb613a9536333e7463b862276ad0e2e89ee", + "version": "0.9.6", + "port-version": 4 + }, { "git-tree": "ce9e17ebafad158458c38697b246601e00b61ae8", "version-string": "0.9.6", From 4a2bc18713413341a4a65606e2bf1527df95f45f Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Mon, 16 May 2022 21:41:53 +0300 Subject: [PATCH 258/383] [llvm] update to v14.0.3 [halide] update to v14.0.0 [mesa] update to 22.0.2 (#23734) * [llvm] update to v14.0.0 * [llvm] BOLT sub-project support * [llvm] fix tools install paths * [halide] update to v14.0.0 * update versions * [vcpkg-get-python-packages] fix "LOGNAME should be specified" warning * [mesa] update to v22.0.1 * update versions * update versions * update version * [mesa] update to 22.0.2 * update version * [mesa] update patches * update version * [llvm] update to v14.0.3 * update version * [llvm] remove depricated feature * [llvm] allow to build OpenMP on Windows and remove incomplete cross-compile support * update version * [llvm] use vcpkg_cmake_get_vars * [llvm/openmp] install CMake file in share/openmp * [llvm] add vcpkg-cmake-get-vars dependency and slip post build check if OpenMP is enabled * update version --- ports/halide/portfile.cmake | 6 +- ports/halide/vcpkg.json | 2 +- ports/llvm/0002-fix-install-paths.patch | 109 +- ports/llvm/0003-fix-openmp-debug.patch | 25 - ports/llvm/0005-fix-tools-path.patch | 2 +- .../0007-fix-compiler-rt-install-path.patch | 12 +- ports/llvm/0009-fix-tools-install-path.patch | 199 +- ports/llvm/0010-fix-libffi.patch | 24 +- ports/llvm/0011-fix-install-bolt.patch | 22 + ports/llvm/0011-fix-libxml2.patch | 34 - ports/llvm/portfile.cmake | 110 +- ports/llvm/vcpkg.json | 30 +- ports/mesa/clang.patch | 52 + ports/mesa/clover.patch | 63 + ports/mesa/d3d10sw.patch | 383 -- ports/mesa/def-fixes.patch | 3571 +++++++++++++++++ ports/mesa/portfile.cmake | 43 +- ports/mesa/radv-msvc-llvm13-2.patch | 14 - ports/mesa/swr-llvm13.patch | 334 -- ports/mesa/swr-msvc-2.patch | 57 - ports/mesa/swravx512-post-static-link.patch | 22 - ports/mesa/vcpkg.json | 3 +- scripts/test_ports/vcpkg-ci-llvm/vcpkg.json | 2 + versions/baseline.json | 10 +- versions/h-/halide.json | 5 + versions/l-/llvm.json | 5 + versions/m-/mesa.json | 5 + 27 files changed, 4020 insertions(+), 1124 deletions(-) delete mode 100644 ports/llvm/0003-fix-openmp-debug.patch create mode 100644 ports/llvm/0011-fix-install-bolt.patch delete mode 100644 ports/llvm/0011-fix-libxml2.patch create mode 100644 ports/mesa/clang.patch create mode 100644 ports/mesa/clover.patch delete mode 100644 ports/mesa/d3d10sw.patch create mode 100644 ports/mesa/def-fixes.patch delete mode 100644 ports/mesa/radv-msvc-llvm13-2.patch delete mode 100644 ports/mesa/swr-llvm13.patch delete mode 100644 ports/mesa/swr-msvc-2.patch delete mode 100644 ports/mesa/swravx512-post-static-link.patch diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake index 1b7dea6d572c5f..c5fcb86a119c7a 100644 --- a/ports/halide/portfile.cmake +++ b/ports/halide/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(HALIDE_VERSION_TAG v13.0.2) +set(HALIDE_VERSION_TAG v14.0.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO halide/Halide REF ${HALIDE_VERSION_TAG} - SHA512 d2b19934ff0d759d302428f61e4075306f79c29cc1cd8802dc1ac5f325434034e0f430c435610e58f862b87cc8ef34ddcc3d0588947eeb8e1387d0bf31b9c008 - HEAD_REF release/13.x + SHA512 c7b1186cca545f30d038f1e9bb28ca7231023869d191c50722213da4c7e9adfd4a53129fe395cd7938cb7cb3fb1bf80f9cd3b4b8473a0246f15b9ad8d3e40fe2 + HEAD_REF release/14.x ) vcpkg_check_features( diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json index 4e54393fe62d91..d24aa98e05dab4 100644 --- a/ports/halide/vcpkg.json +++ b/ports/halide/vcpkg.json @@ -1,6 +1,6 @@ { "name": "halide", - "version": "13.0.2", + "version": "14.0.0", "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.", "homepage": "https://github.com/halide/Halide", "supports": "!uwp", diff --git a/ports/llvm/0002-fix-install-paths.patch b/ports/llvm/0002-fix-install-paths.patch index 3582bcbfd2cc61..c5a2885f429629 100644 --- a/ports/llvm/0002-fix-install-paths.patch +++ b/ports/llvm/0002-fix-install-paths.patch @@ -1,18 +1,20 @@ - clang/cmake/modules/CMakeLists.txt | 4 ++-- - flang/cmake/modules/CMakeLists.txt | 4 ++-- - lld/cmake/modules/CMakeLists.txt | 4 ++-- - llvm/cmake/modules/AddLLVM.cmake | 2 +- - llvm/cmake/modules/CMakeLists.txt | 2 +- - mlir/cmake/modules/CMakeLists.txt | 4 ++-- - polly/cmake/CMakeLists.txt | 4 ++-- - pstl/CMakeLists.txt | 4 ++-- - 8 files changed, 14 insertions(+), 14 deletions(-) + clang/cmake/modules/CMakeLists.txt | 4 ++-- + compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 2 +- + flang/cmake/modules/CMakeLists.txt | 4 ++-- + lld/cmake/modules/CMakeLists.txt | 4 ++-- + llvm/cmake/modules/AddLLVM.cmake | 2 +- + llvm/cmake/modules/CMakeLists.txt | 2 +- + mlir/cmake/modules/CMakeLists.txt | 4 ++-- + mlir/test/CMakeLists.txt | 2 +- + openmp/tools/Modules/CMakeLists.txt | 2 +- + polly/cmake/CMakeLists.txt | 4 ++-- + 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt -index 561665d58cad..3c73878a4483 100644 +index c6f6ce9fe5d6..fc886b23a1a8 100644 --- a/clang/cmake/modules/CMakeLists.txt +++ b/clang/cmake/modules/CMakeLists.txt -@@ -3,11 +3,11 @@ include(LLVMDistributionSupport) +@@ -5,11 +5,11 @@ include(FindPrefixFromConfig) # Generate a list of CMake library targets so that other CMake projects can # link against them. LLVM calls its version of this file LLVMExports.cmake, but # the usual CMake convention seems to be ${Project}Targets.cmake. @@ -26,11 +28,24 @@ index 561665d58cad..3c73878a4483 100644 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS) +diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +index 052095801aae..f3402793b60c 100644 +--- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake ++++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +@@ -376,7 +376,7 @@ macro(load_llvm_config) + file(TO_CMAKE_PATH ${LLVM_CMAKE_DIR_FROM_LLVM_CONFIG} LLVM_CMAKE_DIR) + else() + file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE) +- set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") ++ set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/share/llvm") + endif() + + set(LLVM_CMAKE_INCLUDE_FILE "${LLVM_CMAKE_DIR}/LLVMConfig.cmake") diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt -index e46498a6bc35..2e922f8ca89d 100644 +index 170568c80dde..1bf6d6a829e2 100644 --- a/flang/cmake/modules/CMakeLists.txt +++ b/flang/cmake/modules/CMakeLists.txt -@@ -1,11 +1,11 @@ +@@ -4,11 +4,11 @@ include(FindPrefixFromConfig) # Generate a list of CMake library targets so that other CMake projects can # link against them. LLVM calls its version of this file LLVMExports.cmake, but # the usual CMake convention seems to be ${Project}Targets.cmake. @@ -45,10 +60,10 @@ index e46498a6bc35..2e922f8ca89d 100644 get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS) diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt -index 62d03fa901dd..09b0f54ee8c3 100644 +index 760c9d5f8d87..acd8a65808f5 100644 --- a/lld/cmake/modules/CMakeLists.txt +++ b/lld/cmake/modules/CMakeLists.txt -@@ -1,11 +1,11 @@ +@@ -4,11 +4,11 @@ include(FindPrefixFromConfig) # Generate a list of CMake library targets so that other CMake projects can # link against them. LLVM calls its version of this file LLVMExports.cmake, but # the usual CMake convention seems to be ${Project}Targets.cmake. @@ -63,10 +78,10 @@ index 62d03fa901dd..09b0f54ee8c3 100644 get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS) diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index 29e40f45fef8..e9094e9b8eb2 100644 +index 37bc98f9e021..7cbfa2a9a577 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake -@@ -1033,7 +1033,7 @@ function(process_llvm_pass_plugins) +@@ -1049,7 +1049,7 @@ function(process_llvm_pass_plugins) ## Part 1: Extension header to be included whenever we need extension # processing. @@ -76,11 +91,12 @@ index 29e40f45fef8..e9094e9b8eb2 100644 file(WRITE "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt -index 51b6a4fdc284..a818de2e116c 100644 +index cea0c1df0a14..639c5422b04a 100644 --- a/llvm/cmake/modules/CMakeLists.txt +++ b/llvm/cmake/modules/CMakeLists.txt -@@ -1,6 +1,6 @@ +@@ -2,7 +2,7 @@ include(ExtendPath) include(LLVMDistributionSupport) + include(FindPrefixFromConfig) -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) +set(LLVM_INSTALL_PACKAGE_DIR share/llvm) @@ -88,10 +104,10 @@ index 51b6a4fdc284..a818de2e116c 100644 # First for users who use an installed LLVM, create the LLVMExports.cmake file. diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt -index 65efc4a14987..7c3213ab0c2b 100644 +index d6703993bd74..e2f6cd3ea8cb 100644 --- a/mlir/cmake/modules/CMakeLists.txt +++ b/mlir/cmake/modules/CMakeLists.txt -@@ -3,11 +3,11 @@ include(LLVMDistributionSupport) +@@ -5,11 +5,11 @@ include(FindPrefixFromConfig) # Generate a list of CMake library targets so that other CMake projects can # link against them. LLVM calls its version of this file LLVMExports.cmake, but # the usual CMake convention seems to be ${Project}Targets.cmake. @@ -105,34 +121,41 @@ index 65efc4a14987..7c3213ab0c2b 100644 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS) +diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt +index 8e44a9c37cf1..f6edc7d77ffd 100644 +--- a/mlir/test/CMakeLists.txt ++++ b/mlir/test/CMakeLists.txt +@@ -8,7 +8,7 @@ endif() + # Passed to lit.site.cfg.py.so that the out of tree Standalone dialect test + # can find MLIR's CMake configuration + set(MLIR_CMAKE_DIR +- "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir") ++ "${CMAKE_BINARY_DIR}/share/mlir") + + # Passed to lit.site.cfg.py.in to set up the path where to find the libraries + # for linalg integration tests. +diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt +index 22d818eea72d..75aacc4468d4 100644 +--- a/openmp/tools/Modules/CMakeLists.txt ++++ b/openmp/tools/Modules/CMakeLists.txt +@@ -12,4 +12,4 @@ + + + install(FILES "FindOpenMPTarget.cmake" +- DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp") ++ DESTINATION "share/openmp") diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt -index 7cc129ba2e90..9776391cd535 100644 +index 7a0190b69df6..cdd3b4f126bb 100644 --- a/polly/cmake/CMakeLists.txt +++ b/polly/cmake/CMakeLists.txt -@@ -1,7 +1,7 @@ - # Keep this in sync with llvm/cmake/CMakeLists.txt! +@@ -3,8 +3,8 @@ + include(ExtendPath) + include(FindPrefixFromConfig) -set(LLVM_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -set(POLLY_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/polly") -+set(LLVM_INSTALL_PACKAGE_DIR share/llvm) -+set(POLLY_INSTALL_PACKAGE_DIR share/polly) ++set(LLVM_INSTALL_PACKAGE_DIR "share/llvm") ++set(POLLY_INSTALL_PACKAGE_DIR "share/polly") if (CMAKE_CONFIGURATION_TYPES) set(POLLY_EXPORTS_FILE_NAME "PollyExports-$>.cmake") else() -diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt -index 8bea8843589b..3658c0a4414a 100644 ---- a/pstl/CMakeLists.txt -+++ b/pstl/CMakeLists.txt -@@ -81,10 +81,10 @@ install(TARGETS ParallelSTL - install(EXPORT ParallelSTLTargets - FILE ParallelSTLTargets.cmake - NAMESPACE pstl:: -- DESTINATION lib/cmake/ParallelSTL) -+ DESTINATION share/ParallelSTL) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake" -- DESTINATION lib/cmake/ParallelSTL) -+ DESTINATION share/ParallelSTL) - install(DIRECTORY include/ - DESTINATION include - PATTERN "*.in" EXCLUDE) diff --git a/ports/llvm/0003-fix-openmp-debug.patch b/ports/llvm/0003-fix-openmp-debug.patch deleted file mode 100644 index 3eff4fa538902a..00000000000000 --- a/ports/llvm/0003-fix-openmp-debug.patch +++ /dev/null @@ -1,25 +0,0 @@ - openmp/runtime/src/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt -index bdb867e352f7..16a13fa959ea 100644 ---- a/openmp/runtime/src/CMakeLists.txt -+++ b/openmp/runtime/src/CMakeLists.txt -@@ -159,7 +159,7 @@ else() - endif() - - set_target_properties(omp PROPERTIES -- PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}" -+ PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}" DEBUG_POSTFIX "" - LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}" - LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE} - ) -@@ -236,7 +236,7 @@ if(WIN32) - # Create new import library that is just the previously created one + kmp_import.cpp - add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp) - set_target_properties(ompimp PROPERTIES -- PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" -+ PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" DEBUG_POSTFIX "" - LINKER_LANGUAGE C - ) - add_dependencies(ompimp omp) # ensure generated import library is created first diff --git a/ports/llvm/0005-fix-tools-path.patch b/ports/llvm/0005-fix-tools-path.patch index 06fc8fc249ede7..1b1142ec9ef537 100644 --- a/ports/llvm/0005-fix-tools-path.patch +++ b/ports/llvm/0005-fix-tools-path.patch @@ -2,7 +2,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp -index 1a2f04552d13..9370c5e28206 100644 +index 8ed88f33ead4..3f2d1b98adcc 100644 --- a/llvm/tools/llvm-config/llvm-config.cpp +++ b/llvm/tools/llvm-config/llvm-config.cpp @@ -305,7 +305,7 @@ int main(int argc, char **argv) { diff --git a/ports/llvm/0007-fix-compiler-rt-install-path.patch b/ports/llvm/0007-fix-compiler-rt-install-path.patch index 6a585cd429da4a..c33dd996344cf8 100644 --- a/ports/llvm/0007-fix-compiler-rt-install-path.patch +++ b/ports/llvm/0007-fix-compiler-rt-install-path.patch @@ -4,10 +4,10 @@ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt -index 8131f6005dc2..9afef2e5a4e7 100644 +index 078988980c52..795f495b32d6 100644 --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt -@@ -222,7 +222,7 @@ set_target_properties(clang-resource-headers PROPERTIES +@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES FOLDER "Misc" RUNTIME_OUTPUT_DIRECTORY "${output_dir}") @@ -17,10 +17,10 @@ index 8131f6005dc2..9afef2e5a4e7 100644 install( FILES ${files} ${generated_files} diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt -index 61b1c60bf590..c20a5a326f15 100644 +index ca7e17927ee1..87d4282b36ad 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt -@@ -82,7 +82,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) +@@ -84,7 +84,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS} -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION} -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR} @@ -30,10 +30,10 @@ index 61b1c60bf590..c20a5a326f15 100644 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake -index c11342e68813..61bb52135c43 100644 +index d7b0124f3546..55e515cb1c7a 100644 --- a/compiler-rt/cmake/base-config-ix.cmake +++ b/compiler-rt/cmake/base-config-ix.cmake -@@ -42,7 +42,7 @@ if (LLVM_TREE_AVAILABLE) +@@ -44,7 +44,7 @@ if (LLVM_TREE_AVAILABLE) # Setup the paths where compiler-rt runtimes and headers should be stored. set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}) set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) diff --git a/ports/llvm/0009-fix-tools-install-path.patch b/ports/llvm/0009-fix-tools-install-path.patch index bfc5c5fc2bb4b7..294de6fdabbd70 100644 --- a/ports/llvm/0009-fix-tools-install-path.patch +++ b/ports/llvm/0009-fix-tools-install-path.patch @@ -1,184 +1,233 @@ - clang-tools-extra/modularize/CMakeLists.txt | 2 +- - clang/cmake/modules/AddClang.cmake | 2 +- - clang/tools/c-index-test/CMakeLists.txt | 2 +- - clang/tools/clang-format/CMakeLists.txt | 2 +- - clang/tools/scan-build/CMakeLists.txt | 2 +- - clang/tools/scan-view/CMakeLists.txt | 2 +- - clang/utils/hmaptool/CMakeLists.txt | 2 +- - flang/cmake/modules/AddFlang.cmake | 2 +- - flang/tools/f18/CMakeLists.txt | 4 ++-- - flang/tools/flang-driver/CMakeLists.txt | 2 +- - lld/cmake/modules/AddLLD.cmake | 2 +- - lld/tools/lld/CMakeLists.txt | 2 +- - lldb/cmake/modules/AddLLDB.cmake | 2 +- - 13 files changed, 14 insertions(+), 14 deletions(-) + clang-tools-extra/clang-tidy/tool/CMakeLists.txt | 2 +- + clang-tools-extra/modularize/CMakeLists.txt | 2 +- + clang/cmake/modules/AddClang.cmake | 2 +- + clang/tools/c-index-test/CMakeLists.txt | 2 +- + clang/tools/clang-format/CMakeLists.txt | 2 +- + clang/tools/clang-linker-wrapper/CMakeLists.txt | 2 +- + clang/tools/clang-nvlink-wrapper/CMakeLists.txt | 2 +- + clang/tools/scan-build-py/CMakeLists.txt | 4 ++-- + clang/tools/scan-build/CMakeLists.txt | 2 +- + clang/tools/scan-view/CMakeLists.txt | 2 +- + clang/utils/hmaptool/CMakeLists.txt | 2 +- + flang/cmake/modules/AddFlang.cmake | 2 +- + flang/tools/f18/CMakeLists.txt | 2 +- + flang/tools/flang-driver/CMakeLists.txt | 2 +- + lld/cmake/modules/AddLLD.cmake | 2 +- + lld/tools/lld/CMakeLists.txt | 2 +- + lldb/cmake/modules/AddLLDB.cmake | 2 +- + 17 files changed, 18 insertions(+), 18 deletions(-) +diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +index 3ce552872015..e09b917ae5f8 100644 +--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt ++++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +@@ -64,6 +64,6 @@ install(PROGRAMS clang-tidy-diff.py + DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" + COMPONENT clang-tidy) + install(PROGRAMS run-clang-tidy.py +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT clang-tidy + RENAME run-clang-tidy) diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt -index 4caae81c49b6..8c459c51cc34 100644 +index fb17e353c39f..4b409e47446a 100644 --- a/clang-tools-extra/modularize/CMakeLists.txt +++ b/clang-tools-extra/modularize/CMakeLists.txt @@ -23,5 +23,5 @@ clang_target_link_libraries(modularize ) install(TARGETS modularize -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION tools/llvm +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT clang-extras) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake -index 5752f4277444..00b7d21b8fef 100644 +index 9bbbfc032b7d..bd238ff249cd 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake -@@ -159,7 +159,7 @@ macro(add_clang_tool name) +@@ -160,7 +160,7 @@ macro(add_clang_tool name) get_target_export_arg(${name} Clang export_to_clangtargets) install(TARGETS ${name} ${export_to_clangtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION tools/llvm +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt -index ceef4b08637c..ce6d7799475b 100644 +index 0ae1b4e55244..e8a34e136194 100644 --- a/clang/tools/c-index-test/CMakeLists.txt +++ b/clang/tools/c-index-test/CMakeLists.txt -@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH "@executable_path/../../lib") else() -- set(INSTALL_DESTINATION bin) -+ set(INSTALL_DESTINATION tools/llvm) +- set(INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ set(INSTALL_DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") endif() install(TARGETS c-index-test diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt -index 35ecdb11253c..d1b800dfdadc 100644 +index bbdef93b576b..8744e414da0a 100644 --- a/clang/tools/clang-format/CMakeLists.txt +++ b/clang/tools/clang-format/CMakeLists.txt @@ -36,5 +36,5 @@ install(PROGRAMS clang-format.py - DESTINATION share/clang + DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" COMPONENT clang-format) install(PROGRAMS git-clang-format -- DESTINATION bin -+ DESTINATION tools/llvm +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT clang-format) +diff --git a/clang/tools/clang-linker-wrapper/CMakeLists.txt b/clang/tools/clang-linker-wrapper/CMakeLists.txt +index 1614f40fb60e..0e78982310c7 100644 +--- a/clang/tools/clang-linker-wrapper/CMakeLists.txt ++++ b/clang/tools/clang-linker-wrapper/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(clang-linker-wrapper + ${CLANG_LINKER_WRAPPER_LIB_DEPS} + ) + +-install(TARGETS clang-linker-wrapper RUNTIME DESTINATION bin) ++install(TARGETS clang-linker-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") +diff --git a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt +index 2c979e509795..f22b801fe19a 100644 +--- a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt ++++ b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt +@@ -22,4 +22,4 @@ target_link_libraries(clang-nvlink-wrapper + ${CLANG_NVLINK_WRAPPER_LIB_DEPS} + ) + +-install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") ++install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") +diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt +index 061dc7ef4dd9..91499600693b 100644 +--- a/clang/tools/scan-build-py/CMakeLists.txt ++++ b/clang/tools/scan-build-py/CMakeLists.txt +@@ -43,7 +43,7 @@ foreach(BinFile ${BinFiles}) + ${CMAKE_BINARY_DIR}/bin/scan-build-py + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/scan-build) + install (PROGRAMS "bin/scan-build" +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + RENAME scan-build-py + COMPONENT scan-build-py) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/scan-build-py) +@@ -56,7 +56,7 @@ foreach(BinFile ${BinFiles}) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT scan-build-py) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + endif() diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt -index ec0702d76f18..9a34a09921b1 100644 +index 4a578b4c6f3e..05574a4919f6 100644 --- a/clang/tools/scan-build/CMakeLists.txt +++ b/clang/tools/scan-build/CMakeLists.txt @@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} -- DESTINATION bin -+ DESTINATION tools/llvm +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT scan-build) endforeach() diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt -index eccc6b83195b..232976c0c227 100644 +index 07aec76ee66f..ca6a3380ad0c 100644 --- a/clang/tools/scan-view/CMakeLists.txt +++ b/clang/tools/scan-view/CMakeLists.txt @@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} -- DESTINATION bin -+ DESTINATION tools/llvm +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT scan-view) endforeach() diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt -index 62f2de0cb15c..38dc821c76de 100644 +index f0d9866782b8..5fcdfc04425f 100644 --- a/clang/utils/hmaptool/CMakeLists.txt +++ b/clang/utils/hmaptool/CMakeLists.txt @@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) install(PROGRAMS ${CLANG_HMAPTOOL} -- DESTINATION bin -+ DESTINATION tools/llvm +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT hmaptool) add_custom_target(hmaptool ALL DEPENDS ${Depends}) diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake -index 5da58a59ed12..c019d7fc50a9 100644 +index 369e303e148a..3c3697c07406 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake -@@ -108,7 +108,7 @@ macro(add_flang_tool name) +@@ -109,7 +109,7 @@ macro(add_flang_tool name) get_target_export_arg(${name} Flang export_to_flangtargets) install(TARGETS ${name} ${export_to_flangtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION tools/llvm +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt -index 239859b5e5b9..12d00f904f8a 100644 +index aa77676c6229..dd15b0b7727b 100644 --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt -@@ -60,7 +60,7 @@ endforeach() - - add_custom_target(module_files ALL DEPENDS ${MODULE_FILES}) - --install(TARGETS f18 DESTINATION bin) -+install(TARGETS f18 DESTINATION tools/llvm) - - set(FLANG_DEFAULT_DRIVER "flang-new") - if (NOT FLANG_BUILD_NEW_DRIVER) -@@ -70,5 +70,5 @@ endif() - # This flang shell script will only work in a POSIX shell. - if (NOT WIN32) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.in ${CMAKE_BINARY_DIR}/bin/flang @ONLY) -- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin) -+ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION tools/llvm) +@@ -50,5 +50,5 @@ if (NOT WIN32) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/flang + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/flang ${CMAKE_BINARY_DIR}/bin) + add_custom_target(flang ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang) +- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") endif() diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt -index 4c7ad220d223..f4206913e76f 100644 +index b3e90746e786..b327e69aaeaa 100644 --- a/flang/tools/flang-driver/CMakeLists.txt +++ b/flang/tools/flang-driver/CMakeLists.txt -@@ -27,4 +27,4 @@ clang_target_link_libraries(flang-new - clangBasic - ) +@@ -34,4 +34,4 @@ if(FLANG_PLUGIN_SUPPORT) + export_executable_symbols_for_plugins(flang-new) + endif() --install(TARGETS flang-new DESTINATION bin) -+install(TARGETS flang-new DESTINATION tools/llvm) +-install(TARGETS flang-new DESTINATION "${CMAKE_INSTALL_BINDIR}") ++install(TARGETS flang-new DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake -index 9883475d1aa5..48e46586f387 100644 +index dd2898ce6236..86560bddd5e4 100644 --- a/lld/cmake/modules/AddLLD.cmake +++ b/lld/cmake/modules/AddLLD.cmake -@@ -46,7 +46,7 @@ macro(add_lld_tool name) +@@ -47,7 +47,7 @@ macro(add_lld_tool name) get_target_export_arg(${name} LLD export_to_lldtargets) install(TARGETS ${name} ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION tools/llvm +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT CMAKE_CONFIGURATION_TYPES) diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt -index e77b2161a873..b325b934640c 100644 +index df48cc0d6c51..1363144fd8e1 100644 --- a/lld/tools/lld/CMakeLists.txt +++ b/lld/tools/lld/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries(lld +@@ -20,7 +20,7 @@ target_link_libraries(lld ) install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION tools/llvm) +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") if(NOT LLD_SYMLINKS_TO_CREATE) set(LLD_SYMLINKS_TO_CREATE diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake -index 8be214a8509a..4a5d0fa39be3 100644 +index 3291a7c808e1..9fe9b9a7940d 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake -@@ -187,7 +187,7 @@ function(add_lldb_executable name) +@@ -189,7 +189,7 @@ function(add_lldb_executable name) endif() if(ARG_GENERATE_INSTALL) - set(install_dest bin) -+ set(install_dest tools/llvm) ++ set(install_dest "${LLVM_TOOLS_INSTALL_DIR}") if(ARG_INSTALL_PREFIX) set(install_dest ${ARG_INSTALL_PREFIX}) endif() diff --git a/ports/llvm/0010-fix-libffi.patch b/ports/llvm/0010-fix-libffi.patch index 93d0cb4da4d421..3859b81fecb8bd 100644 --- a/ports/llvm/0010-fix-libffi.patch +++ b/ports/llvm/0010-fix-libffi.patch @@ -1,16 +1,16 @@ - llvm/cmake/config-ix.cmake | 2 +- + llvm/cmake/modules/FindFFI.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake -index dd0aaadb47c7..279435b5b27d 100644 ---- a/llvm/cmake/config-ix.cmake -+++ b/llvm/cmake/config-ix.cmake -@@ -343,7 +343,7 @@ if( LLVM_ENABLE_FFI ) - message(FATAL_ERROR "libffi includes are not found.") +diff --git a/llvm/cmake/modules/FindFFI.cmake b/llvm/cmake/modules/FindFFI.cmake +index b0d859af8959..a756d0c8fdb0 100644 +--- a/llvm/cmake/modules/FindFFI.cmake ++++ b/llvm/cmake/modules/FindFFI.cmake +@@ -34,7 +34,7 @@ else() endif() + endif() -- find_library(FFI_LIBRARY_PATH ffi PATHS ${FFI_LIBRARY_DIR}) -+ find_library(FFI_LIBRARY_PATH NAMES ffi libffi PATHS ${FFI_LIBRARY_DIR}) - if( NOT FFI_LIBRARY_PATH ) - message(FATAL_ERROR "libffi is not found.") - endif() +-find_library(FFI_LIBRARIES ffi PATHS ${FFI_LIBRARY_DIR}) ++find_library(FFI_LIBRARIES ffi libffi PATHS ${FFI_LIBRARY_DIR}) + + if(FFI_LIBRARIES) + include(CMakePushCheckState) diff --git a/ports/llvm/0011-fix-install-bolt.patch b/ports/llvm/0011-fix-install-bolt.patch new file mode 100644 index 00000000000000..1e2660fa93c178 --- /dev/null +++ b/ports/llvm/0011-fix-install-bolt.patch @@ -0,0 +1,22 @@ + bolt/tools/driver/CMakeLists.txt | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt +index d50781615663..df06604c724c 100644 +--- a/bolt/tools/driver/CMakeLists.txt ++++ b/bolt/tools/driver/CMakeLists.txt +@@ -33,14 +33,6 @@ set(BOLT_DEPENDS + ) + + add_custom_target(bolt DEPENDS ${BOLT_DEPENDS}) +-install(PROGRAMS +- ${CMAKE_BINARY_DIR}/bin/llvm-bolt +- ${CMAKE_BINARY_DIR}/bin/perf2bolt +- ${CMAKE_BINARY_DIR}/bin/llvm-boltdiff +- ${CMAKE_BINARY_DIR}/bin/llvm-bolt-heatmap +- DESTINATION ${CMAKE_INSTALL_BINDIR} +- COMPONENT bolt +- ) + add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt) + set_target_properties(bolt PROPERTIES FOLDER "BOLT") + set_target_properties(install-bolt PROPERTIES FOLDER "BOLT") diff --git a/ports/llvm/0011-fix-libxml2.patch b/ports/llvm/0011-fix-libxml2.patch deleted file mode 100644 index d3f953f320df6b..00000000000000 --- a/ports/llvm/0011-fix-libxml2.patch +++ /dev/null @@ -1,34 +0,0 @@ - clang/tools/c-index-test/CMakeLists.txt | 6 +----- - lldb/cmake/modules/LLDBConfig.cmake | 2 +- - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt -index ceef4b08637c..40b9e995597f 100644 ---- a/clang/tools/c-index-test/CMakeLists.txt -+++ b/clang/tools/c-index-test/CMakeLists.txt -@@ -40,11 +40,7 @@ set_target_properties(c-index-test - - # If libxml2 is available, make it available for c-index-test. - if (CLANG_HAVE_LIBXML) -- if ((CMAKE_OSX_SYSROOT) AND (EXISTS ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR})) -- include_directories(SYSTEM ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR}) -- else() -- include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR}) -- endif() -+ include_directories(SYSTEM ${LIBXML2_INCLUDE_DIRS}) - target_link_libraries(c-index-test PRIVATE ${LIBXML2_LIBRARIES}) - endif() - -diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake -index b62cd7d24438..a8c78ee1bccd 100644 ---- a/lldb/cmake/modules/LLDBConfig.cmake -+++ b/lldb/cmake/modules/LLDBConfig.cmake -@@ -215,7 +215,7 @@ if (LLDB_ENABLE_LZMA) - endif() - - if (LLDB_ENABLE_LIBXML2) -- include_directories(${LIBXML2_INCLUDE_DIR}) -+ include_directories(${LIBXML2_INCLUDE_DIRS}) - endif() - - include_directories(BEFORE diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 1915dadcdd3ad6..0896fa6ba332c3 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -1,4 +1,4 @@ -set(LLVM_VERSION "13.0.0") +set(LLVM_VERSION "14.0.3") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,17 +6,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project REF llvmorg-${LLVM_VERSION} - SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 + SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646 HEAD_REF master PATCHES 0002-fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. - 0003-fix-openmp-debug.patch 0004-fix-dr-1734.patch 0005-fix-tools-path.patch 0007-fix-compiler-rt-install-path.patch 0009-fix-tools-install-path.patch 0010-fix-libffi.patch - 0011-fix-libxml2.patch + 0011-fix-install-bolt.patch ) vcpkg_check_features( @@ -35,6 +34,9 @@ vcpkg_check_features( enable-bindings LLVM_ENABLE_BINDINGS ) +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + # LLVM generates CMake error due to Visual Studio version 16.4 is known to miscompile part of LLVM. # LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON disables this error. # See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html @@ -93,6 +95,9 @@ else() endif() set(LLVM_ENABLE_PROJECTS) +if("bolt" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "bolt") +endif() if("clang" IN_LIST FEATURES OR "clang-tools-extra" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "clang") if("disable-clang-static-analyzer" IN_LIST FEATURES) @@ -115,7 +120,7 @@ if("compiler-rt" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "compiler-rt") endif() if("flang" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") message(FATAL_ERROR "Building Flang with MSVC is not supported on x86. Disable it until issues are fixed.") endif() list(APPEND LLVM_ENABLE_PROJECTS "flang") @@ -127,59 +132,54 @@ endif() if("libclc" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "libclc") endif() -if("libcxx" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Building libcxx with MSVC is not supported. Disable it until issues are fixed.") - endif() - list(APPEND LLVM_ENABLE_PROJECTS "libcxx") -endif() -if("libcxxabi" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Building libcxxabi with MSVC is not supported. Disable it until issues are fixed.") - endif() - list(APPEND LLVM_ENABLE_PROJECTS "libcxxabi") -endif() -if("libunwind" IN_LIST FEATURES) - list(APPEND LLVM_ENABLE_PROJECTS "libunwind") -endif() if("lld" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "lld") endif() if("lldb" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "lldb") + list(APPEND FEATURE_OPTIONS + -DLLDB_ENABLE_CURSES=OFF + ) endif() if("mlir" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "mlir") endif() if("openmp" IN_LIST FEATURES) - # Disable OpenMP on Windows (see https://bugs.llvm.org/show_bug.cgi?id=45074). - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Building OpenMP with MSVC is not supported. Disable it until issues are fixed.") - endif() list(APPEND LLVM_ENABLE_PROJECTS "openmp") # Perl is required for the OpenMP run-time vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) vcpkg_add_to_path(${PERL_PATH}) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - list(APPEND FEATURE_OPTIONS - -DLIBOMP_DEFAULT_LIB_NAME=libompd - ) - endif() -endif() -if("parallel-libs" IN_LIST FEATURES) - list(APPEND LLVM_ENABLE_PROJECTS "parallel-libs") + # Skip post-build check + set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled) endif() if("polly" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "polly") endif() if("pstl" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") message(FATAL_ERROR "Building pstl with MSVC is not supported. Disable it until issues are fixed.") endif() list(APPEND LLVM_ENABLE_PROJECTS "pstl") endif() +set(LLVM_ENABLE_RUNTIMES) +if("libcxx" IN_LIST FEATURES) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + message(FATAL_ERROR "Building libcxx with MSVC is not supported, as cl doesn't support the #include_next extension.") + endif() + list(APPEND LLVM_ENABLE_RUNTIMES "libcxx") +endif() +if("libcxxabi" IN_LIST FEATURES) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + message(FATAL_ERROR "Building libcxxabi with MSVC is not supported. Disable it until issues are fixed.") + endif() + list(APPEND LLVM_ENABLE_RUNTIMES "libcxxabi") +endif() +if("libunwind" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_RUNTIMES "libunwind") +endif() + set(known_llvm_targets AArch64 AMDGPU @@ -195,6 +195,7 @@ set(known_llvm_targets RISCV Sparc SystemZ + VE WebAssembly X86 XCore @@ -212,54 +213,25 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) vcpkg_add_to_path(${PYTHON3_DIR}) -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}") - # TODO: support more targets and OS - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - if(VCPKG_TARGET_IS_OSX) - list(APPEND CROSS_OPTIONS -DLLVM_HOST_TRIPLE=arm64-apple-darwin20.3.0) - list(APPEND CROSS_OPTIONS -DLLVM_DEFAULT_TARGET_TRIPLE=arm64-apple-darwin20.3.0) - elseif(VCPKG_TARGET_IS_WINDOWS) - list(APPEND CROSS_OPTIONS -DLLVM_HOST_TRIPLE=arm64-pc-win32) - list(APPEND CROSS_OPTIONS -DLLVM_DEFAULT_TARGET_TRIPLE=arm64-pc-win32) - - # Remove if PR #16111 is merged - list(APPEND CROSS_OPTIONS -DCMAKE_CROSSCOMPILING=ON) - list(APPEND CROSS_OPTIONS -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64) - list(APPEND CROSS_OPTIONS -DCMAKE_SYSTEM_NAME:STRING=Windows) - endif() - list(APPEND CROSS_OPTIONS -DLLVM_TARGET_ARCH=AArch64) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - if(VCPKG_TARGET_IS_OSX) - list(APPEND CROSS_OPTIONS -DLLVM_HOST_TRIPLE=x86_64-apple-darwin20.3.0) - list(APPEND CROSS_OPTIONS -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin20.3.0) - endif() - list(APPEND CROSS_OPTIONS -DLLVM_TARGET_ARCH=X86) - endif() -endif() - vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/llvm OPTIONS ${FEATURE_OPTIONS} - ${CROSS_OPTIONS} -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_BUILD_TESTS=OFF - -DLLDB_ENABLE_CURSES=OFF + -DLLVM_INCLUDE_BENCHMARKS=OFF + -DLLVM_BUILD_BENCHMARKS=OFF # Force TableGen to be built with optimization. This will significantly improve build time. -DLLVM_OPTIMIZED_TABLEGEN=ON "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}" + "-DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES}" "-DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD}" -DPACKAGE_VERSION=${LLVM_VERSION} # Limit the maximum number of concurrent link jobs to 1. This should fix low amount of memory issue for link. -DLLVM_PARALLEL_LINK_JOBS=1 - # Disable build LLVM-C.dll (Windows only) due to doesn't compile with CMAKE_DEBUG_POSTFIX - -DLLVM_BUILD_LLVM_C_DYLIB=OFF - # Path for binary subdirectory (defaults to 'bin') -DLLVM_TOOLS_INSTALL_DIR=tools/llvm - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_cmake_install(ADD_BIN_TO_PATH) @@ -324,12 +296,14 @@ endif() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/tools" + ) endif() # LLVM still generates a few DLLs in the static build: +# * LLVM-C.dll # * libclang.dll # * LTO.dll # * Remarks.dll diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 9e8435ca57ab44..383aad641ffe79 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "llvm", - "version": "13.0.0", - "port-version": 5, + "version": "14.0.3", "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", @@ -14,6 +13,10 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true } ], "default-features": [ @@ -24,6 +27,18 @@ "tools" ], "features": { + "bolt": { + "description": "BOLT is a post-link optimizer developed to speed up large applications.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools" + ] + } + ] + }, "clang": { "description": "Include C Language Family Front-end.", "dependencies": [ @@ -50,7 +65,6 @@ "name": "llvm", "default-features": false, "features": [ - "disable-abi-breaking-checks", "disable-assertions", "disable-clang-static-analyzer", "enable-bindings", @@ -98,9 +112,6 @@ } ] }, - "disable-abi-breaking-checks": { - "description": "Deprecated; this is the default" - }, "disable-assertions": { "description": "Build LLVM without assertions." }, @@ -238,9 +249,6 @@ } ] }, - "parallel-libs": { - "description": "Include parallel-libs project." - }, "polly": { "description": "Include Polly (Polyhedral optimizations for LLVM) project.", "dependencies": [ @@ -281,6 +289,7 @@ "target-riscv", "target-sparc", "target-systemz", + "target-ve", "target-webassembly", "target-x86", "target-xcore" @@ -327,6 +336,9 @@ "target-systemz": { "description": "Build with SystemZ backend." }, + "target-ve": { + "description": "Build with VE backend." + }, "target-webassembly": { "description": "Build with WebAssembly backend." }, diff --git a/ports/mesa/clang.patch b/ports/mesa/clang.patch new file mode 100644 index 00000000000000..b8c7b547af1bdd --- /dev/null +++ b/ports/mesa/clang.patch @@ -0,0 +1,52 @@ +diff --git a/meson.build b/meson.build +index 53ec2c2ef95e65447dd0f0eb65c0f92a5906590d..c124b5fb0d2b28424f33aac54cd4f87c4249dc40 100644 +--- a/meson.build ++++ b/meson.build +@@ -1087,7 +1087,18 @@ elif host_machine.system() == 'windows' + '-DNOMINMAX', + ] + else +- pre_args += ['-D__MSVCRT_VERSION__=0x0700'] ++ # When the target is not mingw/ucrt ++ # NOTE: clang's stddef.h are conflict with mingw/ucrt's stddef.h ++ # So do not include headers that defined in clang for detecting ++ # _UCRT ++ if cc.compiles(''' ++ #include ++ #if defined(__MINGW32__) && defined(_UCRT) ++ #error ++ #endif ++ int main(void) { return 0; }''') ++ pre_args += ['-D__MSVCRT_VERSION__=0x0700'] ++ endif + endif + elif host_machine.system() == 'openbsd' + pre_args += '-D_ISOC11_SOURCE' +diff --git a/src/compiler/nir/nir_lower_atomics_to_ssbo.c b/src/compiler/nir/nir_lower_atomics_to_ssbo.c +index c1799d0b9d0af70148928a4b224172c188c64194..448f63bdc7cc3b9cae123e3c0abe79b4b5af380b 100644 +--- a/src/compiler/nir/nir_lower_atomics_to_ssbo.c ++++ b/src/compiler/nir/nir_lower_atomics_to_ssbo.c +@@ -27,10 +27,6 @@ + #include "nir.h" + #include "nir_builder.h" + +-#if defined(_WIN32) && !defined(snprintf) +-#define snprintf _snprintf +-#endif +- + /* + * Remap atomic counters to SSBOs, starting from the shader's next SSBO slot + * (info.num_ssbos). +diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h +index b1b40c8ee992eaeea985c58f4e8923724c1d385b..6053c2544a2628300cc8dc3311c8e4f0f69d36d5 100644 +--- a/src/compiler/spirv/vtn_private.h ++++ b/src/compiler/spirv/vtn_private.h +@@ -41,7 +41,7 @@ struct vtn_builder; + struct vtn_decoration; + + /* setjmp/longjmp is broken on MinGW: https://sourceforge.net/p/mingw-w64/bugs/406/ */ +-#ifdef __MINGW32__ ++#if defined(__MINGW32__) && !defined(_UCRT) + #define vtn_setjmp __builtin_setjmp + #define vtn_longjmp __builtin_longjmp + #else diff --git a/ports/mesa/clover.patch b/ports/mesa/clover.patch new file mode 100644 index 00000000000000..6e39e180fe6075 --- /dev/null +++ b/ports/mesa/clover.patch @@ -0,0 +1,63 @@ +From b7c465dc43693cb1ad7e073cc7d8f89f5cfbd0ac Mon Sep 17 00:00:00 2001 +From: pal1000 +Date: Sat, 13 Nov 2021 11:39:58 +0200 +Subject: [PATCH] clover: Use static pipe loader on Windows + +Currently this only supports linking in swrast, but more Windows-supporting +drivers can be added pretty easily. +--- + src/gallium/targets/opencl/meson.build | 18 +++++++++++++++--- + src/gallium/targets/opencl/target.c | 2 ++ + 2 files changed, 17 insertions(+), 3 deletions(-) + create mode 100644 src/gallium/targets/opencl/target.c + +diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build +index ec65fcbe18e..f6ca4a28f20 100644 +--- a/src/gallium/targets/opencl/meson.build ++++ b/src/gallium/targets/opencl/meson.build +@@ -85,19 +85,31 @@ if not (dep_clang.found() and dep_clang_usable) + endif + endif + ++if host_machine.system() == 'windows' ++ libpipe_loader = libpipe_loader_static ++ target_files = ['target.c'] ++else ++ libpipe_loader = libpipe_loader_dynamic ++ target_files = [] ++endif ++ + ocldef = files(opencl_libname + '.def')[0] + + libopencl = shared_library( + opencl_libname, +- [], ++ target_files, ++ include_directories : [ ++ inc_include, inc_util, inc_src, inc_gallium, inc_gallium_winsys, inc_gallium_drivers, inc_gallium_aux ++ ], + vs_module_defs : ocldef, + link_args : [ld_args_gc_sections, opencl_link_args], + link_depends : opencl_link_deps, + link_whole : libclover, +- link_with : [libpipe_loader_dynamic, libgallium], ++ link_with : [libpipe_loader, libgallium, libws_null, libwsw], + dependencies : [ + idep_mesautil, +- dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version ++ dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version, ++ driver_swrast + ], + version : '@0@.0.0'.format(opencl_version), + install : true, +diff --git a/src/gallium/targets/opencl/target.c b/src/gallium/targets/opencl/target.c +new file mode 100644 +index 00000000000..308e23bb4a0 +--- /dev/null ++++ b/src/gallium/targets/opencl/target.c +@@ -0,0 +1,2 @@ ++#include "target-helpers/drm_helper.h" ++#include "target-helpers/sw_helper.h" +-- +2.33.1.windows.1 + diff --git a/ports/mesa/d3d10sw.patch b/ports/mesa/d3d10sw.patch deleted file mode 100644 index 98221873b0673b..00000000000000 --- a/ports/mesa/d3d10sw.patch +++ /dev/null @@ -1,383 +0,0 @@ -diff --git a/src/gallium/frontends/d3d10umd/D3DKMT.cpp b/src/gallium/frontends/d3d10umd/D3DKMT.cpp -index 1649eddc41e8f17fd9e0854acbb8e0c882d94cb5..dc31e9931876cac6ae4e52a80f6da7aa5284415c 100644 ---- a/src/gallium/frontends/d3d10umd/D3DKMT.cpp -+++ b/src/gallium/frontends/d3d10umd/D3DKMT.cpp -@@ -244,7 +244,7 @@ D3DKMTGetMultisampleMethodList(D3DKMT_GETMULTISAMPLEMETHODLIST *pData) - - - EXTERN_C NTSTATUS APIENTRY --D3DKMTPresent(CONST D3DKMT_PRESENT *pData) -+D3DKMTPresent(D3DKMT_PRESENT *pData) - { - LOG_UNSUPPORTED_ENTRYPOINT(); - return STATUS_NOT_IMPLEMENTED; -@@ -409,7 +409,7 @@ D3DKMTSetVidPnSourceOwner(CONST D3DKMT_SETVIDPNSOURCEOWNER *pData) - - - EXTERN_C NTSTATUS APIENTRY --D3DKMTSetVidPnSourceOwner1(const void *pData) -+D3DKMTSetVidPnSourceOwner1(CONST D3DKMT_SETVIDPNSOURCEOWNER1 *pData) - { - LOG_UNSUPPORTED_ENTRYPOINT(); - return STATUS_NOT_IMPLEMENTED; -diff --git a/src/gallium/frontends/d3d10umd/Device.cpp b/src/gallium/frontends/d3d10umd/Device.cpp -index afca18819ce04f28b23fee9ebdaa57b52a04426c..cd2c6cd9180eb03612500aa8d8475994a2f836fc 100644 ---- a/src/gallium/frontends/d3d10umd/Device.cpp -+++ b/src/gallium/frontends/d3d10umd/Device.cpp -@@ -32,7 +32,7 @@ - - - #include "Draw.h" --#include "Dxgi.h" -+#include "DxgiFns.h" - #include "InputAssembly.h" - #include "OutputMerger.h" - #include "Query.h" -diff --git a/src/gallium/frontends/d3d10umd/DriverIncludes.h b/src/gallium/frontends/d3d10umd/DriverIncludes.h -index e78d46fafc55557f3266e700fdc2a72305827ce6..c7df64042b5b013680ec3c8190cfac7b4b958ded 100644 ---- a/src/gallium/frontends/d3d10umd/DriverIncludes.h -+++ b/src/gallium/frontends/d3d10umd/DriverIncludes.h -@@ -43,12 +43,21 @@ - - #include - --#include "winddk/winddk_compat.h" -+#include "winddk_compat.h" - - //typedef LARGE_INTEGER PHYSICAL_ADDRESS; - //typedef __success(return >= 0) LONG NTSTATUS; - --#define D3D10DDI_MINOR_HEADER_VERSION 1 -+#define D3D10DDI_MINOR_HEADER_VERSION 2 -+ -+/* Unfortunately WinDDK's d3d10umddi.h defines D3D10.x constants as global -+ * const variables instead of preprocessor defines, causing LINK to fail due -+ * to duplicate symbols. Include d3d10_1.h to avoid the issue. -+ */ -+#ifdef _MSC_VER -+#include -+#endif -+ - #include - - #include "Debug.h" -diff --git a/src/gallium/frontends/d3d10umd/Dxgi.cpp b/src/gallium/frontends/d3d10umd/DxgiFns.cpp -similarity index 97% -rename from src/gallium/frontends/d3d10umd/Dxgi.cpp -rename to src/gallium/frontends/d3d10umd/DxgiFns.cpp -index 253f81ed283b55dd4bff29df8658f386c08cbc95..cd844a2b0fa19e23c46da0ddc3a92a9a2c9d81b6 100644 ---- a/src/gallium/frontends/d3d10umd/Dxgi.cpp -+++ b/src/gallium/frontends/d3d10umd/DxgiFns.cpp -@@ -26,13 +26,13 @@ - **************************************************************************/ - - /* -- * Dxgi.cpp -- -+ * DxgiFns.cpp -- - * DXGI related functions. - */ - - #include - --#include "Dxgi.h" -+#include "DxgiFns.h" - #include "Format.h" - #include "State.h" - -@@ -97,11 +97,11 @@ _Present(DXGI_DDI_ARG_PRESENT *pPresentData) - - void *map; - struct pipe_transfer *transfer; -- map = pipe_transfer_map(pipe, -- pSrcResource->resource, -- 0, 0, PIPE_MAP_READ, -- 0, 0, w, h, -- &transfer); -+ map = pipe_texture_map(pipe, -+ pSrcResource->resource, -+ 0, 0, PIPE_MAP_READ, -+ 0, 0, w, h, -+ &transfer); - if (map) { - - BITMAPINFO bmi; -@@ -172,7 +172,7 @@ _Present(DXGI_DDI_ARG_PRESENT *pPresentData) - DeleteDC(hdcMem); - DeleteObject(hBmp); - -- pipe_transfer_unmap(pipe, transfer); -+ pipe_texture_unmap(pipe, transfer); - } - - ReleaseDC(hWnd, hDC); -diff --git a/src/gallium/frontends/d3d10umd/Dxgi.h b/src/gallium/frontends/d3d10umd/DxgiFns.h -similarity index 96% -rename from src/gallium/frontends/d3d10umd/Dxgi.h -rename to src/gallium/frontends/d3d10umd/DxgiFns.h -index dedc2542d6ab016111a78b713b9cbe54581ba92a..3689faa307c07deb62c3f5c39b4788dd8d60cb35 100644 ---- a/src/gallium/frontends/d3d10umd/Dxgi.h -+++ b/src/gallium/frontends/d3d10umd/DxgiFns.h -@@ -26,8 +26,8 @@ - **************************************************************************/ - - /* -- * Dxgi.h -- -- * Functions that manipulate GPU resources. -+ * DxgiFns.h -- -+ * DXGI related functions - */ - - #ifndef WRAP_DXGI_H -diff --git a/src/gallium/frontends/d3d10umd/Resource.cpp b/src/gallium/frontends/d3d10umd/Resource.cpp -index a7910d2e3cf186597bb35d7c5a98464c4e844cf7..3dd91365b23e5608108a0e09e1296cb0a7bc65df 100644 ---- a/src/gallium/frontends/d3d10umd/Resource.cpp -+++ b/src/gallium/frontends/d3d10umd/Resource.cpp -@@ -270,6 +270,7 @@ CreateResource(D3D10DDI_HDEVICE hDevice, // IN - - templat.target = translate_texture_target( pCreateResource->ResourceDimension, - pCreateResource->ArraySize ); -+ pResource->buffer = templat.target == PIPE_BUFFER; - - if (pCreateResource->Format == DXGI_FORMAT_UNKNOWN) { - assert(pCreateResource->ResourceDimension == D3D10DDIRESOURCE_BUFFER); -@@ -315,37 +316,62 @@ CreateResource(D3D10DDI_HDEVICE hDevice, // IN - sizeof *pResource->transfers); - - if (pCreateResource->pInitialDataUP) { -- for (UINT SubResource = 0; SubResource < pResource->NumSubResources; ++SubResource) { -+ if (pResource->buffer) { -+ assert(pResource->NumSubResources == 1); - const D3D10_DDIARG_SUBRESOURCE_UP* pInitialDataUP = -- &pCreateResource->pInitialDataUP[SubResource]; -+ &pCreateResource->pInitialDataUP[0]; - - unsigned level; - struct pipe_box box; -- subResourceBox(pResource->resource, SubResource, &level, &box); -+ subResourceBox(pResource->resource, 0, &level, &box); - - struct pipe_transfer *transfer; - void *map; -- map = pipe->transfer_map(pipe, -- pResource->resource, -- level, -- PIPE_MAP_WRITE | -- PIPE_MAP_UNSYNCHRONIZED, -- &box, -- &transfer); -+ map = pipe->buffer_map(pipe, -+ pResource->resource, -+ level, -+ PIPE_MAP_WRITE | -+ PIPE_MAP_UNSYNCHRONIZED, -+ &box, -+ &transfer); - assert(map); - if (map) { -- for (int z = 0; z < box.depth; ++z) { -- ubyte *dst = (ubyte*)map + z*transfer->layer_stride; -- const ubyte *src = (const ubyte*)pInitialDataUP->pSysMem + z*pInitialDataUP->SysMemSlicePitch; -- util_copy_rect(dst, -- templat.format, -- transfer->stride, -- 0, 0, box.width, box.height, -- src, -- pInitialDataUP->SysMemPitch, -- 0, 0); -+ memcpy(map, pInitialDataUP->pSysMem, box.width); -+ pipe_buffer_unmap(pipe, transfer); -+ } -+ } else { -+ for (UINT SubResource = 0; SubResource < pResource->NumSubResources; ++SubResource) { -+ const D3D10_DDIARG_SUBRESOURCE_UP* pInitialDataUP = -+ &pCreateResource->pInitialDataUP[SubResource]; -+ -+ unsigned level; -+ struct pipe_box box; -+ subResourceBox(pResource->resource, SubResource, &level, &box); -+ -+ struct pipe_transfer *transfer; -+ void *map; -+ map = pipe->texture_map(pipe, -+ pResource->resource, -+ level, -+ PIPE_MAP_WRITE | -+ PIPE_MAP_UNSYNCHRONIZED, -+ &box, -+ &transfer); -+ assert(map); -+ if (map) { -+ for (int z = 0; z < box.depth; ++z) { -+ ubyte *dst = (ubyte*)map + z*transfer->layer_stride; -+ const ubyte *src = (const ubyte*)pInitialDataUP->pSysMem + z*pInitialDataUP->SysMemSlicePitch; -+ util_copy_rect(dst, -+ templat.format, -+ transfer->stride, -+ 0, 0, box.width, box.height, -+ src, -+ pInitialDataUP->SysMemPitch, -+ 0, 0); -+ } -+ pipe_texture_unmap(pipe, transfer); - } -- pipe_transfer_unmap(pipe, transfer); - } - } - } -@@ -423,7 +449,11 @@ DestroyResource(D3D10DDI_HDEVICE hDevice, // IN - - for (UINT SubResource = 0; SubResource < pResource->NumSubResources; ++SubResource) { - if (pResource->transfers[SubResource]) { -- pipe_transfer_unmap(pipe, pResource->transfers[SubResource]); -+ if (pResource->buffer) { -+ pipe_buffer_unmap(pipe, pResource->transfers[SubResource]); -+ } else { -+ pipe_texture_unmap(pipe, pResource->transfers[SubResource]); -+ } - pResource->transfers[SubResource] = NULL; - } - } -@@ -493,12 +523,21 @@ ResourceMap(D3D10DDI_HDEVICE hDevice, // IN - assert(!pResource->transfers[SubResource]); - - void *map; -- map = pipe->transfer_map(pipe, -- resource, -- level, -- usage, -- &box, -- &pResource->transfers[SubResource]); -+ if (pResource->buffer) { -+ map = pipe->buffer_map(pipe, -+ resource, -+ level, -+ usage, -+ &box, -+ &pResource->transfers[SubResource]); -+ } else { -+ map = pipe->texture_map(pipe, -+ resource, -+ level, -+ usage, -+ &box, -+ &pResource->transfers[SubResource]); -+ } - if (!map) { - DebugPrintf("%s: failed to map resource\n", __FUNCTION__); - SetError(hDevice, E_FAIL); -@@ -534,7 +573,11 @@ ResourceUnmap(D3D10DDI_HDEVICE hDevice, // IN - assert(SubResource < pResource->NumSubResources); - - if (pResource->transfers[SubResource]) { -- pipe_transfer_unmap(pipe, pResource->transfers[SubResource]); -+ if (pResource->buffer) { -+ pipe_buffer_unmap(pipe, pResource->transfers[SubResource]); -+ } else { -+ pipe_texture_unmap(pipe, pResource->transfers[SubResource]); -+ } - pResource->transfers[SubResource] = NULL; - } - } -@@ -834,7 +877,8 @@ ResourceUpdateSubResourceUP(D3D10DDI_HDEVICE hDevice, // IN - } - - struct pipe_context *pipe = pDevice->pipe; -- struct pipe_resource *dst_resource = CastPipeResource(hDstResource); -+ Resource *pDstResource = CastResource(hDstResource); -+ struct pipe_resource *dst_resource = pDstResource->resource; - - unsigned level; - struct pipe_box box; -@@ -855,12 +899,21 @@ ResourceUpdateSubResourceUP(D3D10DDI_HDEVICE hDevice, // IN - - struct pipe_transfer *transfer; - void *map; -- map = pipe->transfer_map(pipe, -- dst_resource, -- level, -- PIPE_MAP_WRITE | PIPE_MAP_DISCARD_RANGE, -- &box, -- &transfer); -+ if (pDstResource->buffer) { -+ map = pipe->buffer_map(pipe, -+ dst_resource, -+ level, -+ PIPE_MAP_WRITE | PIPE_MAP_DISCARD_RANGE, -+ &box, -+ &transfer); -+ } else { -+ map = pipe->texture_map(pipe, -+ dst_resource, -+ level, -+ PIPE_MAP_WRITE | PIPE_MAP_DISCARD_RANGE, -+ &box, -+ &transfer); -+ } - assert(map); - if (map) { - for (int z = 0; z < box.depth; ++z) { -@@ -874,7 +927,11 @@ ResourceUpdateSubResourceUP(D3D10DDI_HDEVICE hDevice, // IN - RowPitch, - 0, 0); - } -- pipe_transfer_unmap(pipe, transfer); -+ if (pDstResource->buffer) { -+ pipe_buffer_unmap(pipe, transfer); -+ } else { -+ pipe_texture_unmap(pipe, transfer); -+ } - } - } - -diff --git a/src/gallium/frontends/d3d10umd/ShaderParse.c b/src/gallium/frontends/d3d10umd/ShaderParse.c -index e4b6b88aa72909b6dc02c23dd13e442f9d3f4361..1995d381880d172ac49fe0d4461d439f35cf32b5 100644 ---- a/src/gallium/frontends/d3d10umd/ShaderParse.c -+++ b/src/gallium/frontends/d3d10umd/ShaderParse.c -@@ -392,7 +392,7 @@ Shader_parse_opcode(struct Shader_parser *parser, - if (opcode_is_extended) { - /* NOTE: DECODE_IS_D3D10_SB_OPCODE_DOUBLE_EXTENDED is broken. - */ -- assert(!((*curr & D3D10_SB_OPCODE_DOUBLE_EXTENDED_MASK) >> D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT)); -+ assert(!((*curr & D3D10_SB_OPERAND_DOUBLE_EXTENDED_MASK) >> D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT)); - - switch (DECODE_D3D10_SB_EXTENDED_OPCODE_TYPE(*curr)) { - case D3D10_SB_EXTENDED_OPCODE_EMPTY: -diff --git a/src/gallium/frontends/d3d10umd/ShaderParse.h b/src/gallium/frontends/d3d10umd/ShaderParse.h -index 5e8fba044ab5faf92f78d4f2bb75ec110752adb8..df95536f2b53eef900961f221100d4f2821a0f5d 100644 ---- a/src/gallium/frontends/d3d10umd/ShaderParse.h -+++ b/src/gallium/frontends/d3d10umd/ShaderParse.h -@@ -35,9 +35,6 @@ - - #include "DriverIncludes.h" - --//#include "winddk/winddk_compat.h" --#include "winddk/d3d10tokenizedprogramformat.hpp" -- - #ifdef __cplusplus - extern "C" { - #endif -diff --git a/src/gallium/frontends/d3d10umd/State.h b/src/gallium/frontends/d3d10umd/State.h -index 5cb865ce69573a16e24e14df88e53a0e48c80130..3e45cb797435b40da0a4a1f5476fab2aecca08fd 100644 ---- a/src/gallium/frontends/d3d10umd/State.h -+++ b/src/gallium/frontends/d3d10umd/State.h -@@ -150,6 +150,7 @@ struct Resource - DXGI_FORMAT Format; - UINT MipLevels; - UINT NumSubResources; -+ bool buffer; - struct pipe_resource *resource; - struct pipe_transfer **transfers; - struct pipe_stream_output_target *so_target; -diff --git a/src/gallium/frontends/d3d10umd/meson.build b/src/gallium/frontends/d3d10umd/meson.build -index 90774d9217d3ab5f4267974ae9018f55ab709f42..7141c8da17f7500b2d6e8e20faba9b5c70ab01d8 100644 ---- a/src/gallium/frontends/d3d10umd/meson.build -+++ b/src/gallium/frontends/d3d10umd/meson.build -@@ -14,7 +14,7 @@ libd3d10umd = static_library( - 'Debug.cpp', - 'Device.cpp', - 'Draw.cpp', -- 'Dxgi.cpp', -+ 'DxgiFns.cpp', - 'Format.cpp', - 'InputAssembly.cpp', - 'OutputMerger.cpp', diff --git a/ports/mesa/def-fixes.patch b/ports/mesa/def-fixes.patch new file mode 100644 index 00000000000000..6501872731d6fb --- /dev/null +++ b/ports/mesa/def-fixes.patch @@ -0,0 +1,3571 @@ +diff --git a/bin/gen_vs_module_defs.py b/bin/gen_vs_module_defs.py +new file mode 100644 +index 0000000000000000000000000000000000000000..dff8ab36f92ffbc18dbb2779563c25df567bb7b0 +--- /dev/null ++++ b/bin/gen_vs_module_defs.py +@@ -0,0 +1,98 @@ ++#!/usr/bin/env python3 ++# Copyright Ā© 2021-2021 Yonggang Luo ++ ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to deal ++# in the Software without restriction, including without limitation the rights ++# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++# copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++ ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. ++ ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++# SOFTWARE. ++ ++gen_help = """Generates visual studio module definition file.""" ++ ++import argparse ++ ++""" ++For input template definition file ++For gcc/x64,gcc/arm64,visual studio ++`wglMakeCurrent@8 @357` => `wglMakeCurrent @357` ++`DrvCopyContext@12` => `DrvCopyContext` ++`stw_get_device` => `stw_get_device` ++For gcc/x86,gcc/arm ++`wglMakeCurrent@8 @357` => `wglMakeCurrent@8 @357 == wglMakeCurrent` ++`DrvCopyContext@12` => `DrvCopyContext@12 == DrvCopyContext` ++`stw_get_device` => `stw_get_device` ++ ++""" ++def gen_vs_module_def(in_file: str, out_file: str, compiler_id: str, cpu_family: str) -> None: ++ out_file_lines = ['EXPORTS'] ++ with open(in_file, 'r', encoding='utf-8') as f: ++ lines = f.readlines() ++ for line in lines: ++ line = line.strip() ++ tokens = line.split(';') ++ if not tokens: ++ continue ++ def_infos = [x for x in tokens[0].split(' ') if len(x) > 0] ++ if not def_infos: ++ if line: ++ out_file_lines.append('\t' + line) ++ else: ++ out_file_lines.append('') ++ continue ++ name_infos = def_infos[0].split('@') ++ if not name_infos: ++ out_file_lines.append('\t;' + line) ++ continue ++ order_info = '' if len(def_infos) <= 1 else def_infos[1] ++ if def_infos[0] != name_infos[0] and \ ++ (compiler_id == 'gcc') and (cpu_family not in {'x86_64', 'aarch64'}): ++ if order_info: ++ out_file_lines.append('\t' + def_infos[0] + ' ' + order_info + ' == ' + name_infos[0]) ++ else: ++ out_file_lines.append('\t' + def_infos[0] + ' == ' + name_infos[0]) ++ else: ++ if order_info: ++ out_file_lines.append('\t' + name_infos[0] + ' ' + order_info) ++ else: ++ out_file_lines.append('\t' + name_infos[0]) ++ with open(out_file, 'wb') as f: ++ out_file_content = '\n'.join(out_file_lines) + '\n' ++ f.write(out_file_content.encode('utf-8')) ++''' ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.mingw.def --compiler_id gcc --cpu_family x86 ++ ++''' ++if __name__ == "__main__": ++ parser = argparse.ArgumentParser(description=gen_help) ++ parser.add_argument('--in_file', help='input template moudle definition file') ++ parser.add_argument('--out_file', help='output moudle definition file') ++ parser.add_argument('--compiler_id', help='compiler id') ++ parser.add_argument('--cpu_family', help='cpu family') ++ args = parser.parse_args() ++ # print(args) ++ gen_vs_module_def(args.in_file, args.out_file, args.compiler_id, args.cpu_family) +diff --git a/bin/meson.build b/bin/meson.build +index 000abef770966c4baecd0b47922f42c532a8c2cf..1b7301585f9e4b0f0556ce2ae11b03b128ab4677 100644 +--- a/bin/meson.build ++++ b/bin/meson.build +@@ -19,5 +19,6 @@ + # SOFTWARE. + + git_sha1_gen_py = files('git_sha1_gen.py') ++gen_vs_module_defs_py = files('gen_vs_module_defs.py') + symbols_check = find_program('symbols-check.py') + install_megadrivers_py = find_program('install_megadrivers.py') +diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build +index 523782f281f650d0558af64a0c0a2bf77c217e1e..b6ecd999e71ab3ecb780af4fa2146c617e3c8e41 100644 +--- a/src/amd/vulkan/meson.build ++++ b/src/amd/vulkan/meson.build +@@ -149,12 +149,10 @@ if with_ld_version_script + libvulkan_radeon_link_depends += files('vulkan.sym') + endif + +-vulkan_radv_def = 'vulkan_radv.def' +- + libvulkan_radeon = shared_library( + 'vulkan_radeon', + [libradv_files, radv_entrypoints, sha1_h], +- vs_module_defs : vulkan_radv_def, ++ vs_module_defs : vulkan_api_def, + include_directories : [ + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, + ], +diff --git a/src/amd/vulkan/vulkan_radv.def b/src/amd/vulkan/vulkan_radv.def +deleted file mode 100644 +index 64a9caae59398a4768f663f18f8598476991f85c..0000000000000000000000000000000000000000 +--- a/src/amd/vulkan/vulkan_radv.def ++++ /dev/null +@@ -1,4 +0,0 @@ +-EXPORTS +-vk_icdNegotiateLoaderICDInterfaceVersion +-vk_icdGetInstanceProcAddr +-vk_icdGetPhysicalDeviceProcAddr +diff --git a/src/egl/main/egl.def b/src/egl/main/egl.def +deleted file mode 100644 +index 54ae76b330929db865dc4ef0fd1723a88dc47979..0000000000000000000000000000000000000000 +--- a/src/egl/main/egl.def ++++ /dev/null +@@ -1,47 +0,0 @@ +-EXPORTS +- eglBindAPI +- eglBindTexImage +- eglChooseConfig +- eglClientWaitSync +- eglCopyBuffers +- eglCreateContext +- eglCreateImage +- eglCreatePbufferFromClientBuffer +- eglCreatePbufferSurface +- eglCreatePixmapSurface +- eglCreatePlatformPixmapSurface +- eglCreatePlatformWindowSurface +- eglCreateSync +- eglCreateWindowSurface +- eglDestroyContext +- eglDestroyImage +- eglDestroySurface +- eglDestroySync +- eglGetConfigAttrib +- eglGetConfigs +- eglGetCurrentContext +- eglGetCurrentDisplay +- eglGetCurrentSurface +- eglGetDisplay +- eglGetError +- eglGetPlatformDisplay +- eglGetProcAddress +- eglGetSyncAttrib +- eglInitialize +- eglMakeCurrent +- eglQueryAPI +- eglQueryContext +- eglQueryString +- eglQuerySurface +- eglReleaseTexImage +- eglReleaseThread +- eglSurfaceAttrib +- eglSwapBuffers +- eglSwapInterval +- eglTerminate +- eglWaitClient +- eglWaitGL +- eglWaitNative +- eglWaitSync +- MesaGLInteropEGLQueryDeviceInfo +- MesaGLInteropEGLExportObject +diff --git a/src/egl/main/egl.def.in b/src/egl/main/egl.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..b2439d9a2caaef26b48e737c8f6cd8314398ddeb +--- /dev/null ++++ b/src/egl/main/egl.def.in +@@ -0,0 +1,49 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++eglBindAPI@4 ++eglBindTexImage@12 ++eglChooseConfig@20 ++eglClientWaitSync@20 ++eglCopyBuffers@12 ++eglCreateContext@16 ++eglCreateImage@20 ++eglCreatePbufferFromClientBuffer@20 ++eglCreatePbufferSurface@12 ++eglCreatePixmapSurface@16 ++eglCreatePlatformPixmapSurface@16 ++eglCreatePlatformWindowSurface@16 ++eglCreateSync@12 ++eglCreateWindowSurface@16 ++eglDestroyContext@8 ++eglDestroyImage@8 ++eglDestroySurface@8 ++eglDestroySync@8 ++eglGetConfigAttrib@16 ++eglGetConfigs@16 ++eglGetCurrentContext@0 ++eglGetCurrentDisplay@0 ++eglGetCurrentSurface@4 ++eglGetDisplay@4 ++eglGetError@0 ++eglGetPlatformDisplay@12 ++eglGetProcAddress@4 ++eglGetSyncAttrib@16 ++eglInitialize@12 ++eglMakeCurrent@16 ++eglQueryAPI@0 ++eglQueryContext@16 ++eglQueryString@8 ++eglQuerySurface@16 ++eglReleaseTexImage@12 ++eglReleaseThread@0 ++eglSurfaceAttrib@16 ++eglSwapBuffers@8 ++eglSwapInterval@8 ++eglTerminate@4 ++eglWaitClient@0 ++eglWaitGL@0 ++eglWaitNative@4 ++eglWaitSync@12 ++ ++; __cdecl calling convention have no @number suffix ++MesaGLInteropEGLQueryDeviceInfo ++MesaGLInteropEGLExportObject +diff --git a/src/egl/meson.build b/src/egl/meson.build +index 315a95013f39b76a47067073f106eda518dc6b71..53044297322ad6ea3137bd1fe48b778a61608f5e 100644 +--- a/src/egl/meson.build ++++ b/src/egl/meson.build +@@ -177,6 +177,15 @@ else + ) + endif + ++egl_def = custom_target( ++ 'egl.def', ++ input: 'main/egl.def.in', ++ output : 'egl.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + libegl = shared_library( + egl_lib_name, + files_egl, +@@ -194,7 +203,7 @@ libegl = shared_library( + version : egl_lib_version, + soversion : egl_lib_soversion, + name_prefix : 'lib', # even on windows +- vs_module_defs : 'main/egl.def' ++ vs_module_defs : egl_def + ) + + if not with_glvnd +diff --git a/src/gallium/frontends/d3d10umd/d3d10_sw.def b/src/gallium/frontends/d3d10umd/d3d10_sw.def +deleted file mode 100644 +index 5b76bfccefaabc9c09e000ffab579d1487a3a31c..0000000000000000000000000000000000000000 +--- a/src/gallium/frontends/d3d10umd/d3d10_sw.def ++++ /dev/null +@@ -1,53 +0,0 @@ +-EXPORTS +- OpenAdapter10 +- OpenAdapter10_2 +- D3DKMTAcquireKeyedMutex +- D3DKMTCloseAdapter +- D3DKMTConfigureSharedResource +- D3DKMTCreateAllocation +- D3DKMTCreateAllocation2 +- D3DKMTCreateContext +- D3DKMTCreateDevice +- D3DKMTCreateKeyedMutex +- D3DKMTCreateSynchronizationObject +- D3DKMTCreateSynchronizationObject2 +- D3DKMTDestroyAllocation +- D3DKMTDestroyContext +- D3DKMTDestroyDevice +- D3DKMTDestroyKeyedMutex +- D3DKMTDestroySynchronizationObject +- D3DKMTEscape +- D3DKMTGetContextSchedulingPriority +- ;D3DKMTGetDeviceSchedulingPriority +- D3DKMTGetDeviceState +- D3DKMTGetDisplayModeList +- D3DKMTGetMultisampleMethodList +- D3DKMTGetRuntimeData +- D3DKMTGetSharedPrimaryHandle +- D3DKMTLock +- D3DKMTOpenAdapterFromDeviceName +- D3DKMTOpenAdapterFromGdiDisplayName +- D3DKMTOpenKeyedMutex +- D3DKMTOpenResource +- D3DKMTOpenResource2 +- D3DKMTOpenSynchronizationObject +- D3DKMTPresent +- D3DKMTQueryAdapterInfo +- D3DKMTQueryAllocationResidency +- D3DKMTQueryResourceInfo +- D3DKMTReleaseKeyedMutex +- D3DKMTRender +- D3DKMTSetAllocationPriority +- D3DKMTSetContextSchedulingPriority +- ;D3DKMTSetDeviceSchedulingPriority +- D3DKMTSetDisplayMode +- D3DKMTSetDisplayPrivateDriverFormat +- D3DKMTSetGammaRamp +- D3DKMTSetVidPnSourceOwner +- D3DKMTSetVidPnSourceOwner1 +- D3DKMTSignalSynchronizationObject +- D3DKMTSignalSynchronizationObject2 +- D3DKMTUnlock +- D3DKMTWaitForSynchronizationObject +- D3DKMTWaitForSynchronizationObject2 +- D3DKMTWaitForVerticalBlankEvent +diff --git a/src/gallium/frontends/osmesa/meson.build b/src/gallium/frontends/osmesa/meson.build +index e5848fd9934afc22119a14122e6c2d095ab8f350..fe78a4daa31bb01bf8535ff4498172241e554610 100644 +--- a/src/gallium/frontends/osmesa/meson.build ++++ b/src/gallium/frontends/osmesa/meson.build +@@ -20,7 +20,7 @@ + + osmesa_st_c_args = [] + if with_platform_windows +- osmesa_st_c_args += ['-DBUILD_GL32', '-DWIN32_LEAN_AND_MEAN'] ++ osmesa_st_c_args += ['-DWIN32_LEAN_AND_MEAN'] + if not with_shared_glapi + osmesa_st_c_args += ['-D_GLAPI_NO_EXPORTS'] + endif +diff --git a/src/gallium/targets/d3d10sw/d3d10_sw.def.in b/src/gallium/targets/d3d10sw/d3d10_sw.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..a81de54c4d285c67b1dd9a6da855a65446239831 +--- /dev/null ++++ b/src/gallium/targets/d3d10sw/d3d10_sw.def.in +@@ -0,0 +1,76 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++OpenAdapter10@4 ++OpenAdapter10_2@4 ++D3DKMTAcquireKeyedMutex@4 ++;D3DKMTCheckExclusiveOwnership@0 ++;D3DKMTCheckMonitorPowerState@4 ++;D3DKMTCheckOcclusion@4 ++;D3DKMTCheckSharedResourceAccess@4 ++;D3DKMTCheckVidPnExclusiveOwnership@4 ++D3DKMTCloseAdapter@4 ++D3DKMTConfigureSharedResource@4 ++D3DKMTCreateAllocation2@4 ++D3DKMTCreateAllocation@4 ++D3DKMTCreateContext@4 ++;D3DKMTCreateDCFromMemory@4 ++D3DKMTCreateDevice@4 ++D3DKMTCreateKeyedMutex@4 ++;D3DKMTCreateOverlay@4 ++D3DKMTCreateSynchronizationObject2@4 ++D3DKMTCreateSynchronizationObject@4 ++D3DKMTDestroyAllocation@4 ++D3DKMTDestroyContext@4 ++;D3DKMTDestroyDCFromMemory@4 ++D3DKMTDestroyDevice@4 ++D3DKMTDestroyKeyedMutex@4 ++;D3DKMTDestroyOverlay@4 ++D3DKMTDestroySynchronizationObject@4 ++D3DKMTEscape@4 ++;D3DKMTFlipOverlay@4 ++D3DKMTGetContextSchedulingPriority@4 ++D3DKMTGetDeviceState@4 ++D3DKMTGetDisplayModeList@4 ++D3DKMTGetMultisampleMethodList@4 ++;D3DKMTGetOverlayState@4 ++;D3DKMTGetPresentHistory@4 ++;D3DKMTGetPresentQueueEvent@8 ++;D3DKMTGetProcessSchedulingPriorityClass@8 ++D3DKMTGetRuntimeData@4 ++;D3DKMTGetScanLine@4 ++D3DKMTGetSharedPrimaryHandle@4 ++;D3DKMTInvalidateActiveVidPn@4 ++D3DKMTLock@4 ++D3DKMTOpenAdapterFromDeviceName@4 ++D3DKMTOpenAdapterFromGdiDisplayName@4 ++;D3DKMTOpenAdapterFromHdc@4 ++D3DKMTOpenKeyedMutex@4 ++D3DKMTOpenResource2@4 ++D3DKMTOpenResource@4 ++D3DKMTOpenSynchronizationObject@4 ++;D3DKMTPollDisplayChildren@4 ++D3DKMTPresent@4 ++D3DKMTQueryAdapterInfo@4 ++D3DKMTQueryAllocationResidency@4 ++D3DKMTQueryResourceInfo@4 ++;D3DKMTQueryStatistics@4 ++D3DKMTReleaseKeyedMutex@4 ++;D3DKMTReleaseProcessVidPnSourceOwners@4 ++D3DKMTRender@4 ++D3DKMTSetAllocationPriority@4 ++D3DKMTSetContextSchedulingPriority@4 ++D3DKMTSetDisplayMode@4 ++D3DKMTSetDisplayPrivateDriverFormat@4 ++D3DKMTSetGammaRamp@4 ++;D3DKMTSetProcessSchedulingPriorityClass@8 ++;D3DKMTSetQueuedLimit@4 ++D3DKMTSetVidPnSourceOwner@4 ++;D3DKMTSharedPrimaryLockNotification@4 ++;D3DKMTSharedPrimaryUnLockNotification@4 ++D3DKMTSignalSynchronizationObject2@4 ++D3DKMTSignalSynchronizationObject@4 ++D3DKMTUnlock@4 ++;D3DKMTUpdateOverlay@4 ++;D3DKMTWaitForIdle@4 ++D3DKMTWaitForSynchronizationObject2@4 ++D3DKMTWaitForSynchronizationObject@4 ++D3DKMTWaitForVerticalBlankEvent@4 +diff --git a/src/gallium/targets/d3d10sw/meson.build b/src/gallium/targets/d3d10sw/meson.build +index fe8632d3c7ff3f1a61a20f6bd88f25e697316e10..8b90c561152f96be787f838467d0e3407a1bd134 100644 +--- a/src/gallium/targets/d3d10sw/meson.build ++++ b/src/gallium/targets/d3d10sw/meson.build +@@ -19,20 +19,22 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + # SOFTWARE. + +-d3d10sw_def = files('../../frontends/d3d10umd/d3d10_sw.def')[0] +-_link_args_d3d10sw = [] +-if cc.get_id() == 'gcc' +- _link_args_d3d10sw += '-Wl,--enable-stdcall-fixup' +-endif ++d3d10_sw_def = custom_target( ++ 'd3d10_sw.def', ++ input: 'd3d10_sw.def.in', ++ output : 'd3d10_sw.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libd3d10sw = shared_library( + 'd3d10sw', + ['d3d10_gdi.c'], +- vs_module_defs : d3d10sw_def, ++ vs_module_defs : d3d10_sw_def, + include_directories : [ + inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_d3d10umd, inc_gallium_winsys, inc_gallium_winsys_sw, inc_gallium_drivers, + ], +- link_args : _link_args_d3d10sw, + link_whole : [libd3d10umd], + link_with : [ + libgallium, libwsgdi +diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build +index f2b363099ae154b71efd7c217598e0eb48ff3a0c..bda4fbc574d7f5d7ca2b903ff928c72951022132 100644 +--- a/src/gallium/targets/lavapipe/meson.build ++++ b/src/gallium/targets/lavapipe/meson.build +@@ -1,14 +1,9 @@ + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- vulkan_lvp_def = 'vulkan_lvp.mingw.def' +-else +- vulkan_lvp_def = 'vulkan_lvp.def' +-endif + + libvulkan_lvp = shared_library( + 'vulkan_lvp', + [ 'target.c' ], +- vs_module_defs : vulkan_lvp_def, ++ vs_module_defs : vulkan_api_def, + include_directories : [ inc_src, inc_util, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers ], + link_whole : [ liblavapipe_st ], + link_with : [libpipe_loader_static, libgallium, libwsw, libswdri, libws_null, libswkmsdri ], +diff --git a/src/gallium/targets/lavapipe/vulkan_lvp.def b/src/gallium/targets/lavapipe/vulkan_lvp.def +deleted file mode 100644 +index 64a9caae59398a4768f663f18f8598476991f85c..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/lavapipe/vulkan_lvp.def ++++ /dev/null +@@ -1,4 +0,0 @@ +-EXPORTS +-vk_icdNegotiateLoaderICDInterfaceVersion +-vk_icdGetInstanceProcAddr +-vk_icdGetPhysicalDeviceProcAddr +diff --git a/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def b/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def +deleted file mode 100644 +index c9638323ab044f072ad30f5089074909f769b8d4..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def ++++ /dev/null +@@ -1,4 +0,0 @@ +-EXPORTS +-vk_icdNegotiateLoaderICDInterfaceVersion@4 +-vk_icdGetInstanceProcAddr = vk_icdGetInstanceProcAddr@8 +-vk_icdGetPhysicalDeviceProcAddr = vk_icdGetPhysicalDeviceProcAddr@8 +diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build +index 25300000221d44c7d669ec49df1fb88396f5c968..b333eae0f34227b0dfd1abc08006680ea5359224 100644 +--- a/src/gallium/targets/libgl-gdi/meson.build ++++ b/src/gallium/targets/libgl-gdi/meson.build +@@ -20,20 +20,20 @@ + + + opengl32_link_args = [] +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- opengl32_link_args += ['-Wl,--enable-stdcall-fixup'] +-endif + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- ogl_def = 'opengl32.mingw.def' +-else +- ogl_def = 'opengl32.def' +-endif ++opengl32_def = custom_target( ++ 'opengl32.def', ++ input: 'opengl32.def.in', ++ output : 'opengl32.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libopengl32 = shared_library( + 'opengl32', + ['stw_wgl.c'], +- vs_module_defs : ogl_def, ++ vs_module_defs : opengl32_def, + include_directories : [ + inc_include, inc_wgl, inc_src, + ], +diff --git a/src/gallium/targets/libgl-gdi/opengl32.def b/src/gallium/targets/libgl-gdi/opengl32.def +deleted file mode 100644 +index d89f0bdb52ab65dc8c1ebb8b9ff79eaf5da41fd8..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/libgl-gdi/opengl32.def ++++ /dev/null +@@ -1,388 +0,0 @@ +-EXPORTS +-; GlmfBeginGlsBlock @1 +-; GlmfCloseMetaFile @2 +-; GlmfEndGlsBlock @3 +-; GlmfEndPlayback @4 +-; GlmfInitPlayback @5 +-; GlmfPlayGlsRecord @6 +- glAccum @7 +- glAlphaFunc @8 +- glAreTexturesResident @9 +- glArrayElement @10 +- glBegin @11 +- glBindTexture @12 +- glBitmap @13 +- glBlendFunc @14 +- glCallList @15 +- glCallLists @16 +- glClear @17 +- glClearAccum @18 +- glClearColor @19 +- glClearDepth @20 +- glClearIndex @21 +- glClearStencil @22 +- glClipPlane @23 +- glColor3b @24 +- glColor3bv @25 +- glColor3d @26 +- glColor3dv @27 +- glColor3f @28 +- glColor3fv @29 +- glColor3i @30 +- glColor3iv @31 +- glColor3s @32 +- glColor3sv @33 +- glColor3ub @34 +- glColor3ubv @35 +- glColor3ui @36 +- glColor3uiv @37 +- glColor3us @38 +- glColor3usv @39 +- glColor4b @40 +- glColor4bv @41 +- glColor4d @42 +- glColor4dv @43 +- glColor4f @44 +- glColor4fv @45 +- glColor4i @46 +- glColor4iv @47 +- glColor4s @48 +- glColor4sv @49 +- glColor4ub @50 +- glColor4ubv @51 +- glColor4ui @52 +- glColor4uiv @53 +- glColor4us @54 +- glColor4usv @55 +- glColorMask @56 +- glColorMaterial @57 +- glColorPointer @58 +- glCopyPixels @59 +- glCopyTexImage1D @60 +- glCopyTexImage2D @61 +- glCopyTexSubImage1D @62 +- glCopyTexSubImage2D @63 +- glCullFace @64 +-; glDebugEntry @65 +- glDeleteLists @66 +- glDeleteTextures @67 +- glDepthFunc @68 +- glDepthMask @69 +- glDepthRange @70 +- glDisable @71 +- glDisableClientState @72 +- glDrawArrays @73 +- glDrawBuffer @74 +- glDrawElements @75 +- glDrawPixels @76 +- glEdgeFlag @77 +- glEdgeFlagPointer @78 +- glEdgeFlagv @79 +- glEnable @80 +- glEnableClientState @81 +- glEnd @82 +- glEndList @83 +- glEvalCoord1d @84 +- glEvalCoord1dv @85 +- glEvalCoord1f @86 +- glEvalCoord1fv @87 +- glEvalCoord2d @88 +- glEvalCoord2dv @89 +- glEvalCoord2f @90 +- glEvalCoord2fv @91 +- glEvalMesh1 @92 +- glEvalMesh2 @93 +- glEvalPoint1 @94 +- glEvalPoint2 @95 +- glFeedbackBuffer @96 +- glFinish @97 +- glFlush @98 +- glFogf @99 +- glFogfv @100 +- glFogi @101 +- glFogiv @102 +- glFrontFace @103 +- glFrustum @104 +- glGenLists @105 +- glGenTextures @106 +- glGetBooleanv @107 +- glGetClipPlane @108 +- glGetDoublev @109 +- glGetError @110 +- glGetFloatv @111 +- glGetIntegerv @112 +- glGetLightfv @113 +- glGetLightiv @114 +- glGetMapdv @115 +- glGetMapfv @116 +- glGetMapiv @117 +- glGetMaterialfv @118 +- glGetMaterialiv @119 +- glGetPixelMapfv @120 +- glGetPixelMapuiv @121 +- glGetPixelMapusv @122 +- glGetPointerv @123 +- glGetPolygonStipple @124 +- glGetString @125 +- glGetTexEnvfv @126 +- glGetTexEnviv @127 +- glGetTexGendv @128 +- glGetTexGenfv @129 +- glGetTexGeniv @130 +- glGetTexImage @131 +- glGetTexLevelParameterfv @132 +- glGetTexLevelParameteriv @133 +- glGetTexParameterfv @134 +- glGetTexParameteriv @135 +- glHint @136 +- glIndexMask @137 +- glIndexPointer @138 +- glIndexd @139 +- glIndexdv @140 +- glIndexf @141 +- glIndexfv @142 +- glIndexi @143 +- glIndexiv @144 +- glIndexs @145 +- glIndexsv @146 +- glIndexub @147 +- glIndexubv @148 +- glInitNames @149 +- glInterleavedArrays @150 +- glIsEnabled @151 +- glIsList @152 +- glIsTexture @153 +- glLightModelf @154 +- glLightModelfv @155 +- glLightModeli @156 +- glLightModeliv @157 +- glLightf @158 +- glLightfv @159 +- glLighti @160 +- glLightiv @161 +- glLineStipple @162 +- glLineWidth @163 +- glListBase @164 +- glLoadIdentity @165 +- glLoadMatrixd @166 +- glLoadMatrixf @167 +- glLoadName @168 +- glLogicOp @169 +- glMap1d @170 +- glMap1f @171 +- glMap2d @172 +- glMap2f @173 +- glMapGrid1d @174 +- glMapGrid1f @175 +- glMapGrid2d @176 +- glMapGrid2f @177 +- glMaterialf @178 +- glMaterialfv @179 +- glMateriali @180 +- glMaterialiv @181 +- glMatrixMode @182 +- glMultMatrixd @183 +- glMultMatrixf @184 +- glNewList @185 +- glNormal3b @186 +- glNormal3bv @187 +- glNormal3d @188 +- glNormal3dv @189 +- glNormal3f @190 +- glNormal3fv @191 +- glNormal3i @192 +- glNormal3iv @193 +- glNormal3s @194 +- glNormal3sv @195 +- glNormalPointer @196 +- glOrtho @197 +- glPassThrough @198 +- glPixelMapfv @199 +- glPixelMapuiv @200 +- glPixelMapusv @201 +- glPixelStoref @202 +- glPixelStorei @203 +- glPixelTransferf @204 +- glPixelTransferi @205 +- glPixelZoom @206 +- glPointSize @207 +- glPolygonMode @208 +- glPolygonOffset @209 +- glPolygonStipple @210 +- glPopAttrib @211 +- glPopClientAttrib @212 +- glPopMatrix @213 +- glPopName @214 +- glPrioritizeTextures @215 +- glPushAttrib @216 +- glPushClientAttrib @217 +- glPushMatrix @218 +- glPushName @219 +- glRasterPos2d @220 +- glRasterPos2dv @221 +- glRasterPos2f @222 +- glRasterPos2fv @223 +- glRasterPos2i @224 +- glRasterPos2iv @225 +- glRasterPos2s @226 +- glRasterPos2sv @227 +- glRasterPos3d @228 +- glRasterPos3dv @229 +- glRasterPos3f @230 +- glRasterPos3fv @231 +- glRasterPos3i @232 +- glRasterPos3iv @233 +- glRasterPos3s @234 +- glRasterPos3sv @235 +- glRasterPos4d @236 +- glRasterPos4dv @237 +- glRasterPos4f @238 +- glRasterPos4fv @239 +- glRasterPos4i @240 +- glRasterPos4iv @241 +- glRasterPos4s @242 +- glRasterPos4sv @243 +- glReadBuffer @244 +- glReadPixels @245 +- glRectd @246 +- glRectdv @247 +- glRectf @248 +- glRectfv @249 +- glRecti @250 +- glRectiv @251 +- glRects @252 +- glRectsv @253 +- glRenderMode @254 +- glRotated @255 +- glRotatef @256 +- glScaled @257 +- glScalef @258 +- glScissor @259 +- glSelectBuffer @260 +- glShadeModel @261 +- glStencilFunc @262 +- glStencilMask @263 +- glStencilOp @264 +- glTexCoord1d @265 +- glTexCoord1dv @266 +- glTexCoord1f @267 +- glTexCoord1fv @268 +- glTexCoord1i @269 +- glTexCoord1iv @270 +- glTexCoord1s @271 +- glTexCoord1sv @272 +- glTexCoord2d @273 +- glTexCoord2dv @274 +- glTexCoord2f @275 +- glTexCoord2fv @276 +- glTexCoord2i @277 +- glTexCoord2iv @278 +- glTexCoord2s @279 +- glTexCoord2sv @280 +- glTexCoord3d @281 +- glTexCoord3dv @282 +- glTexCoord3f @283 +- glTexCoord3fv @284 +- glTexCoord3i @285 +- glTexCoord3iv @286 +- glTexCoord3s @287 +- glTexCoord3sv @288 +- glTexCoord4d @289 +- glTexCoord4dv @290 +- glTexCoord4f @291 +- glTexCoord4fv @292 +- glTexCoord4i @293 +- glTexCoord4iv @294 +- glTexCoord4s @295 +- glTexCoord4sv @296 +- glTexCoordPointer @297 +- glTexEnvf @298 +- glTexEnvfv @299 +- glTexEnvi @300 +- glTexEnviv @301 +- glTexGend @302 +- glTexGendv @303 +- glTexGenf @304 +- glTexGenfv @305 +- glTexGeni @306 +- glTexGeniv @307 +- glTexImage1D @308 +- glTexImage2D @309 +- glTexParameterf @310 +- glTexParameterfv @311 +- glTexParameteri @312 +- glTexParameteriv @313 +- glTexSubImage1D @314 +- glTexSubImage2D @315 +- glTranslated @316 +- glTranslatef @317 +- glVertex2d @318 +- glVertex2dv @319 +- glVertex2f @320 +- glVertex2fv @321 +- glVertex2i @322 +- glVertex2iv @323 +- glVertex2s @324 +- glVertex2sv @325 +- glVertex3d @326 +- glVertex3dv @327 +- glVertex3f @328 +- glVertex3fv @329 +- glVertex3i @330 +- glVertex3iv @331 +- glVertex3s @332 +- glVertex3sv @333 +- glVertex4d @334 +- glVertex4dv @335 +- glVertex4f @336 +- glVertex4fv @337 +- glVertex4i @338 +- glVertex4iv @339 +- glVertex4s @340 +- glVertex4sv @341 +- glVertexPointer @342 +- glViewport @343 +- wglChoosePixelFormat @344 +- wglCopyContext @345 +- wglCreateContext @346 +- wglCreateLayerContext @347 +- wglDeleteContext @348 +- wglDescribeLayerPlane @349 +- wglDescribePixelFormat @350 +- wglGetCurrentContext @351 +- wglGetCurrentDC @352 +-; wglGetDefaultProcAddress @353 +- wglGetLayerPaletteEntries @354 +- wglGetPixelFormat @355 +- wglGetProcAddress @356 +- wglMakeCurrent @357 +- wglRealizeLayerPalette @358 +- wglSetLayerPaletteEntries @359 +- wglSetPixelFormat @360 +- wglShareLists @361 +- wglSwapBuffers @362 +- wglSwapLayerBuffers @363 +- wglSwapMultipleBuffers @364 +- wglUseFontBitmapsA @365 +- wglUseFontBitmapsW @366 +- wglUseFontOutlinesA @367 +- wglUseFontOutlinesW @368 +- DrvCopyContext +- DrvCreateContext +- DrvCreateLayerContext +- DrvDeleteContext +- DrvDescribeLayerPlane +- DrvDescribePixelFormat +- DrvGetLayerPaletteEntries +- DrvGetProcAddress +- DrvPresentBuffers +- DrvRealizeLayerPalette +- DrvReleaseContext +- DrvSetCallbackProcs +- DrvSetContext +- DrvSetLayerPaletteEntries +- DrvSetPixelFormat +- DrvShareLists +- DrvSwapBuffers +- DrvSwapLayerBuffers +- DrvValidateVersion +diff --git a/src/gallium/targets/libgl-gdi/opengl32.def.in b/src/gallium/targets/libgl-gdi/opengl32.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..ceffdf09936f95506090d79a99ef95ef89cc7ddc +--- /dev/null ++++ b/src/gallium/targets/libgl-gdi/opengl32.def.in +@@ -0,0 +1,389 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++;GlmfBeginGlsBlock@4 @1 ++;GlmfCloseMetaFile@4 @2 ++;GlmfEndGlsBlock@4 @3 ++;GlmfEndPlayback@4 @4 ++;GlmfInitPlayback@12 @5 ++;GlmfPlayGlsRecord@16 @6 ++glAccum@8 @7 ++glAlphaFunc@8 @8 ++glAreTexturesResident@12 @9 ++glArrayElement@4 @10 ++glBegin@4 @11 ++glBindTexture@8 @12 ++glBitmap@28 @13 ++glBlendFunc@8 @14 ++glCallList@4 @15 ++glCallLists@12 @16 ++glClear@4 @17 ++glClearAccum@16 @18 ++glClearColor@16 @19 ++glClearDepth@8 @20 ++glClearIndex@4 @21 ++glClearStencil@4 @22 ++glClipPlane@8 @23 ++glColor3b@12 @24 ++glColor3bv@4 @25 ++glColor3d@24 @26 ++glColor3dv@4 @27 ++glColor3f@12 @28 ++glColor3fv@4 @29 ++glColor3i@12 @30 ++glColor3iv@4 @31 ++glColor3s@12 @32 ++glColor3sv@4 @33 ++glColor3ub@12 @34 ++glColor3ubv@4 @35 ++glColor3ui@12 @36 ++glColor3uiv@4 @37 ++glColor3us@12 @38 ++glColor3usv@4 @39 ++glColor4b@16 @40 ++glColor4bv@4 @41 ++glColor4d@32 @42 ++glColor4dv@4 @43 ++glColor4f@16 @44 ++glColor4fv@4 @45 ++glColor4i@16 @46 ++glColor4iv@4 @47 ++glColor4s@16 @48 ++glColor4sv@4 @49 ++glColor4ub@16 @50 ++glColor4ubv@4 @51 ++glColor4ui@16 @52 ++glColor4uiv@4 @53 ++glColor4us@16 @54 ++glColor4usv@4 @55 ++glColorMask@16 @56 ++glColorMaterial@8 @57 ++glColorPointer@16 @58 ++glCopyPixels@20 @59 ++glCopyTexImage1D@28 @60 ++glCopyTexImage2D@32 @61 ++glCopyTexSubImage1D@24 @62 ++glCopyTexSubImage2D@32 @63 ++glCullFace@4 @64 ++;glDebugEntry@8 @65 ++glDeleteLists@8 @66 ++glDeleteTextures@8 @67 ++glDepthFunc@4 @68 ++glDepthMask@4 @69 ++glDepthRange@16 @70 ++glDisable@4 @71 ++glDisableClientState@4 @72 ++glDrawArrays@12 @73 ++glDrawBuffer@4 @74 ++glDrawElements@16 @75 ++glDrawPixels@20 @76 ++glEdgeFlag@4 @77 ++glEdgeFlagPointer@8 @78 ++glEdgeFlagv@4 @79 ++glEnable@4 @80 ++glEnableClientState@4 @81 ++glEnd@0 @82 ++glEndList@0 @83 ++glEvalCoord1d@8 @84 ++glEvalCoord1dv@4 @85 ++glEvalCoord1f@4 @86 ++glEvalCoord1fv@4 @87 ++glEvalCoord2d@16 @88 ++glEvalCoord2dv@4 @89 ++glEvalCoord2f@8 @90 ++glEvalCoord2fv@4 @91 ++glEvalMesh1@12 @92 ++glEvalMesh2@20 @93 ++glEvalPoint1@4 @94 ++glEvalPoint2@8 @95 ++glFeedbackBuffer@12 @96 ++glFinish@0 @97 ++glFlush@0 @98 ++glFogf@8 @99 ++glFogfv@8 @100 ++glFogi@8 @101 ++glFogiv@8 @102 ++glFrontFace@4 @103 ++glFrustum@48 @104 ++glGenLists@4 @105 ++glGenTextures@8 @106 ++glGetBooleanv@8 @107 ++glGetClipPlane@8 @108 ++glGetDoublev@8 @109 ++glGetError@0 @110 ++glGetFloatv@8 @111 ++glGetIntegerv@8 @112 ++glGetLightfv@12 @113 ++glGetLightiv@12 @114 ++glGetMapdv@12 @115 ++glGetMapfv@12 @116 ++glGetMapiv@12 @117 ++glGetMaterialfv@12 @118 ++glGetMaterialiv@12 @119 ++glGetPixelMapfv@8 @120 ++glGetPixelMapuiv@8 @121 ++glGetPixelMapusv@8 @122 ++glGetPointerv@8 @123 ++glGetPolygonStipple@4 @124 ++glGetString@4 @125 ++glGetTexEnvfv@12 @126 ++glGetTexEnviv@12 @127 ++glGetTexGendv@12 @128 ++glGetTexGenfv@12 @129 ++glGetTexGeniv@12 @130 ++glGetTexImage@20 @131 ++glGetTexLevelParameterfv@16 @132 ++glGetTexLevelParameteriv@16 @133 ++glGetTexParameterfv@12 @134 ++glGetTexParameteriv@12 @135 ++glHint@8 @136 ++glIndexMask@4 @137 ++glIndexPointer@12 @138 ++glIndexd@8 @139 ++glIndexdv@4 @140 ++glIndexf@4 @141 ++glIndexfv@4 @142 ++glIndexi@4 @143 ++glIndexiv@4 @144 ++glIndexs@4 @145 ++glIndexsv@4 @146 ++glIndexub@4 @147 ++glIndexubv@4 @148 ++glInitNames@0 @149 ++glInterleavedArrays@12 @150 ++glIsEnabled@4 @151 ++glIsList@4 @152 ++glIsTexture@4 @153 ++glLightModelf@8 @154 ++glLightModelfv@8 @155 ++glLightModeli@8 @156 ++glLightModeliv@8 @157 ++glLightf@12 @158 ++glLightfv@12 @159 ++glLighti@12 @160 ++glLightiv@12 @161 ++glLineStipple@8 @162 ++glLineWidth@4 @163 ++glListBase@4 @164 ++glLoadIdentity@0 @165 ++glLoadMatrixd@4 @166 ++glLoadMatrixf@4 @167 ++glLoadName@4 @168 ++glLogicOp@4 @169 ++glMap1d@32 @170 ++glMap1f@24 @171 ++glMap2d@56 @172 ++glMap2f@40 @173 ++glMapGrid1d@20 @174 ++glMapGrid1f@12 @175 ++glMapGrid2d@40 @176 ++glMapGrid2f@24 @177 ++glMaterialf@12 @178 ++glMaterialfv@12 @179 ++glMateriali@12 @180 ++glMaterialiv@12 @181 ++glMatrixMode@4 @182 ++glMultMatrixd@4 @183 ++glMultMatrixf@4 @184 ++glNewList@8 @185 ++glNormal3b@12 @186 ++glNormal3bv@4 @187 ++glNormal3d@24 @188 ++glNormal3dv@4 @189 ++glNormal3f@12 @190 ++glNormal3fv@4 @191 ++glNormal3i@12 @192 ++glNormal3iv@4 @193 ++glNormal3s@12 @194 ++glNormal3sv@4 @195 ++glNormalPointer@12 @196 ++glOrtho@48 @197 ++glPassThrough@4 @198 ++glPixelMapfv@12 @199 ++glPixelMapuiv@12 @200 ++glPixelMapusv@12 @201 ++glPixelStoref@8 @202 ++glPixelStorei@8 @203 ++glPixelTransferf@8 @204 ++glPixelTransferi@8 @205 ++glPixelZoom@8 @206 ++glPointSize@4 @207 ++glPolygonMode@8 @208 ++glPolygonOffset@8 @209 ++glPolygonStipple@4 @210 ++glPopAttrib@0 @211 ++glPopClientAttrib@0 @212 ++glPopMatrix@0 @213 ++glPopName@0 @214 ++glPrioritizeTextures@12 @215 ++glPushAttrib@4 @216 ++glPushClientAttrib@4 @217 ++glPushMatrix@0 @218 ++glPushName@4 @219 ++glRasterPos2d@16 @220 ++glRasterPos2dv@4 @221 ++glRasterPos2f@8 @222 ++glRasterPos2fv@4 @223 ++glRasterPos2i@8 @224 ++glRasterPos2iv@4 @225 ++glRasterPos2s@8 @226 ++glRasterPos2sv@4 @227 ++glRasterPos3d@24 @228 ++glRasterPos3dv@4 @229 ++glRasterPos3f@12 @230 ++glRasterPos3fv@4 @231 ++glRasterPos3i@12 @232 ++glRasterPos3iv@4 @233 ++glRasterPos3s@12 @234 ++glRasterPos3sv@4 @235 ++glRasterPos4d@32 @236 ++glRasterPos4dv@4 @237 ++glRasterPos4f@16 @238 ++glRasterPos4fv@4 @239 ++glRasterPos4i@16 @240 ++glRasterPos4iv@4 @241 ++glRasterPos4s@16 @242 ++glRasterPos4sv@4 @243 ++glReadBuffer@4 @244 ++glReadPixels@28 @245 ++glRectd@32 @246 ++glRectdv@8 @247 ++glRectf@16 @248 ++glRectfv@8 @249 ++glRecti@16 @250 ++glRectiv@8 @251 ++glRects@16 @252 ++glRectsv@8 @253 ++glRenderMode@4 @254 ++glRotated@32 @255 ++glRotatef@16 @256 ++glScaled@24 @257 ++glScalef@12 @258 ++glScissor@16 @259 ++glSelectBuffer@8 @260 ++glShadeModel@4 @261 ++glStencilFunc@12 @262 ++glStencilMask@4 @263 ++glStencilOp@12 @264 ++glTexCoord1d@8 @265 ++glTexCoord1dv@4 @266 ++glTexCoord1f@4 @267 ++glTexCoord1fv@4 @268 ++glTexCoord1i@4 @269 ++glTexCoord1iv@4 @270 ++glTexCoord1s@4 @271 ++glTexCoord1sv@4 @272 ++glTexCoord2d@16 @273 ++glTexCoord2dv@4 @274 ++glTexCoord2f@8 @275 ++glTexCoord2fv@4 @276 ++glTexCoord2i@8 @277 ++glTexCoord2iv@4 @278 ++glTexCoord2s@8 @279 ++glTexCoord2sv@4 @280 ++glTexCoord3d@24 @281 ++glTexCoord3dv@4 @282 ++glTexCoord3f@12 @283 ++glTexCoord3fv@4 @284 ++glTexCoord3i@12 @285 ++glTexCoord3iv@4 @286 ++glTexCoord3s@12 @287 ++glTexCoord3sv@4 @288 ++glTexCoord4d@32 @289 ++glTexCoord4dv@4 @290 ++glTexCoord4f@16 @291 ++glTexCoord4fv@4 @292 ++glTexCoord4i@16 @293 ++glTexCoord4iv@4 @294 ++glTexCoord4s@16 @295 ++glTexCoord4sv@4 @296 ++glTexCoordPointer@16 @297 ++glTexEnvf@12 @298 ++glTexEnvfv@12 @299 ++glTexEnvi@12 @300 ++glTexEnviv@12 @301 ++glTexGend@16 @302 ++glTexGendv@12 @303 ++glTexGenf@12 @304 ++glTexGenfv@12 @305 ++glTexGeni@12 @306 ++glTexGeniv@12 @307 ++glTexImage1D@32 @308 ++glTexImage2D@36 @309 ++glTexParameterf@12 @310 ++glTexParameterfv@12 @311 ++glTexParameteri@12 @312 ++glTexParameteriv@12 @313 ++glTexSubImage1D@28 @314 ++glTexSubImage2D@36 @315 ++glTranslated@24 @316 ++glTranslatef@12 @317 ++glVertex2d@16 @318 ++glVertex2dv@4 @319 ++glVertex2f@8 @320 ++glVertex2fv@4 @321 ++glVertex2i@8 @322 ++glVertex2iv@4 @323 ++glVertex2s@8 @324 ++glVertex2sv@4 @325 ++glVertex3d@24 @326 ++glVertex3dv@4 @327 ++glVertex3f@12 @328 ++glVertex3fv@4 @329 ++glVertex3i@12 @330 ++glVertex3iv@4 @331 ++glVertex3s@12 @332 ++glVertex3sv@4 @333 ++glVertex4d@32 @334 ++glVertex4dv@4 @335 ++glVertex4f@16 @336 ++glVertex4fv@4 @337 ++glVertex4i@16 @338 ++glVertex4iv@4 @339 ++glVertex4s@16 @340 ++glVertex4sv@4 @341 ++glVertexPointer@16 @342 ++glViewport@16 @343 ++wglChoosePixelFormat@8 @344 ++wglCopyContext@12 @345 ++wglCreateContext@4 @346 ++wglCreateLayerContext@8 @347 ++wglDeleteContext@4 @348 ++wglDescribeLayerPlane@20 @349 ++wglDescribePixelFormat@16 @350 ++wglGetCurrentContext@0 @351 ++wglGetCurrentDC@0 @352 ++;wglGetDefaultProcAddress@4 @353 ++wglGetLayerPaletteEntries@20 @354 ++wglGetPixelFormat@4 @355 ++wglGetProcAddress@4 @356 ++wglMakeCurrent@8 @357 ++wglRealizeLayerPalette@12 @358 ++wglSetLayerPaletteEntries@20 @359 ++wglSetPixelFormat@12 @360 ++wglShareLists@8 @361 ++wglSwapBuffers@4 @362 ++wglSwapLayerBuffers@8 @363 ++wglSwapMultipleBuffers@8 @364 ++wglUseFontBitmapsA@16 @365 ++wglUseFontBitmapsW@16 @366 ++wglUseFontOutlinesA@32 @367 ++wglUseFontOutlinesW@32 @368 ++ ++DrvCopyContext@12 ++DrvCreateContext@4 ++DrvCreateLayerContext@8 ++DrvDeleteContext@4 ++DrvDescribeLayerPlane@20 ++DrvDescribePixelFormat@16 ++DrvGetLayerPaletteEntries@20 ++DrvGetProcAddress@4 ++DrvPresentBuffers@8 ++DrvRealizeLayerPalette@12 ++DrvReleaseContext@4 ++DrvSetCallbackProcs@8 ++DrvSetContext@12 ++DrvSetLayerPaletteEntries@20 ++DrvSetPixelFormat@8 ++DrvShareLists@8 ++DrvSwapBuffers@4 ++DrvSwapLayerBuffers@8 ++DrvValidateVersion@4 +diff --git a/src/gallium/targets/libgl-gdi/opengl32.mingw.def b/src/gallium/targets/libgl-gdi/opengl32.mingw.def +deleted file mode 100644 +index 485c9d44a877e59827d48cb967f30710f6f5749d..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/libgl-gdi/opengl32.mingw.def ++++ /dev/null +@@ -1,357 +0,0 @@ +-EXPORTS +- glAccum = glAccum@8 +- glAlphaFunc = glAlphaFunc@8 +- glAreTexturesResident = glAreTexturesResident@12 +- glArrayElement = glArrayElement@4 +- glBegin = glBegin@4 +- glBindTexture = glBindTexture@8 +- glBitmap = glBitmap@28 +- glBlendFunc = glBlendFunc@8 +- glCallList = glCallList@4 +- glCallLists = glCallLists@12 +- glClear = glClear@4 +- glClearAccum = glClearAccum@16 +- glClearColor = glClearColor@16 +- glClearDepth = glClearDepth@8 +- glClearIndex = glClearIndex@4 +- glClearStencil = glClearStencil@4 +- glClipPlane = glClipPlane@8 +- glColor3b = glColor3b@12 +- glColor3bv = glColor3bv@4 +- glColor3d = glColor3d@24 +- glColor3dv = glColor3dv@4 +- glColor3f = glColor3f@12 +- glColor3fv = glColor3fv@4 +- glColor3i = glColor3i@12 +- glColor3iv = glColor3iv@4 +- glColor3s = glColor3s@12 +- glColor3sv = glColor3sv@4 +- glColor3ub = glColor3ub@12 +- glColor3ubv = glColor3ubv@4 +- glColor3ui = glColor3ui@12 +- glColor3uiv = glColor3uiv@4 +- glColor3us = glColor3us@12 +- glColor3usv = glColor3usv@4 +- glColor4b = glColor4b@16 +- glColor4bv = glColor4bv@4 +- glColor4d = glColor4d@32 +- glColor4dv = glColor4dv@4 +- glColor4f = glColor4f@16 +- glColor4fv = glColor4fv@4 +- glColor4i = glColor4i@16 +- glColor4iv = glColor4iv@4 +- glColor4s = glColor4s@16 +- glColor4sv = glColor4sv@4 +- glColor4ub = glColor4ub@16 +- glColor4ubv = glColor4ubv@4 +- glColor4ui = glColor4ui@16 +- glColor4uiv = glColor4uiv@4 +- glColor4us = glColor4us@16 +- glColor4usv = glColor4usv@4 +- glColorMask = glColorMask@16 +- glColorMaterial = glColorMaterial@8 +- glColorPointer = glColorPointer@16 +- glCopyPixels = glCopyPixels@20 +- glCopyTexImage1D = glCopyTexImage1D@28 +- glCopyTexImage2D = glCopyTexImage2D@32 +- glCopyTexSubImage1D = glCopyTexSubImage1D@24 +- glCopyTexSubImage2D = glCopyTexSubImage2D@32 +- glCullFace = glCullFace@4 +-; glDebugEntry = glDebugEntry@8 +- glDeleteLists = glDeleteLists@8 +- glDeleteTextures = glDeleteTextures@8 +- glDepthFunc = glDepthFunc@4 +- glDepthMask = glDepthMask@4 +- glDepthRange = glDepthRange@16 +- glDisable = glDisable@4 +- glDisableClientState = glDisableClientState@4 +- glDrawArrays = glDrawArrays@12 +- glDrawBuffer = glDrawBuffer@4 +- glDrawElements = glDrawElements@16 +- glDrawPixels = glDrawPixels@20 +- glEdgeFlag = glEdgeFlag@4 +- glEdgeFlagPointer = glEdgeFlagPointer@8 +- glEdgeFlagv = glEdgeFlagv@4 +- glEnable = glEnable@4 +- glEnableClientState = glEnableClientState@4 +- glEnd = glEnd@0 +- glEndList = glEndList@0 +- glEvalCoord1d = glEvalCoord1d@8 +- glEvalCoord1dv = glEvalCoord1dv@4 +- glEvalCoord1f = glEvalCoord1f@4 +- glEvalCoord1fv = glEvalCoord1fv@4 +- glEvalCoord2d = glEvalCoord2d@16 +- glEvalCoord2dv = glEvalCoord2dv@4 +- glEvalCoord2f = glEvalCoord2f@8 +- glEvalCoord2fv = glEvalCoord2fv@4 +- glEvalMesh1 = glEvalMesh1@12 +- glEvalMesh2 = glEvalMesh2@20 +- glEvalPoint1 = glEvalPoint1@4 +- glEvalPoint2 = glEvalPoint2@8 +- glFeedbackBuffer = glFeedbackBuffer@12 +- glFinish = glFinish@0 +- glFlush = glFlush@0 +- glFogf = glFogf@8 +- glFogfv = glFogfv@8 +- glFogi = glFogi@8 +- glFogiv = glFogiv@8 +- glFrontFace = glFrontFace@4 +- glFrustum = glFrustum@48 +- glGenLists = glGenLists@4 +- glGenTextures = glGenTextures@8 +- glGetBooleanv = glGetBooleanv@8 +- glGetClipPlane = glGetClipPlane@8 +- glGetDoublev = glGetDoublev@8 +- glGetError = glGetError@0 +- glGetFloatv = glGetFloatv@8 +- glGetIntegerv = glGetIntegerv@8 +- glGetLightfv = glGetLightfv@12 +- glGetLightiv = glGetLightiv@12 +- glGetMapdv = glGetMapdv@12 +- glGetMapfv = glGetMapfv@12 +- glGetMapiv = glGetMapiv@12 +- glGetMaterialfv = glGetMaterialfv@12 +- glGetMaterialiv = glGetMaterialiv@12 +- glGetPixelMapfv = glGetPixelMapfv@8 +- glGetPixelMapuiv = glGetPixelMapuiv@8 +- glGetPixelMapusv = glGetPixelMapusv@8 +- glGetPointerv = glGetPointerv@8 +- glGetPolygonStipple = glGetPolygonStipple@4 +- glGetString = glGetString@4 +- glGetTexEnvfv = glGetTexEnvfv@12 +- glGetTexEnviv = glGetTexEnviv@12 +- glGetTexGendv = glGetTexGendv@12 +- glGetTexGenfv = glGetTexGenfv@12 +- glGetTexGeniv = glGetTexGeniv@12 +- glGetTexImage = glGetTexImage@20 +- glGetTexLevelParameterfv = glGetTexLevelParameterfv@16 +- glGetTexLevelParameteriv = glGetTexLevelParameteriv@16 +- glGetTexParameterfv = glGetTexParameterfv@12 +- glGetTexParameteriv = glGetTexParameteriv@12 +- glHint = glHint@8 +- glIndexMask = glIndexMask@4 +- glIndexPointer = glIndexPointer@12 +- glIndexd = glIndexd@8 +- glIndexdv = glIndexdv@4 +- glIndexf = glIndexf@4 +- glIndexfv = glIndexfv@4 +- glIndexi = glIndexi@4 +- glIndexiv = glIndexiv@4 +- glIndexs = glIndexs@4 +- glIndexsv = glIndexsv@4 +- glIndexub = glIndexub@4 +- glIndexubv = glIndexubv@4 +- glInitNames = glInitNames@0 +- glInterleavedArrays = glInterleavedArrays@12 +- glIsEnabled = glIsEnabled@4 +- glIsList = glIsList@4 +- glIsTexture = glIsTexture@4 +- glLightModelf = glLightModelf@8 +- glLightModelfv = glLightModelfv@8 +- glLightModeli = glLightModeli@8 +- glLightModeliv = glLightModeliv@8 +- glLightf = glLightf@12 +- glLightfv = glLightfv@12 +- glLighti = glLighti@12 +- glLightiv = glLightiv@12 +- glLineStipple = glLineStipple@8 +- glLineWidth = glLineWidth@4 +- glListBase = glListBase@4 +- glLoadIdentity = glLoadIdentity@0 +- glLoadMatrixd = glLoadMatrixd@4 +- glLoadMatrixf = glLoadMatrixf@4 +- glLoadName = glLoadName@4 +- glLogicOp = glLogicOp@4 +- glMap1d = glMap1d@32 +- glMap1f = glMap1f@24 +- glMap2d = glMap2d@56 +- glMap2f = glMap2f@40 +- glMapGrid1d = glMapGrid1d@20 +- glMapGrid1f = glMapGrid1f@12 +- glMapGrid2d = glMapGrid2d@40 +- glMapGrid2f = glMapGrid2f@24 +- glMaterialf = glMaterialf@12 +- glMaterialfv = glMaterialfv@12 +- glMateriali = glMateriali@12 +- glMaterialiv = glMaterialiv@12 +- glMatrixMode = glMatrixMode@4 +- glMultMatrixd = glMultMatrixd@4 +- glMultMatrixf = glMultMatrixf@4 +- glNewList = glNewList@8 +- glNormal3b = glNormal3b@12 +- glNormal3bv = glNormal3bv@4 +- glNormal3d = glNormal3d@24 +- glNormal3dv = glNormal3dv@4 +- glNormal3f = glNormal3f@12 +- glNormal3fv = glNormal3fv@4 +- glNormal3i = glNormal3i@12 +- glNormal3iv = glNormal3iv@4 +- glNormal3s = glNormal3s@12 +- glNormal3sv = glNormal3sv@4 +- glNormalPointer = glNormalPointer@12 +- glOrtho = glOrtho@48 +- glPassThrough = glPassThrough@4 +- glPixelMapfv = glPixelMapfv@12 +- glPixelMapuiv = glPixelMapuiv@12 +- glPixelMapusv = glPixelMapusv@12 +- glPixelStoref = glPixelStoref@8 +- glPixelStorei = glPixelStorei@8 +- glPixelTransferf = glPixelTransferf@8 +- glPixelTransferi = glPixelTransferi@8 +- glPixelZoom = glPixelZoom@8 +- glPointSize = glPointSize@4 +- glPolygonMode = glPolygonMode@8 +- glPolygonOffset = glPolygonOffset@8 +- glPolygonStipple = glPolygonStipple@4 +- glPopAttrib = glPopAttrib@0 +- glPopClientAttrib = glPopClientAttrib@0 +- glPopMatrix = glPopMatrix@0 +- glPopName = glPopName@0 +- glPrioritizeTextures = glPrioritizeTextures@12 +- glPushAttrib = glPushAttrib@4 +- glPushClientAttrib = glPushClientAttrib@4 +- glPushMatrix = glPushMatrix@0 +- glPushName = glPushName@4 +- glRasterPos2d = glRasterPos2d@16 +- glRasterPos2dv = glRasterPos2dv@4 +- glRasterPos2f = glRasterPos2f@8 +- glRasterPos2fv = glRasterPos2fv@4 +- glRasterPos2i = glRasterPos2i@8 +- glRasterPos2iv = glRasterPos2iv@4 +- glRasterPos2s = glRasterPos2s@8 +- glRasterPos2sv = glRasterPos2sv@4 +- glRasterPos3d = glRasterPos3d@24 +- glRasterPos3dv = glRasterPos3dv@4 +- glRasterPos3f = glRasterPos3f@12 +- glRasterPos3fv = glRasterPos3fv@4 +- glRasterPos3i = glRasterPos3i@12 +- glRasterPos3iv = glRasterPos3iv@4 +- glRasterPos3s = glRasterPos3s@12 +- glRasterPos3sv = glRasterPos3sv@4 +- glRasterPos4d = glRasterPos4d@32 +- glRasterPos4dv = glRasterPos4dv@4 +- glRasterPos4f = glRasterPos4f@16 +- glRasterPos4fv = glRasterPos4fv@4 +- glRasterPos4i = glRasterPos4i@16 +- glRasterPos4iv = glRasterPos4iv@4 +- glRasterPos4s = glRasterPos4s@16 +- glRasterPos4sv = glRasterPos4sv@4 +- glReadBuffer = glReadBuffer@4 +- glReadPixels = glReadPixels@28 +- glRectd = glRectd@32 +- glRectdv = glRectdv@8 +- glRectf = glRectf@16 +- glRectfv = glRectfv@8 +- glRecti = glRecti@16 +- glRectiv = glRectiv@8 +- glRects = glRects@16 +- glRectsv = glRectsv@8 +- glRenderMode = glRenderMode@4 +- glRotated = glRotated@32 +- glRotatef = glRotatef@16 +- glScaled = glScaled@24 +- glScalef = glScalef@12 +- glScissor = glScissor@16 +- glSelectBuffer = glSelectBuffer@8 +- glShadeModel = glShadeModel@4 +- glStencilFunc = glStencilFunc@12 +- glStencilMask = glStencilMask@4 +- glStencilOp = glStencilOp@12 +- glTexCoord1d = glTexCoord1d@8 +- glTexCoord1dv = glTexCoord1dv@4 +- glTexCoord1f = glTexCoord1f@4 +- glTexCoord1fv = glTexCoord1fv@4 +- glTexCoord1i = glTexCoord1i@4 +- glTexCoord1iv = glTexCoord1iv@4 +- glTexCoord1s = glTexCoord1s@4 +- glTexCoord1sv = glTexCoord1sv@4 +- glTexCoord2d = glTexCoord2d@16 +- glTexCoord2dv = glTexCoord2dv@4 +- glTexCoord2f = glTexCoord2f@8 +- glTexCoord2fv = glTexCoord2fv@4 +- glTexCoord2i = glTexCoord2i@8 +- glTexCoord2iv = glTexCoord2iv@4 +- glTexCoord2s = glTexCoord2s@8 +- glTexCoord2sv = glTexCoord2sv@4 +- glTexCoord3d = glTexCoord3d@24 +- glTexCoord3dv = glTexCoord3dv@4 +- glTexCoord3f = glTexCoord3f@12 +- glTexCoord3fv = glTexCoord3fv@4 +- glTexCoord3i = glTexCoord3i@12 +- glTexCoord3iv = glTexCoord3iv@4 +- glTexCoord3s = glTexCoord3s@12 +- glTexCoord3sv = glTexCoord3sv@4 +- glTexCoord4d = glTexCoord4d@32 +- glTexCoord4dv = glTexCoord4dv@4 +- glTexCoord4f = glTexCoord4f@16 +- glTexCoord4fv = glTexCoord4fv@4 +- glTexCoord4i = glTexCoord4i@16 +- glTexCoord4iv = glTexCoord4iv@4 +- glTexCoord4s = glTexCoord4s@16 +- glTexCoord4sv = glTexCoord4sv@4 +- glTexCoordPointer = glTexCoordPointer@16 +- glTexEnvf = glTexEnvf@12 +- glTexEnvfv = glTexEnvfv@12 +- glTexEnvi = glTexEnvi@12 +- glTexEnviv = glTexEnviv@12 +- glTexGend = glTexGend@16 +- glTexGendv = glTexGendv@12 +- glTexGenf = glTexGenf@12 +- glTexGenfv = glTexGenfv@12 +- glTexGeni = glTexGeni@12 +- glTexGeniv = glTexGeniv@12 +- glTexImage1D = glTexImage1D@32 +- glTexImage2D = glTexImage2D@36 +- glTexParameterf = glTexParameterf@12 +- glTexParameterfv = glTexParameterfv@12 +- glTexParameteri = glTexParameteri@12 +- glTexParameteriv = glTexParameteriv@12 +- glTexSubImage1D = glTexSubImage1D@28 +- glTexSubImage2D = glTexSubImage2D@36 +- glTranslated = glTranslated@24 +- glTranslatef = glTranslatef@12 +- glVertex2d = glVertex2d@16 +- glVertex2dv = glVertex2dv@4 +- glVertex2f = glVertex2f@8 +- glVertex2fv = glVertex2fv@4 +- glVertex2i = glVertex2i@8 +- glVertex2iv = glVertex2iv@4 +- glVertex2s = glVertex2s@8 +- glVertex2sv = glVertex2sv@4 +- glVertex3d = glVertex3d@24 +- glVertex3dv = glVertex3dv@4 +- glVertex3f = glVertex3f@12 +- glVertex3fv = glVertex3fv@4 +- glVertex3i = glVertex3i@12 +- glVertex3iv = glVertex3iv@4 +- glVertex3s = glVertex3s@12 +- glVertex3sv = glVertex3sv@4 +- glVertex4d = glVertex4d@32 +- glVertex4dv = glVertex4dv@4 +- glVertex4f = glVertex4f@16 +- glVertex4fv = glVertex4fv@4 +- glVertex4i = glVertex4i@16 +- glVertex4iv = glVertex4iv@4 +- glVertex4s = glVertex4s@16 +- glVertex4sv = glVertex4sv@4 +- glVertexPointer = glVertexPointer@16 +- glViewport = glViewport@16 +- DrvCopyContext +- DrvCreateContext +- DrvCreateLayerContext +- DrvDeleteContext +- DrvDescribeLayerPlane +- DrvDescribePixelFormat +- DrvGetLayerPaletteEntries +- DrvGetProcAddress +- DrvPresentBuffers +- DrvRealizeLayerPalette +- DrvReleaseContext +- DrvSetCallbackProcs +- DrvSetContext +- DrvSetLayerPaletteEntries +- DrvSetPixelFormat +- DrvShareLists +- DrvSwapBuffers +- DrvSwapLayerBuffers +- DrvValidateVersion +diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build +index 38fcaca13b9513d7d69122f3f3734330697695f4..97a9fd954ac61fb6945217e193eb9f1eaab5c590 100644 +--- a/src/gallium/targets/osmesa/meson.build ++++ b/src/gallium/targets/osmesa/meson.build +@@ -32,11 +32,14 @@ if with_ld_version_script + osmesa_link_deps += files('osmesa.sym') + endif + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- osmesa_def = 'osmesa.mingw.def' +-else +- osmesa_def = 'osmesa.def' +-endif ++osmesa_def = custom_target( ++ 'osmesa.def', ++ input: 'osmesa.def.in', ++ output : 'osmesa.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libosmesa = shared_library( + osmesa_lib_name, +diff --git a/src/gallium/targets/osmesa/osmesa.def b/src/gallium/targets/osmesa/osmesa.def +deleted file mode 100644 +index f6d09b81ef8c42463f8b3a67ac0ced2525b0599a..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/osmesa/osmesa.def ++++ /dev/null +@@ -1,354 +0,0 @@ +-;DESCRIPTION 'Mesa OSMesa lib for Win32' +-VERSION 4.1 +- +-EXPORTS +- OSMesaCreateContext +- OSMesaCreateContextAttribs +- OSMesaCreateContextExt +- OSMesaDestroyContext +- OSMesaMakeCurrent +- OSMesaGetCurrentContext +- OSMesaPixelStore +- OSMesaGetIntegerv +- OSMesaGetDepthBuffer +- OSMesaGetColorBuffer +- OSMesaGetProcAddress +- OSMesaColorClamp +- OSMesaPostprocess +- glAccum +- glAlphaFunc +- glAreTexturesResident +- glArrayElement +- glBegin +- glBindTexture +- glBitmap +- glBlendFunc +- glCallList +- glCallLists +- glClear +- glClearAccum +- glClearColor +- glClearDepth +- glClearIndex +- glClearStencil +- glClipPlane +- glColor3b +- glColor3bv +- glColor3d +- glColor3dv +- glColor3f +- glColor3fv +- glColor3i +- glColor3iv +- glColor3s +- glColor3sv +- glColor3ub +- glColor3ubv +- glColor3ui +- glColor3uiv +- glColor3us +- glColor3usv +- glColor4b +- glColor4bv +- glColor4d +- glColor4dv +- glColor4f +- glColor4fv +- glColor4i +- glColor4iv +- glColor4s +- glColor4sv +- glColor4ub +- glColor4ubv +- glColor4ui +- glColor4uiv +- glColor4us +- glColor4usv +- glColorMask +- glColorMaterial +- glColorPointer +- glCopyPixels +- glCopyTexImage1D +- glCopyTexImage2D +- glCopyTexSubImage1D +- glCopyTexSubImage2D +- glCullFace +-; glDebugEntry +- glDeleteLists +- glDeleteTextures +- glDepthFunc +- glDepthMask +- glDepthRange +- glDisable +- glDisableClientState +- glDrawArrays +- glDrawBuffer +- glDrawElements +- glDrawPixels +- glEdgeFlag +- glEdgeFlagPointer +- glEdgeFlagv +- glEnable +- glEnableClientState +- glEnd +- glEndList +- glEvalCoord1d +- glEvalCoord1dv +- glEvalCoord1f +- glEvalCoord1fv +- glEvalCoord2d +- glEvalCoord2dv +- glEvalCoord2f +- glEvalCoord2fv +- glEvalMesh1 +- glEvalMesh2 +- glEvalPoint1 +- glEvalPoint2 +- glFeedbackBuffer +- glFinish +- glFlush +- glFogf +- glFogfv +- glFogi +- glFogiv +- glFrontFace +- glFrustum +- glGenLists +- glGenTextures +- glGetBooleanv +- glGetClipPlane +- glGetDoublev +- glGetError +- glGetFloatv +- glGetIntegerv +- glGetLightfv +- glGetLightiv +- glGetMapdv +- glGetMapfv +- glGetMapiv +- glGetMaterialfv +- glGetMaterialiv +- glGetPixelMapfv +- glGetPixelMapuiv +- glGetPixelMapusv +- glGetPointerv +- glGetPolygonStipple +- glGetString +- glGetTexEnvfv +- glGetTexEnviv +- glGetTexGendv +- glGetTexGenfv +- glGetTexGeniv +- glGetTexImage +- glGetTexLevelParameterfv +- glGetTexLevelParameteriv +- glGetTexParameterfv +- glGetTexParameteriv +- glHint +- glIndexMask +- glIndexPointer +- glIndexd +- glIndexdv +- glIndexf +- glIndexfv +- glIndexi +- glIndexiv +- glIndexs +- glIndexsv +- glIndexub +- glIndexubv +- glInitNames +- glInterleavedArrays +- glIsEnabled +- glIsList +- glIsTexture +- glLightModelf +- glLightModelfv +- glLightModeli +- glLightModeliv +- glLightf +- glLightfv +- glLighti +- glLightiv +- glLineStipple +- glLineWidth +- glListBase +- glLoadIdentity +- glLoadMatrixd +- glLoadMatrixf +- glLoadName +- glLogicOp +- glMap1d +- glMap1f +- glMap2d +- glMap2f +- glMapGrid1d +- glMapGrid1f +- glMapGrid2d +- glMapGrid2f +- glMaterialf +- glMaterialfv +- glMateriali +- glMaterialiv +- glMatrixMode +- glMultMatrixd +- glMultMatrixf +- glNewList +- glNormal3b +- glNormal3bv +- glNormal3d +- glNormal3dv +- glNormal3f +- glNormal3fv +- glNormal3i +- glNormal3iv +- glNormal3s +- glNormal3sv +- glNormalPointer +- glOrtho +- glPassThrough +- glPixelMapfv +- glPixelMapuiv +- glPixelMapusv +- glPixelStoref +- glPixelStorei +- glPixelTransferf +- glPixelTransferi +- glPixelZoom +- glPointSize +- glPolygonMode +- glPolygonOffset +- glPolygonStipple +- glPopAttrib +- glPopClientAttrib +- glPopMatrix +- glPopName +- glPrioritizeTextures +- glPushAttrib +- glPushClientAttrib +- glPushMatrix +- glPushName +- glRasterPos2d +- glRasterPos2dv +- glRasterPos2f +- glRasterPos2fv +- glRasterPos2i +- glRasterPos2iv +- glRasterPos2s +- glRasterPos2sv +- glRasterPos3d +- glRasterPos3dv +- glRasterPos3f +- glRasterPos3fv +- glRasterPos3i +- glRasterPos3iv +- glRasterPos3s +- glRasterPos3sv +- glRasterPos4d +- glRasterPos4dv +- glRasterPos4f +- glRasterPos4fv +- glRasterPos4i +- glRasterPos4iv +- glRasterPos4s +- glRasterPos4sv +- glReadBuffer +- glReadPixels +- glRectd +- glRectdv +- glRectf +- glRectfv +- glRecti +- glRectiv +- glRects +- glRectsv +- glRenderMode +- glRotated +- glRotatef +- glScaled +- glScalef +- glScissor +- glSelectBuffer +- glShadeModel +- glStencilFunc +- glStencilMask +- glStencilOp +- glTexCoord1d +- glTexCoord1dv +- glTexCoord1f +- glTexCoord1fv +- glTexCoord1i +- glTexCoord1iv +- glTexCoord1s +- glTexCoord1sv +- glTexCoord2d +- glTexCoord2dv +- glTexCoord2f +- glTexCoord2fv +- glTexCoord2i +- glTexCoord2iv +- glTexCoord2s +- glTexCoord2sv +- glTexCoord3d +- glTexCoord3dv +- glTexCoord3f +- glTexCoord3fv +- glTexCoord3i +- glTexCoord3iv +- glTexCoord3s +- glTexCoord3sv +- glTexCoord4d +- glTexCoord4dv +- glTexCoord4f +- glTexCoord4fv +- glTexCoord4i +- glTexCoord4iv +- glTexCoord4s +- glTexCoord4sv +- glTexCoordPointer +- glTexEnvf +- glTexEnvfv +- glTexEnvi +- glTexEnviv +- glTexGend +- glTexGendv +- glTexGenf +- glTexGenfv +- glTexGeni +- glTexGeniv +- glTexImage1D +- glTexImage2D +- glTexParameterf +- glTexParameterfv +- glTexParameteri +- glTexParameteriv +- glTexSubImage1D +- glTexSubImage2D +- glTranslated +- glTranslatef +- glVertex2d +- glVertex2dv +- glVertex2f +- glVertex2fv +- glVertex2i +- glVertex2iv +- glVertex2s +- glVertex2sv +- glVertex3d +- glVertex3dv +- glVertex3f +- glVertex3fv +- glVertex3i +- glVertex3iv +- glVertex3s +- glVertex3sv +- glVertex4d +- glVertex4dv +- glVertex4f +- glVertex4fv +- glVertex4i +- glVertex4iv +- glVertex4s +- glVertex4sv +- glVertexPointer +- glViewport +diff --git a/src/gallium/targets/osmesa/osmesa.def.in b/src/gallium/targets/osmesa/osmesa.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..d60457797963451ff3fd4f13690d1bab971bc5b3 +--- /dev/null ++++ b/src/gallium/targets/osmesa/osmesa.def.in +@@ -0,0 +1,353 @@ ++; Mesa OSMesa lib for Win32 ++ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++OSMesaCreateContext@8 ++OSMesaCreateContextAttribs@8 ++OSMesaCreateContextExt@20 ++OSMesaDestroyContext@4 ++OSMesaMakeCurrent@20 ++OSMesaGetCurrentContext@0 ++OSMesaPixelStore@8 ++OSMesaGetIntegerv@8 ++OSMesaGetDepthBuffer@20 ++OSMesaGetColorBuffer@20 ++OSMesaGetProcAddress@4 ++OSMesaColorClamp@4 ++OSMesaPostprocess@12 ++glAccum@8 ++glAlphaFunc@8 ++glAreTexturesResident@12 ++glArrayElement@4 ++glBegin@4 ++glBindTexture@8 ++glBitmap@28 ++glBlendFunc@8 ++glCallList@4 ++glCallLists@12 ++glClear@4 ++glClearAccum@16 ++glClearColor@16 ++glClearDepth@8 ++glClearIndex@4 ++glClearStencil@4 ++glClipPlane@8 ++glColor3b@12 ++glColor3bv@4 ++glColor3d@24 ++glColor3dv@4 ++glColor3f@12 ++glColor3fv@4 ++glColor3i@12 ++glColor3iv@4 ++glColor3s@12 ++glColor3sv@4 ++glColor3ub@12 ++glColor3ubv@4 ++glColor3ui@12 ++glColor3uiv@4 ++glColor3us@12 ++glColor3usv@4 ++glColor4b@16 ++glColor4bv@4 ++glColor4d@32 ++glColor4dv@4 ++glColor4f@16 ++glColor4fv@4 ++glColor4i@16 ++glColor4iv@4 ++glColor4s@16 ++glColor4sv@4 ++glColor4ub@16 ++glColor4ubv@4 ++glColor4ui@16 ++glColor4uiv@4 ++glColor4us@16 ++glColor4usv@4 ++glColorMask@16 ++glColorMaterial@8 ++glColorPointer@16 ++glCopyPixels@20 ++glCopyTexImage1D@28 ++glCopyTexImage2D@32 ++glCopyTexSubImage1D@24 ++glCopyTexSubImage2D@32 ++glCullFace@4 ++;glDebugEntry@8 ++glDeleteLists@8 ++glDeleteTextures@8 ++glDepthFunc@4 ++glDepthMask@4 ++glDepthRange@16 ++glDisable@4 ++glDisableClientState@4 ++glDrawArrays@12 ++glDrawBuffer@4 ++glDrawElements@16 ++glDrawPixels@20 ++glEdgeFlag@4 ++glEdgeFlagPointer@8 ++glEdgeFlagv@4 ++glEnable@4 ++glEnableClientState@4 ++glEnd@0 ++glEndList@0 ++glEvalCoord1d@8 ++glEvalCoord1dv@4 ++glEvalCoord1f@4 ++glEvalCoord1fv@4 ++glEvalCoord2d@16 ++glEvalCoord2dv@4 ++glEvalCoord2f@8 ++glEvalCoord2fv@4 ++glEvalMesh1@12 ++glEvalMesh2@20 ++glEvalPoint1@4 ++glEvalPoint2@8 ++glFeedbackBuffer@12 ++glFinish@0 ++glFlush@0 ++glFogf@8 ++glFogfv@8 ++glFogi@8 ++glFogiv@8 ++glFrontFace@4 ++glFrustum@48 ++glGenLists@4 ++glGenTextures@8 ++glGetBooleanv@8 ++glGetClipPlane@8 ++glGetDoublev@8 ++glGetError@0 ++glGetFloatv@8 ++glGetIntegerv@8 ++glGetLightfv@12 ++glGetLightiv@12 ++glGetMapdv@12 ++glGetMapfv@12 ++glGetMapiv@12 ++glGetMaterialfv@12 ++glGetMaterialiv@12 ++glGetPixelMapfv@8 ++glGetPixelMapuiv@8 ++glGetPixelMapusv@8 ++glGetPointerv@8 ++glGetPolygonStipple@4 ++glGetString@4 ++glGetTexEnvfv@12 ++glGetTexEnviv@12 ++glGetTexGendv@12 ++glGetTexGenfv@12 ++glGetTexGeniv@12 ++glGetTexImage@20 ++glGetTexLevelParameterfv@16 ++glGetTexLevelParameteriv@16 ++glGetTexParameterfv@12 ++glGetTexParameteriv@12 ++glHint@8 ++glIndexMask@4 ++glIndexPointer@12 ++glIndexd@8 ++glIndexdv@4 ++glIndexf@4 ++glIndexfv@4 ++glIndexi@4 ++glIndexiv@4 ++glIndexs@4 ++glIndexsv@4 ++glIndexub@4 ++glIndexubv@4 ++glInitNames@0 ++glInterleavedArrays@12 ++glIsEnabled@4 ++glIsList@4 ++glIsTexture@4 ++glLightModelf@8 ++glLightModelfv@8 ++glLightModeli@8 ++glLightModeliv@8 ++glLightf@12 ++glLightfv@12 ++glLighti@12 ++glLightiv@12 ++glLineStipple@8 ++glLineWidth@4 ++glListBase@4 ++glLoadIdentity@0 ++glLoadMatrixd@4 ++glLoadMatrixf@4 ++glLoadName@4 ++glLogicOp@4 ++glMap1d@32 ++glMap1f@24 ++glMap2d@56 ++glMap2f@40 ++glMapGrid1d@20 ++glMapGrid1f@12 ++glMapGrid2d@40 ++glMapGrid2f@24 ++glMaterialf@12 ++glMaterialfv@12 ++glMateriali@12 ++glMaterialiv@12 ++glMatrixMode@4 ++glMultMatrixd@4 ++glMultMatrixf@4 ++glNewList@8 ++glNormal3b@12 ++glNormal3bv@4 ++glNormal3d@24 ++glNormal3dv@4 ++glNormal3f@12 ++glNormal3fv@4 ++glNormal3i@12 ++glNormal3iv@4 ++glNormal3s@12 ++glNormal3sv@4 ++glNormalPointer@12 ++glOrtho@48 ++glPassThrough@4 ++glPixelMapfv@12 ++glPixelMapuiv@12 ++glPixelMapusv@12 ++glPixelStoref@8 ++glPixelStorei@8 ++glPixelTransferf@8 ++glPixelTransferi@8 ++glPixelZoom@8 ++glPointSize@4 ++glPolygonMode@8 ++glPolygonOffset@8 ++glPolygonStipple@4 ++glPopAttrib@0 ++glPopClientAttrib@0 ++glPopMatrix@0 ++glPopName@0 ++glPrioritizeTextures@12 ++glPushAttrib@4 ++glPushClientAttrib@4 ++glPushMatrix@0 ++glPushName@4 ++glRasterPos2d@16 ++glRasterPos2dv@4 ++glRasterPos2f@8 ++glRasterPos2fv@4 ++glRasterPos2i@8 ++glRasterPos2iv@4 ++glRasterPos2s@8 ++glRasterPos2sv@4 ++glRasterPos3d@24 ++glRasterPos3dv@4 ++glRasterPos3f@12 ++glRasterPos3fv@4 ++glRasterPos3i@12 ++glRasterPos3iv@4 ++glRasterPos3s@12 ++glRasterPos3sv@4 ++glRasterPos4d@32 ++glRasterPos4dv@4 ++glRasterPos4f@16 ++glRasterPos4fv@4 ++glRasterPos4i@16 ++glRasterPos4iv@4 ++glRasterPos4s@16 ++glRasterPos4sv@4 ++glReadBuffer@4 ++glReadPixels@28 ++glRectd@32 ++glRectdv@8 ++glRectf@16 ++glRectfv@8 ++glRecti@16 ++glRectiv@8 ++glRects@16 ++glRectsv@8 ++glRenderMode@4 ++glRotated@32 ++glRotatef@16 ++glScaled@24 ++glScalef@12 ++glScissor@16 ++glSelectBuffer@8 ++glShadeModel@4 ++glStencilFunc@12 ++glStencilMask@4 ++glStencilOp@12 ++glTexCoord1d@8 ++glTexCoord1dv@4 ++glTexCoord1f@4 ++glTexCoord1fv@4 ++glTexCoord1i@4 ++glTexCoord1iv@4 ++glTexCoord1s@4 ++glTexCoord1sv@4 ++glTexCoord2d@16 ++glTexCoord2dv@4 ++glTexCoord2f@8 ++glTexCoord2fv@4 ++glTexCoord2i@8 ++glTexCoord2iv@4 ++glTexCoord2s@8 ++glTexCoord2sv@4 ++glTexCoord3d@24 ++glTexCoord3dv@4 ++glTexCoord3f@12 ++glTexCoord3fv@4 ++glTexCoord3i@12 ++glTexCoord3iv@4 ++glTexCoord3s@12 ++glTexCoord3sv@4 ++glTexCoord4d@32 ++glTexCoord4dv@4 ++glTexCoord4f@16 ++glTexCoord4fv@4 ++glTexCoord4i@16 ++glTexCoord4iv@4 ++glTexCoord4s@16 ++glTexCoord4sv@4 ++glTexCoordPointer@16 ++glTexEnvf@12 ++glTexEnvfv@12 ++glTexEnvi@12 ++glTexEnviv@12 ++glTexGend@16 ++glTexGendv@12 ++glTexGenf@12 ++glTexGenfv@12 ++glTexGeni@12 ++glTexGeniv@12 ++glTexImage1D@32 ++glTexImage2D@36 ++glTexParameterf@12 ++glTexParameterfv@12 ++glTexParameteri@12 ++glTexParameteriv@12 ++glTexSubImage1D@28 ++glTexSubImage2D@36 ++glTranslated@24 ++glTranslatef@12 ++glVertex2d@16 ++glVertex2dv@4 ++glVertex2f@8 ++glVertex2fv@4 ++glVertex2i@8 ++glVertex2iv@4 ++glVertex2s@8 ++glVertex2sv@4 ++glVertex3d@24 ++glVertex3dv@4 ++glVertex3f@12 ++glVertex3fv@4 ++glVertex3i@12 ++glVertex3iv@4 ++glVertex3s@12 ++glVertex3sv@4 ++glVertex4d@32 ++glVertex4dv@4 ++glVertex4f@16 ++glVertex4fv@4 ++glVertex4i@16 ++glVertex4iv@4 ++glVertex4s@16 ++glVertex4sv@4 ++glVertexPointer@16 ++glViewport@16 +diff --git a/src/gallium/targets/osmesa/osmesa.mingw.def b/src/gallium/targets/osmesa/osmesa.mingw.def +deleted file mode 100644 +index b77af60a93f2fcf9c73262993d6d204563e3eeae..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/osmesa/osmesa.mingw.def ++++ /dev/null +@@ -1,351 +0,0 @@ +-EXPORTS +- OSMesaCreateContext = OSMesaCreateContext@8 +- OSMesaCreateContextAttribs = OSMesaCreateContextAttribs@8 +- OSMesaCreateContextExt = OSMesaCreateContextExt@20 +- OSMesaDestroyContext = OSMesaDestroyContext@4 +- OSMesaMakeCurrent = OSMesaMakeCurrent@20 +- OSMesaGetCurrentContext = OSMesaGetCurrentContext@0 +- OSMesaPixelStore = OSMesaPixelStore@8 +- OSMesaGetIntegerv = OSMesaGetIntegerv@8 +- OSMesaGetDepthBuffer = OSMesaGetDepthBuffer@20 +- OSMesaGetColorBuffer = OSMesaGetColorBuffer@20 +- OSMesaGetProcAddress = OSMesaGetProcAddress@4 +- OSMesaColorClamp = OSMesaColorClamp@4 +- OSMesaPostprocess = OSMesaPostprocess@12 +- glAccum = glAccum@8 +- glAlphaFunc = glAlphaFunc@8 +- glAreTexturesResident = glAreTexturesResident@12 +- glArrayElement = glArrayElement@4 +- glBegin = glBegin@4 +- glBindTexture = glBindTexture@8 +- glBitmap = glBitmap@28 +- glBlendFunc = glBlendFunc@8 +- glCallList = glCallList@4 +- glCallLists = glCallLists@12 +- glClear = glClear@4 +- glClearAccum = glClearAccum@16 +- glClearColor = glClearColor@16 +- glClearDepth = glClearDepth@8 +- glClearIndex = glClearIndex@4 +- glClearStencil = glClearStencil@4 +- glClipPlane = glClipPlane@8 +- glColor3b = glColor3b@12 +- glColor3bv = glColor3bv@4 +- glColor3d = glColor3d@24 +- glColor3dv = glColor3dv@4 +- glColor3f = glColor3f@12 +- glColor3fv = glColor3fv@4 +- glColor3i = glColor3i@12 +- glColor3iv = glColor3iv@4 +- glColor3s = glColor3s@12 +- glColor3sv = glColor3sv@4 +- glColor3ub = glColor3ub@12 +- glColor3ubv = glColor3ubv@4 +- glColor3ui = glColor3ui@12 +- glColor3uiv = glColor3uiv@4 +- glColor3us = glColor3us@12 +- glColor3usv = glColor3usv@4 +- glColor4b = glColor4b@16 +- glColor4bv = glColor4bv@4 +- glColor4d = glColor4d@32 +- glColor4dv = glColor4dv@4 +- glColor4f = glColor4f@16 +- glColor4fv = glColor4fv@4 +- glColor4i = glColor4i@16 +- glColor4iv = glColor4iv@4 +- glColor4s = glColor4s@16 +- glColor4sv = glColor4sv@4 +- glColor4ub = glColor4ub@16 +- glColor4ubv = glColor4ubv@4 +- glColor4ui = glColor4ui@16 +- glColor4uiv = glColor4uiv@4 +- glColor4us = glColor4us@16 +- glColor4usv = glColor4usv@4 +- glColorMask = glColorMask@16 +- glColorMaterial = glColorMaterial@8 +- glColorPointer = glColorPointer@16 +- glCopyPixels = glCopyPixels@20 +- glCopyTexImage1D = glCopyTexImage1D@28 +- glCopyTexImage2D = glCopyTexImage2D@32 +- glCopyTexSubImage1D = glCopyTexSubImage1D@24 +- glCopyTexSubImage2D = glCopyTexSubImage2D@32 +- glCullFace = glCullFace@4 +-; glDebugEntry = glDebugEntry@8 +- glDeleteLists = glDeleteLists@8 +- glDeleteTextures = glDeleteTextures@8 +- glDepthFunc = glDepthFunc@4 +- glDepthMask = glDepthMask@4 +- glDepthRange = glDepthRange@16 +- glDisable = glDisable@4 +- glDisableClientState = glDisableClientState@4 +- glDrawArrays = glDrawArrays@12 +- glDrawBuffer = glDrawBuffer@4 +- glDrawElements = glDrawElements@16 +- glDrawPixels = glDrawPixels@20 +- glEdgeFlag = glEdgeFlag@4 +- glEdgeFlagPointer = glEdgeFlagPointer@8 +- glEdgeFlagv = glEdgeFlagv@4 +- glEnable = glEnable@4 +- glEnableClientState = glEnableClientState@4 +- glEnd = glEnd@0 +- glEndList = glEndList@0 +- glEvalCoord1d = glEvalCoord1d@8 +- glEvalCoord1dv = glEvalCoord1dv@4 +- glEvalCoord1f = glEvalCoord1f@4 +- glEvalCoord1fv = glEvalCoord1fv@4 +- glEvalCoord2d = glEvalCoord2d@16 +- glEvalCoord2dv = glEvalCoord2dv@4 +- glEvalCoord2f = glEvalCoord2f@8 +- glEvalCoord2fv = glEvalCoord2fv@4 +- glEvalMesh1 = glEvalMesh1@12 +- glEvalMesh2 = glEvalMesh2@20 +- glEvalPoint1 = glEvalPoint1@4 +- glEvalPoint2 = glEvalPoint2@8 +- glFeedbackBuffer = glFeedbackBuffer@12 +- glFinish = glFinish@0 +- glFlush = glFlush@0 +- glFogf = glFogf@8 +- glFogfv = glFogfv@8 +- glFogi = glFogi@8 +- glFogiv = glFogiv@8 +- glFrontFace = glFrontFace@4 +- glFrustum = glFrustum@48 +- glGenLists = glGenLists@4 +- glGenTextures = glGenTextures@8 +- glGetBooleanv = glGetBooleanv@8 +- glGetClipPlane = glGetClipPlane@8 +- glGetDoublev = glGetDoublev@8 +- glGetError = glGetError@0 +- glGetFloatv = glGetFloatv@8 +- glGetIntegerv = glGetIntegerv@8 +- glGetLightfv = glGetLightfv@12 +- glGetLightiv = glGetLightiv@12 +- glGetMapdv = glGetMapdv@12 +- glGetMapfv = glGetMapfv@12 +- glGetMapiv = glGetMapiv@12 +- glGetMaterialfv = glGetMaterialfv@12 +- glGetMaterialiv = glGetMaterialiv@12 +- glGetPixelMapfv = glGetPixelMapfv@8 +- glGetPixelMapuiv = glGetPixelMapuiv@8 +- glGetPixelMapusv = glGetPixelMapusv@8 +- glGetPointerv = glGetPointerv@8 +- glGetPolygonStipple = glGetPolygonStipple@4 +- glGetString = glGetString@4 +- glGetTexEnvfv = glGetTexEnvfv@12 +- glGetTexEnviv = glGetTexEnviv@12 +- glGetTexGendv = glGetTexGendv@12 +- glGetTexGenfv = glGetTexGenfv@12 +- glGetTexGeniv = glGetTexGeniv@12 +- glGetTexImage = glGetTexImage@20 +- glGetTexLevelParameterfv = glGetTexLevelParameterfv@16 +- glGetTexLevelParameteriv = glGetTexLevelParameteriv@16 +- glGetTexParameterfv = glGetTexParameterfv@12 +- glGetTexParameteriv = glGetTexParameteriv@12 +- glHint = glHint@8 +- glIndexMask = glIndexMask@4 +- glIndexPointer = glIndexPointer@12 +- glIndexd = glIndexd@8 +- glIndexdv = glIndexdv@4 +- glIndexf = glIndexf@4 +- glIndexfv = glIndexfv@4 +- glIndexi = glIndexi@4 +- glIndexiv = glIndexiv@4 +- glIndexs = glIndexs@4 +- glIndexsv = glIndexsv@4 +- glIndexub = glIndexub@4 +- glIndexubv = glIndexubv@4 +- glInitNames = glInitNames@0 +- glInterleavedArrays = glInterleavedArrays@12 +- glIsEnabled = glIsEnabled@4 +- glIsList = glIsList@4 +- glIsTexture = glIsTexture@4 +- glLightModelf = glLightModelf@8 +- glLightModelfv = glLightModelfv@8 +- glLightModeli = glLightModeli@8 +- glLightModeliv = glLightModeliv@8 +- glLightf = glLightf@12 +- glLightfv = glLightfv@12 +- glLighti = glLighti@12 +- glLightiv = glLightiv@12 +- glLineStipple = glLineStipple@8 +- glLineWidth = glLineWidth@4 +- glListBase = glListBase@4 +- glLoadIdentity = glLoadIdentity@0 +- glLoadMatrixd = glLoadMatrixd@4 +- glLoadMatrixf = glLoadMatrixf@4 +- glLoadName = glLoadName@4 +- glLogicOp = glLogicOp@4 +- glMap1d = glMap1d@32 +- glMap1f = glMap1f@24 +- glMap2d = glMap2d@56 +- glMap2f = glMap2f@40 +- glMapGrid1d = glMapGrid1d@20 +- glMapGrid1f = glMapGrid1f@12 +- glMapGrid2d = glMapGrid2d@40 +- glMapGrid2f = glMapGrid2f@24 +- glMaterialf = glMaterialf@12 +- glMaterialfv = glMaterialfv@12 +- glMateriali = glMateriali@12 +- glMaterialiv = glMaterialiv@12 +- glMatrixMode = glMatrixMode@4 +- glMultMatrixd = glMultMatrixd@4 +- glMultMatrixf = glMultMatrixf@4 +- glNewList = glNewList@8 +- glNormal3b = glNormal3b@12 +- glNormal3bv = glNormal3bv@4 +- glNormal3d = glNormal3d@24 +- glNormal3dv = glNormal3dv@4 +- glNormal3f = glNormal3f@12 +- glNormal3fv = glNormal3fv@4 +- glNormal3i = glNormal3i@12 +- glNormal3iv = glNormal3iv@4 +- glNormal3s = glNormal3s@12 +- glNormal3sv = glNormal3sv@4 +- glNormalPointer = glNormalPointer@12 +- glOrtho = glOrtho@48 +- glPassThrough = glPassThrough@4 +- glPixelMapfv = glPixelMapfv@12 +- glPixelMapuiv = glPixelMapuiv@12 +- glPixelMapusv = glPixelMapusv@12 +- glPixelStoref = glPixelStoref@8 +- glPixelStorei = glPixelStorei@8 +- glPixelTransferf = glPixelTransferf@8 +- glPixelTransferi = glPixelTransferi@8 +- glPixelZoom = glPixelZoom@8 +- glPointSize = glPointSize@4 +- glPolygonMode = glPolygonMode@8 +- glPolygonOffset = glPolygonOffset@8 +- glPolygonStipple = glPolygonStipple@4 +- glPopAttrib = glPopAttrib@0 +- glPopClientAttrib = glPopClientAttrib@0 +- glPopMatrix = glPopMatrix@0 +- glPopName = glPopName@0 +- glPrioritizeTextures = glPrioritizeTextures@12 +- glPushAttrib = glPushAttrib@4 +- glPushClientAttrib = glPushClientAttrib@4 +- glPushMatrix = glPushMatrix@0 +- glPushName = glPushName@4 +- glRasterPos2d = glRasterPos2d@16 +- glRasterPos2dv = glRasterPos2dv@4 +- glRasterPos2f = glRasterPos2f@8 +- glRasterPos2fv = glRasterPos2fv@4 +- glRasterPos2i = glRasterPos2i@8 +- glRasterPos2iv = glRasterPos2iv@4 +- glRasterPos2s = glRasterPos2s@8 +- glRasterPos2sv = glRasterPos2sv@4 +- glRasterPos3d = glRasterPos3d@24 +- glRasterPos3dv = glRasterPos3dv@4 +- glRasterPos3f = glRasterPos3f@12 +- glRasterPos3fv = glRasterPos3fv@4 +- glRasterPos3i = glRasterPos3i@12 +- glRasterPos3iv = glRasterPos3iv@4 +- glRasterPos3s = glRasterPos3s@12 +- glRasterPos3sv = glRasterPos3sv@4 +- glRasterPos4d = glRasterPos4d@32 +- glRasterPos4dv = glRasterPos4dv@4 +- glRasterPos4f = glRasterPos4f@16 +- glRasterPos4fv = glRasterPos4fv@4 +- glRasterPos4i = glRasterPos4i@16 +- glRasterPos4iv = glRasterPos4iv@4 +- glRasterPos4s = glRasterPos4s@16 +- glRasterPos4sv = glRasterPos4sv@4 +- glReadBuffer = glReadBuffer@4 +- glReadPixels = glReadPixels@28 +- glRectd = glRectd@32 +- glRectdv = glRectdv@8 +- glRectf = glRectf@16 +- glRectfv = glRectfv@8 +- glRecti = glRecti@16 +- glRectiv = glRectiv@8 +- glRects = glRects@16 +- glRectsv = glRectsv@8 +- glRenderMode = glRenderMode@4 +- glRotated = glRotated@32 +- glRotatef = glRotatef@16 +- glScaled = glScaled@24 +- glScalef = glScalef@12 +- glScissor = glScissor@16 +- glSelectBuffer = glSelectBuffer@8 +- glShadeModel = glShadeModel@4 +- glStencilFunc = glStencilFunc@12 +- glStencilMask = glStencilMask@4 +- glStencilOp = glStencilOp@12 +- glTexCoord1d = glTexCoord1d@8 +- glTexCoord1dv = glTexCoord1dv@4 +- glTexCoord1f = glTexCoord1f@4 +- glTexCoord1fv = glTexCoord1fv@4 +- glTexCoord1i = glTexCoord1i@4 +- glTexCoord1iv = glTexCoord1iv@4 +- glTexCoord1s = glTexCoord1s@4 +- glTexCoord1sv = glTexCoord1sv@4 +- glTexCoord2d = glTexCoord2d@16 +- glTexCoord2dv = glTexCoord2dv@4 +- glTexCoord2f = glTexCoord2f@8 +- glTexCoord2fv = glTexCoord2fv@4 +- glTexCoord2i = glTexCoord2i@8 +- glTexCoord2iv = glTexCoord2iv@4 +- glTexCoord2s = glTexCoord2s@8 +- glTexCoord2sv = glTexCoord2sv@4 +- glTexCoord3d = glTexCoord3d@24 +- glTexCoord3dv = glTexCoord3dv@4 +- glTexCoord3f = glTexCoord3f@12 +- glTexCoord3fv = glTexCoord3fv@4 +- glTexCoord3i = glTexCoord3i@12 +- glTexCoord3iv = glTexCoord3iv@4 +- glTexCoord3s = glTexCoord3s@12 +- glTexCoord3sv = glTexCoord3sv@4 +- glTexCoord4d = glTexCoord4d@32 +- glTexCoord4dv = glTexCoord4dv@4 +- glTexCoord4f = glTexCoord4f@16 +- glTexCoord4fv = glTexCoord4fv@4 +- glTexCoord4i = glTexCoord4i@16 +- glTexCoord4iv = glTexCoord4iv@4 +- glTexCoord4s = glTexCoord4s@16 +- glTexCoord4sv = glTexCoord4sv@4 +- glTexCoordPointer = glTexCoordPointer@16 +- glTexEnvf = glTexEnvf@12 +- glTexEnvfv = glTexEnvfv@12 +- glTexEnvi = glTexEnvi@12 +- glTexEnviv = glTexEnviv@12 +- glTexGend = glTexGend@16 +- glTexGendv = glTexGendv@12 +- glTexGenf = glTexGenf@12 +- glTexGenfv = glTexGenfv@12 +- glTexGeni = glTexGeni@12 +- glTexGeniv = glTexGeniv@12 +- glTexImage1D = glTexImage1D@32 +- glTexImage2D = glTexImage2D@36 +- glTexParameterf = glTexParameterf@12 +- glTexParameterfv = glTexParameterfv@12 +- glTexParameteri = glTexParameteri@12 +- glTexParameteriv = glTexParameteriv@12 +- glTexSubImage1D = glTexSubImage1D@28 +- glTexSubImage2D = glTexSubImage2D@36 +- glTranslated = glTranslated@24 +- glTranslatef = glTranslatef@12 +- glVertex2d = glVertex2d@16 +- glVertex2dv = glVertex2dv@4 +- glVertex2f = glVertex2f@8 +- glVertex2fv = glVertex2fv@4 +- glVertex2i = glVertex2i@8 +- glVertex2iv = glVertex2iv@4 +- glVertex2s = glVertex2s@8 +- glVertex2sv = glVertex2sv@4 +- glVertex3d = glVertex3d@24 +- glVertex3dv = glVertex3dv@4 +- glVertex3f = glVertex3f@12 +- glVertex3fv = glVertex3fv@4 +- glVertex3i = glVertex3i@12 +- glVertex3iv = glVertex3iv@4 +- glVertex3s = glVertex3s@12 +- glVertex3sv = glVertex3sv@4 +- glVertex4d = glVertex4d@32 +- glVertex4dv = glVertex4dv@4 +- glVertex4f = glVertex4f@16 +- glVertex4fv = glVertex4fv@4 +- glVertex4i = glVertex4i@16 +- glVertex4iv = glVertex4iv@4 +- glVertex4s = glVertex4s@16 +- glVertex4sv = glVertex4sv@4 +- glVertexPointer = glVertexPointer@16 +- glViewport = glViewport@16 +diff --git a/src/gallium/targets/wgl/gallium_wgl.def b/src/gallium/targets/wgl/gallium_wgl.def +deleted file mode 100644 +index 6d39d2eadc9bb2e941f3399efcc54f4b1c2c79da..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/wgl/gallium_wgl.def ++++ /dev/null +@@ -1,38 +0,0 @@ +-EXPORTS +- DrvCopyContext +- DrvCreateContext +- DrvCreateLayerContext +- DrvDeleteContext +- DrvDescribeLayerPlane +- DrvDescribePixelFormat +- DrvGetLayerPaletteEntries +- DrvGetProcAddress +- DrvPresentBuffers +- DrvRealizeLayerPalette +- DrvReleaseContext +- DrvSetCallbackProcs +- DrvSetContext +- DrvSetLayerPaletteEntries +- DrvSetPixelFormat +- DrvShareLists +- DrvSwapBuffers +- DrvSwapLayerBuffers +- DrvValidateVersion +- +- stw_get_device +- stw_init_screen +- stw_get_current_context +- stw_get_current_dc +- stw_pixelformat_choose +- stw_pixelformat_get +- stw_pixelformat_get_info +- stw_override_opengl32_entry_points +- stw_create_context_attribs +- stw_destroy_context +- stw_unbind_context +- stw_current_context +- stw_make_current +- stw_framebuffer_create +- stw_framebuffer_release_locked +- stw_framebuffer_unlock +- stw_framebuffer_swap_locked +diff --git a/src/gallium/targets/wgl/gallium_wgl.def.in b/src/gallium/targets/wgl/gallium_wgl.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..860389d48cc44bd61c4a3df6d1405c2ccf06f099 +--- /dev/null ++++ b/src/gallium/targets/wgl/gallium_wgl.def.in +@@ -0,0 +1,39 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++DrvCopyContext@12 ++DrvCreateContext@4 ++DrvCreateLayerContext@8 ++DrvDeleteContext@4 ++DrvDescribeLayerPlane@20 ++DrvDescribePixelFormat@16 ++DrvGetLayerPaletteEntries@20 ++DrvGetProcAddress@4 ++DrvPresentBuffers@8 ++DrvRealizeLayerPalette@12 ++DrvReleaseContext@4 ++DrvSetCallbackProcs@8 ++DrvSetContext@12 ++DrvSetLayerPaletteEntries@20 ++DrvSetPixelFormat@8 ++DrvShareLists@8 ++DrvSwapBuffers@4 ++DrvSwapLayerBuffers@8 ++DrvValidateVersion@4 ++ ++; __cdecl calling convention have no @number suffix ++stw_get_device ++stw_init_screen ++stw_get_current_context ++stw_get_current_dc ++stw_pixelformat_choose ++stw_pixelformat_get ++stw_pixelformat_get_info ++stw_override_opengl32_entry_points ++stw_create_context_attribs ++stw_destroy_context ++stw_unbind_context ++stw_current_context ++stw_make_current ++stw_framebuffer_create ++stw_framebuffer_release_locked ++stw_framebuffer_unlock ++stw_framebuffer_swap_locked +diff --git a/src/gallium/targets/wgl/gallium_wgl.mingw.def b/src/gallium/targets/wgl/gallium_wgl.mingw.def +deleted file mode 100644 +index ee23392d95ec26ca1d774f57b5979a153eab76a0..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/wgl/gallium_wgl.mingw.def ++++ /dev/null +@@ -1,26 +0,0 @@ +-EXPORTS +- DrvCopyContext = DrvCopyContext@12 +- DrvCreateContext = DrvCreateContext@4 +- DrvCreateLayerContext = DrvCreateLayerContext@8 +- DrvDeleteContext = DrvDeleteContext@4 +- DrvDescribeLayerPlane = DrvDescribeLayerPlane@20 +- DrvDescribePixelFormat = DrvDescribePixelFormat@16 +- DrvGetLayerPaletteEntries = DrvGetLayerPaletteEntries@20 +- DrvGetProcAddress = DrvGetProcAddress@4 +- DrvPresentBuffers = DrvPresentBuffers@8 +- DrvRealizeLayerPalette = DrvRealizeLayerPalette@12 +- DrvReleaseContext = DrvReleaseContext@4 +- DrvSetCallbackProcs = DrvSetCallbackProcs@8 +- DrvSetContext = DrvSetContext@12 +- DrvSetLayerPaletteEntries = DrvSetLayerPaletteEntries@20 +- DrvSetPixelFormat = DrvSetPixelFormat@8 +- DrvShareLists = DrvShareLists@8 +- DrvSwapBuffers = DrvSwapBuffers@4 +- DrvSwapLayerBuffers = DrvSwapLayerBuffers@8 +- DrvValidateVersion = DrvValidateVersion@4 +- +- stw_get_current_context = stw_get_current_context@0 +- stw_get_current_dc = stw_get_current_dc@0 +- stw_pixelformat_choose = stw_pixelformat_choose@8 +- stw_pixelformat_get = stw_pixelformat_get@4 +- stw_override_opengl32_entry_points = stw_override_opengl32_entry_points@8 +diff --git a/src/gallium/targets/wgl/meson.build b/src/gallium/targets/wgl/meson.build +index 92571a7c8f7bcf6847360bcd725732bd144f35c9..ace7c33eb9499a8058598570890d3e408918e7ff 100644 +--- a/src/gallium/targets/wgl/meson.build ++++ b/src/gallium/targets/wgl/meson.build +@@ -20,15 +20,15 @@ + + + gallium_wgl_link_args = [] +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- gallium_wgl_link_args += ['-Wl,--enable-stdcall-fixup'] +-endif + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- wgl_def = 'gallium_wgl.mingw.def' +-else +- wgl_def = 'gallium_wgl.def' +-endif ++wgl_def = custom_target( ++ 'gallium_wgl.def', ++ input: 'gallium_wgl.def.in', ++ output : 'gallium_wgl.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libgallium_wgl = shared_library( + 'gallium_wgl', +diff --git a/src/mapi/es1api/gles1.def.in b/src/mapi/es1api/gles1.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..b09aff6a8739e1ce197f8abe481f4b79a94d3adb +--- /dev/null ++++ b/src/mapi/es1api/gles1.def.in +@@ -0,0 +1,146 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++glActiveTexture@4 ++glAlphaFunc@8 ++glAlphaFuncx@8 ++glBindBuffer@8 ++glBindTexture@8 ++glBlendFunc@8 ++glBufferData@16 ++glBufferSubData@16 ++glClear@4 ++glClearColor@16 ++glClearColorx@16 ++glClearDepthf@4 ++glClearDepthx@4 ++glClearStencil@4 ++glClientActiveTexture@4 ++glClipPlanef@8 ++glClipPlanex@8 ++glColor4f@16 ++glColor4ub@16 ++glColor4x@16 ++glColorMask@16 ++glColorPointer@16 ++glCompressedTexImage2D@32 ++glCompressedTexSubImage2D@36 ++glCopyTexImage2D@32 ++glCopyTexSubImage2D@32 ++glCullFace@4 ++glDeleteBuffers@8 ++glDeleteTextures@8 ++glDepthFunc@4 ++glDepthMask@4 ++glDepthRangef@8 ++glDepthRangex@8 ++glDisable@4 ++glDisableClientState@4 ++glDrawArrays@12 ++glDrawElements@16 ++glEnable@4 ++glEnableClientState@4 ++glFinish@0 ++glFlush@0 ++glFogf@8 ++glFogfv@8 ++glFogx@8 ++glFogxv@8 ++glFrontFace@4 ++glFrustumf@24 ++glFrustumx@24 ++glGenBuffers@8 ++glGenTextures@8 ++glGetBooleanv@8 ++glGetBufferParameteriv@12 ++glGetClipPlanef@8 ++glGetClipPlanex@8 ++glGetError@0 ++glGetFixedv@8 ++glGetFloatv@8 ++glGetIntegerv@8 ++glGetLightfv@12 ++glGetLightxv@12 ++glGetMaterialfv@12 ++glGetMaterialxv@12 ++glGetPointerv@8 ++glGetString@4 ++glGetTexEnvfv@12 ++glGetTexEnviv@12 ++glGetTexEnvxv@12 ++glGetTexParameterfv@12 ++glGetTexParameteriv@12 ++glGetTexParameterxv@12 ++glHint@8 ++glIsBuffer@4 ++glIsEnabled@4 ++glIsTexture@4 ++glLightModelf@8 ++glLightModelfv@8 ++glLightModelx@8 ++glLightModelxv@8 ++glLightf@12 ++glLightfv@12 ++glLightx@12 ++glLightxv@12 ++glLineWidth@4 ++glLineWidthx@4 ++glLoadIdentity@0 ++glLoadMatrixf@4 ++glLoadMatrixx@4 ++glLogicOp@4 ++glMaterialf@12 ++glMaterialfv@12 ++glMaterialx@12 ++glMaterialxv@12 ++glMatrixMode@4 ++glMultMatrixf@4 ++glMultMatrixx@4 ++glMultiTexCoord4f@20 ++glMultiTexCoord4x@20 ++glNormal3f@12 ++glNormal3x@12 ++glNormalPointer@12 ++glOrthof@24 ++glOrthox@24 ++glPixelStorei@8 ++glPointParameterf@8 ++glPointParameterfv@8 ++glPointParameterx@8 ++glPointParameterxv@8 ++glPointSize@4 ++glPointSizePointerOES@12 ++glPointSizex@4 ++glPolygonOffset@8 ++glPolygonOffsetx@8 ++glPopMatrix@0 ++glPushMatrix@0 ++glReadPixels@28 ++glRotatef@16 ++glRotatex@16 ++glSampleCoverage@8 ++glSampleCoveragex@8 ++glScalef@12 ++glScalex@12 ++glScissor@16 ++glShadeModel@4 ++glStencilFunc@12 ++glStencilMask@4 ++glStencilOp@12 ++glTexCoordPointer@16 ++glTexEnvf@12 ++glTexEnvfv@12 ++glTexEnvi@12 ++glTexEnviv@12 ++glTexEnvx@12 ++glTexEnvxv@12 ++glTexImage2D@36 ++glTexParameterf@12 ++glTexParameterfv@12 ++glTexParameteri@12 ++glTexParameteriv@12 ++glTexParameterx@12 ++glTexParameterxv@12 ++glTexSubImage2D@36 ++glTranslatef@12 ++glTranslatex@12 ++glVertexPointer@16 ++glViewport@16 +diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build +index 8b749b1a3324be96f0d69816e638f1131ec8c307..4bca37b5e32f77d55655c49ca0580b75707edc6b 100644 +--- a/src/mapi/es1api/meson.build ++++ b/src/mapi/es1api/meson.build +@@ -29,12 +29,22 @@ es1_glapi_mapi_tmp_h = custom_target( + + _es1_c_args = [] + if with_platform_windows +- _es1_c_args += ['-D_GDI32_', '-DBUILD_GL32'] ++ _es1_c_args += ['-D_GDI32_'] + endif + ++gles1_def = custom_target( ++ 'gles1.def', ++ input: 'gles1.def.in', ++ output : 'gles1.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + libglesv1_cm = shared_library( + 'GLESv1_CM' + get_option('gles-lib-suffix'), + ['../entry.c', es1_glapi_mapi_tmp_h], ++ vs_module_defs : gles1_def, + c_args : [ + c_msvc_compat_args, + _es1_c_args, +diff --git a/src/mapi/es2api/gles2.def.in b/src/mapi/es2api/gles2.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..4517ea8b739e72d950930ee94b51dc71829dea8e +--- /dev/null ++++ b/src/mapi/es2api/gles2.def.in +@@ -0,0 +1,359 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++glActiveShaderProgram@8 ++glActiveTexture@4 ++glAttachShader@8 ++glBeginQuery@8 ++glBeginTransformFeedback@4 ++glBindAttribLocation@12 ++glBindBuffer@8 ++glBindBufferBase@12 ++glBindBufferRange@20 ++glBindFramebuffer@8 ++glBindImageTexture@28 ++glBindProgramPipeline@4 ++glBindRenderbuffer@8 ++glBindSampler@8 ++glBindTexture@8 ++glBindTransformFeedback@8 ++glBindVertexArray@4 ++glBindVertexBuffer@16 ++glBlendBarrier@0 ++glBlendColor@16 ++glBlendEquation@4 ++glBlendEquationSeparate@8 ++glBlendEquationSeparatei@12 ++glBlendEquationi@8 ++glBlendFunc@8 ++glBlendFuncSeparate@16 ++glBlendFuncSeparatei@20 ++glBlendFunci@12 ++glBlitFramebuffer@40 ++glBufferData@16 ++glBufferSubData@16 ++glCheckFramebufferStatus@4 ++glClear@4 ++glClearBufferfi@16 ++glClearBufferfv@12 ++glClearBufferiv@12 ++glClearBufferuiv@12 ++glClearColor@16 ++glClearDepthf@4 ++glClearStencil@4 ++glClientWaitSync@16 ++glColorMask@16 ++glColorMaski@20 ++glCompileShader@4 ++glCompressedTexImage2D@32 ++glCompressedTexImage3D@36 ++glCompressedTexSubImage2D@36 ++glCompressedTexSubImage3D@44 ++glCopyBufferSubData@20 ++glCopyImageSubData@60 ++glCopyTexImage2D@32 ++glCopyTexSubImage2D@32 ++glCopyTexSubImage3D@36 ++glCreateProgram@0 ++glCreateShader@4 ++glCreateShaderProgramv@12 ++glCullFace@4 ++glDebugMessageCallback@8 ++glDebugMessageControl@24 ++glDebugMessageInsert@24 ++glDeleteBuffers@8 ++glDeleteFramebuffers@8 ++glDeleteProgram@4 ++glDeleteProgramPipelines@8 ++glDeleteQueries@8 ++glDeleteRenderbuffers@8 ++glDeleteSamplers@8 ++glDeleteShader@4 ++glDeleteSync@4 ++glDeleteTextures@8 ++glDeleteTransformFeedbacks@8 ++glDeleteVertexArrays@8 ++glDepthFunc@4 ++glDepthMask@4 ++glDepthRangef@8 ++glDetachShader@8 ++glDisable@4 ++glDisableVertexAttribArray@4 ++glDisablei@8 ++glDispatchCompute@12 ++glDispatchComputeIndirect@4 ++glDrawArrays@12 ++glDrawArraysIndirect@8 ++glDrawArraysInstanced@16 ++glDrawBuffers@8 ++glDrawElements@16 ++glDrawElementsBaseVertex@20 ++glDrawElementsIndirect@12 ++glDrawElementsInstanced@20 ++glDrawElementsInstancedBaseVertex@24 ++glDrawRangeElements@24 ++glDrawRangeElementsBaseVertex@28 ++glEnable@4 ++glEnableVertexAttribArray@4 ++glEnablei@8 ++glEndQuery@4 ++glEndTransformFeedback@0 ++glFenceSync@8 ++glFinish@0 ++glFlush@0 ++glFlushMappedBufferRange@12 ++glFramebufferParameteri@12 ++glFramebufferRenderbuffer@16 ++glFramebufferTexture2D@20 ++glFramebufferTexture@16 ++glFramebufferTextureLayer@20 ++glFrontFace@4 ++glGenBuffers@8 ++glGenFramebuffers@8 ++glGenProgramPipelines@8 ++glGenQueries@8 ++glGenRenderbuffers@8 ++glGenSamplers@8 ++glGenTextures@8 ++glGenTransformFeedbacks@8 ++glGenVertexArrays@8 ++glGenerateMipmap@4 ++glGetActiveAttrib@28 ++glGetActiveUniform@28 ++glGetActiveUniformBlockName@20 ++glGetActiveUniformBlockiv@16 ++glGetActiveUniformsiv@20 ++glGetAttachedShaders@16 ++glGetAttribLocation@8 ++glGetBooleani_v@12 ++glGetBooleanv@8 ++glGetBufferParameteri64v@12 ++glGetBufferParameteriv@12 ++glGetBufferPointerv@12 ++glGetDebugMessageLog@32 ++glGetError@0 ++glGetFloatv@8 ++glGetFragDataLocation@8 ++glGetFramebufferAttachmentParameteriv@16 ++glGetFramebufferParameteriv@12 ++glGetGraphicsResetStatus@0 ++glGetInteger64i_v@12 ++glGetInteger64v@8 ++glGetIntegeri_v@12 ++glGetIntegerv@8 ++glGetInternalformativ@20 ++glGetMultisamplefv@12 ++glGetObjectLabel@20 ++glGetObjectPtrLabel@16 ++glGetPointerv@8 ++glGetProgramBinary@20 ++glGetProgramInfoLog@16 ++glGetProgramInterfaceiv@16 ++glGetProgramPipelineInfoLog@16 ++glGetProgramPipelineiv@12 ++glGetProgramResourceIndex@12 ++glGetProgramResourceLocation@12 ++glGetProgramResourceName@24 ++glGetProgramResourceiv@32 ++glGetProgramiv@12 ++glGetQueryObjectuiv@12 ++glGetQueryiv@12 ++glGetRenderbufferParameteriv@12 ++glGetSamplerParameterIiv@12 ++glGetSamplerParameterIuiv@12 ++glGetSamplerParameterfv@12 ++glGetSamplerParameteriv@12 ++glGetShaderInfoLog@16 ++glGetShaderPrecisionFormat@16 ++glGetShaderSource@16 ++glGetShaderiv@12 ++glGetString@4 ++glGetStringi@8 ++glGetSynciv@20 ++glGetTexLevelParameterfv@16 ++glGetTexLevelParameteriv@16 ++glGetTexParameterIiv@12 ++glGetTexParameterIuiv@12 ++glGetTexParameterfv@12 ++glGetTexParameteriv@12 ++glGetTransformFeedbackVarying@28 ++glGetUniformBlockIndex@8 ++glGetUniformIndices@16 ++glGetUniformLocation@8 ++glGetUniformfv@12 ++glGetUniformiv@12 ++glGetUniformuiv@12 ++glGetVertexAttribIiv@12 ++glGetVertexAttribIuiv@12 ++glGetVertexAttribPointerv@12 ++glGetVertexAttribfv@12 ++glGetVertexAttribiv@12 ++glGetnUniformfv@16 ++glGetnUniformiv@16 ++glGetnUniformuiv@16 ++glHint@8 ++glInvalidateFramebuffer@12 ++glInvalidateSubFramebuffer@28 ++glIsBuffer@4 ++glIsEnabled@4 ++glIsEnabledi@8 ++glIsFramebuffer@4 ++glIsProgram@4 ++glIsProgramPipeline@4 ++glIsQuery@4 ++glIsRenderbuffer@4 ++glIsSampler@4 ++glIsShader@4 ++glIsSync@4 ++glIsTexture@4 ++glIsTransformFeedback@4 ++glIsVertexArray@4 ++glLineWidth@4 ++glLinkProgram@4 ++glMapBufferRange@16 ++glMemoryBarrier@4 ++glMemoryBarrierByRegion@4 ++glMinSampleShading@4 ++glObjectLabel@16 ++glObjectPtrLabel@12 ++glPatchParameteri@8 ++glPauseTransformFeedback@0 ++glPixelStorei@8 ++glPolygonOffset@8 ++glPopDebugGroup@0 ++glPrimitiveBoundingBox@32 ++glProgramBinary@16 ++glProgramParameteri@12 ++glProgramUniform1f@12 ++glProgramUniform1fv@16 ++glProgramUniform1i@12 ++glProgramUniform1iv@16 ++glProgramUniform1ui@12 ++glProgramUniform1uiv@16 ++glProgramUniform2f@16 ++glProgramUniform2fv@16 ++glProgramUniform2i@16 ++glProgramUniform2iv@16 ++glProgramUniform2ui@16 ++glProgramUniform2uiv@16 ++glProgramUniform3f@20 ++glProgramUniform3fv@16 ++glProgramUniform3i@20 ++glProgramUniform3iv@16 ++glProgramUniform3ui@20 ++glProgramUniform3uiv@16 ++glProgramUniform4f@24 ++glProgramUniform4fv@16 ++glProgramUniform4i@24 ++glProgramUniform4iv@16 ++glProgramUniform4ui@24 ++glProgramUniform4uiv@16 ++glProgramUniformMatrix2fv@20 ++glProgramUniformMatrix2x3fv@20 ++glProgramUniformMatrix2x4fv@20 ++glProgramUniformMatrix3fv@20 ++glProgramUniformMatrix3x2fv@20 ++glProgramUniformMatrix3x4fv@20 ++glProgramUniformMatrix4fv@20 ++glProgramUniformMatrix4x2fv@20 ++glProgramUniformMatrix4x3fv@20 ++glPushDebugGroup@16 ++glReadBuffer@4 ++glReadPixels@28 ++glReadnPixels@32 ++glReleaseShaderCompiler@0 ++glRenderbufferStorage@16 ++glRenderbufferStorageMultisample@20 ++glResumeTransformFeedback@0 ++glSampleCoverage@8 ++glSampleMaski@8 ++glSamplerParameterIiv@12 ++glSamplerParameterIuiv@12 ++glSamplerParameterf@12 ++glSamplerParameterfv@12 ++glSamplerParameteri@12 ++glSamplerParameteriv@12 ++glScissor@16 ++glShaderBinary@20 ++glShaderSource@16 ++glStencilFunc@12 ++glStencilFuncSeparate@16 ++glStencilMask@4 ++glStencilMaskSeparate@8 ++glStencilOp@12 ++glStencilOpSeparate@16 ++glTexBuffer@12 ++glTexBufferRange@20 ++glTexImage2D@36 ++glTexImage3D@40 ++glTexParameterIiv@12 ++glTexParameterIuiv@12 ++glTexParameterf@12 ++glTexParameterfv@12 ++glTexParameteri@12 ++glTexParameteriv@12 ++glTexStorage2D@20 ++glTexStorage2DMultisample@24 ++glTexStorage3D@24 ++glTexStorage3DMultisample@28 ++glTexSubImage2D@36 ++glTexSubImage3D@44 ++glTransformFeedbackVaryings@16 ++glUniform1f@8 ++glUniform1fv@12 ++glUniform1i@8 ++glUniform1iv@12 ++glUniform1ui@8 ++glUniform1uiv@12 ++glUniform2f@12 ++glUniform2fv@12 ++glUniform2i@12 ++glUniform2iv@12 ++glUniform2ui@12 ++glUniform2uiv@12 ++glUniform3f@16 ++glUniform3fv@12 ++glUniform3i@16 ++glUniform3iv@12 ++glUniform3ui@16 ++glUniform3uiv@12 ++glUniform4f@20 ++glUniform4fv@12 ++glUniform4i@20 ++glUniform4iv@12 ++glUniform4ui@20 ++glUniform4uiv@12 ++glUniformBlockBinding@12 ++glUniformMatrix2fv@16 ++glUniformMatrix2x3fv@16 ++glUniformMatrix2x4fv@16 ++glUniformMatrix3fv@16 ++glUniformMatrix3x2fv@16 ++glUniformMatrix3x4fv@16 ++glUniformMatrix4fv@16 ++glUniformMatrix4x2fv@16 ++glUniformMatrix4x3fv@16 ++glUnmapBuffer@4 ++glUseProgram@4 ++glUseProgramStages@12 ++glValidateProgram@4 ++glValidateProgramPipeline@4 ++glVertexAttrib1f@8 ++glVertexAttrib1fv@8 ++glVertexAttrib2f@12 ++glVertexAttrib2fv@8 ++glVertexAttrib3f@16 ++glVertexAttrib3fv@8 ++glVertexAttrib4f@20 ++glVertexAttrib4fv@8 ++glVertexAttribBinding@8 ++glVertexAttribDivisor@8 ++glVertexAttribFormat@20 ++glVertexAttribI4i@20 ++glVertexAttribI4iv@8 ++glVertexAttribI4ui@20 ++glVertexAttribI4uiv@8 ++glVertexAttribIFormat@16 ++glVertexAttribIPointer@20 ++glVertexAttribPointer@24 ++glVertexBindingDivisor@8 ++glViewport@16 ++glWaitSync@16 +diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build +index 356c5760c495e5b8a52abc2c841741f9b2b47222..8b133daa131276025072b4a85318e423206981cc 100644 +--- a/src/mapi/es2api/meson.build ++++ b/src/mapi/es2api/meson.build +@@ -29,12 +29,22 @@ es2_glapi_mapi_tmp_h = custom_target( + + _es2_c_args = [] + if with_platform_windows +- _es2_c_args += ['-D_GDI32_', '-DBUILD_GL32'] ++ _es2_c_args += ['-D_GDI32_'] + endif + ++gles2_def = custom_target( ++ 'gles2.def', ++ input: 'gles2.def.in', ++ output : 'gles2.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + libgles2 = shared_library( + 'GLESv2' + get_option('gles-lib-suffix'), + ['../entry.c', es2_glapi_mapi_tmp_h], ++ vs_module_defs : gles2_def, + c_args : [ + c_msvc_compat_args, + _es2_c_args, +diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build +index 270b9870b400803d5cc8c484242c65b96ba99b9d..9f06207fe0a24e123b542ddf886ce2b325b0e105 100644 +--- a/src/mapi/glapi/meson.build ++++ b/src/mapi/glapi/meson.build +@@ -52,7 +52,7 @@ if with_shared_glapi + else + static_glapi_args += '-DMAPI_MODE_UTIL' + if with_platform_windows +- static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS'] ++ static_glapi_args += ['-D_GDI32_', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS'] + endif + static_glapi_files += files( + 'glapi_dispatch.c', +diff --git a/src/mesa/meson.build b/src/mesa/meson.build +index bc7963413ff46781ae4a58a7762a58a73e67a23a..08b0cac497490fa40230861bd24bdba6e83016ad 100644 +--- a/src/mesa/meson.build ++++ b/src/mesa/meson.build +@@ -489,7 +489,6 @@ _mesa_windows_args = [] + if with_platform_windows + _mesa_windows_args += [ + '-D_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers +- '-DBUILD_GL32' # declare gl* as __declspec(dllexport) in Mesa headers + ] + if not with_shared_glapi + # prevent _glapi_* from being declared __declspec(dllimport) +diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build +index 6384af782976e3f8300cf5e69d11e98fa6ac5e83..8c2f0dd08632116eebbd982516e1004e9db01e09 100644 +--- a/src/vulkan/meson.build ++++ b/src/vulkan/meson.build +@@ -27,6 +27,15 @@ vulkan_wsi_args = [] + vulkan_wsi_deps = [] + vulkan_wsi_list = [] + ++vulkan_api_def = custom_target( ++ 'vulkan_api.def', ++ input: 'vulkan_api.def.in', ++ output : 'vulkan_api.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + if with_platform_x11 + vulkan_wsi_deps += [ + dep_xcb, +diff --git a/src/vulkan/vulkan_api.def.in b/src/vulkan/vulkan_api.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..678e4d99278b96d0ef1ee15c51e5febf8fcea58e +--- /dev/null ++++ b/src/vulkan/vulkan_api.def.in +@@ -0,0 +1,4 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++vk_icdNegotiateLoaderICDInterfaceVersion@4 ++vk_icdGetInstanceProcAddr@8 ++vk_icdGetPhysicalDeviceProcAddr@8 diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index e11491af8046d9..03ee3c3d992353 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -3,16 +3,12 @@ # Patches are from https://github.com/pal1000/mesa-dist-win/tree/master/patches set(PATCHES - # Fix swrAVX512 build - swravx512-post-static-link.patch - # Fix swr build with MSVC - swr-msvc-2.patch - # Fix swr build with LLVM 13 - swr-llvm13.patch - # Fix radv MSVC build with LLVM 13 - radv-msvc-llvm13-2.patch - # Fix d3d10sw MSVC build - d3d10sw.patch + # Fix symbols exporting for MinGW GCC x86 + def-fixes.patch + # Fix MinGW clang build + clang.patch + # Clover build on Windows + clover.patch ) vcpkg_check_linkage(ONLY_DYNAMIC_CRT) @@ -24,8 +20,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO mesa/mesa - REF mesa-21.2.5 - SHA512 a9ead27f08e862738938cf728928b7937ff37e4c26967f2e46e40a3c8419159397f75b2f4ce43f9b453b35bb3716df581087fb7ba8434fafdfab9488c3db6f92 + REF mesa-22.0.2 + SHA512 1139bae1fa9f9b49727c5aaddad9b2908c7643d7c6c435544e8322c84d17c012f04aa73876bef8cab9b517e36957eb2a678b3001da2d69a32497ef4569f6172e FILE_DISAMBIGUATOR 1 HEAD_REF master PATCHES ${PATCHES} @@ -59,7 +55,6 @@ if(WIN32) # WIN32 HOST probably has win_flex and win_bison! endif() # For features https://github.com/pal1000/mesa-dist-win should be probably studied a bit more. -#string(APPEND GALLIUM_DRIVERS 'auto') list(APPEND MESA_OPTIONS -Dzstd=enabled) list(APPEND MESA_OPTIONS -Dshared-llvm=auto) list(APPEND MESA_OPTIONS -Dlibunwind=disabled) @@ -70,24 +65,12 @@ list(APPEND MESA_OPTIONS -Dglx=disabled) list(APPEND MESA_OPTIONS -Dgbm=disabled) list(APPEND MESA_OPTIONS -Dosmesa=true) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND MESA_OPTIONS -Dshared-swr=false) - list(APPEND MESA_OPTIONS "-Dswr-arches=['avx']") -else() - list(APPEND MESA_OPTIONS -Dshared-swr=true) - list(APPEND MESA_OPTIONS "-Dswr-arches=['avx','avx2','knl','skx']") -endif() - -string(APPEND GALLIUM_DRIVERS 'swrast') if("llvm" IN_LIST FEATURES) list(APPEND MESA_OPTIONS -Dllvm=enabled) - string(APPEND GALLIUM_DRIVERS ",'swr'") # SWR always requires llvm else() list(APPEND MESA_OPTIONS -Dllvm=disabled) endif() -list(APPEND MESA_OPTIONS -Dgallium-drivers=[${GALLIUM_DRIVERS}]) - if("gles1" IN_LIST FEATURES) list(APPEND MESA_OPTIONS -Dgles1=enabled) else() @@ -114,12 +97,12 @@ list(APPEND MESA_OPTIONS -Dshared-glapi=enabled) #shared GLAPI required when bu if(VCPKG_TARGET_IS_WINDOWS) list(APPEND MESA_OPTIONS -Dplatforms=['windows']) list(APPEND MESA_OPTIONS -Dmicrosoft-clc=disabled) - if(NOT VCPKG_TARGET_IS_MINGW) - set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") - set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") - endif() + if(NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") + endif() endif() - + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/mesa/radv-msvc-llvm13-2.patch b/ports/mesa/radv-msvc-llvm13-2.patch deleted file mode 100644 index 039ef66d93fe0f..00000000000000 --- a/ports/mesa/radv-msvc-llvm13-2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/amd/compiler/aco_print_asm.cpp b/src/amd/compiler/aco_print_asm.cpp -index dcc7c4bc747..413e6464c79 100644 ---- a/src/amd/compiler/aco_print_asm.cpp -+++ b/src/amd/compiler/aco_print_asm.cpp -@@ -24,6 +24,9 @@ - - #include "aco_ir.h" - -+#if defined(_MSC_VER) && defined(restrict) -+#undef restrict -+#endif - #include "llvm/ac_llvm_util.h" - - #include "llvm-c/Disassembler.h" diff --git a/ports/mesa/swr-llvm13.patch b/ports/mesa/swr-llvm13.patch deleted file mode 100644 index e0da05bf5b53c8..00000000000000 --- a/ports/mesa/swr-llvm13.patch +++ /dev/null @@ -1,334 +0,0 @@ -diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp -index 44482939c7649a2bcc39f3b2eb75720de90bcef0..1124e3773b99430c8da5ccb061d92b1b3a1bf1a6 100644 ---- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp -+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp -@@ -56,6 +56,14 @@ - using namespace llvm; - using namespace SwrJit; - -+#if LLVM_VERSION_MAJOR >= 7 -+static constexpr llvm::sys::fs::OpenFlags OF_NONE = llvm::sys::fs::OF_None; -+static constexpr llvm::sys::fs::OpenFlags OF_TEXT = llvm::sys::fs::OF_Text; -+#else -+static constexpr llvm::sys::fs::OpenFlags OF_NONE = llvm::sys::fs::F_None; -+static constexpr llvm::sys::fs::OpenFlags OF_TEXT = llvm::sys::fs::F_Text; -+#endif -+ - ////////////////////////////////////////////////////////////////////////// - /// @brief Contructor for JitManager. - /// @param simdWidth - SIMD width to be used in generated program. -@@ -437,7 +445,7 @@ void JitManager::DumpAsm(Function* pFunction, const char* fileName) - sprintf(fName, "%s.%s.asm", funcName, fileName); - #endif - -- raw_fd_ostream filestream(fName, EC, llvm::sys::fs::F_None); -+ raw_fd_ostream filestream(fName, EC, OF_NONE); - - legacy::PassManager* pMPasses = new legacy::PassManager(); - auto* pTarget = mpExec->getTargetMachine(); -@@ -490,7 +498,7 @@ void JitManager::DumpToFile(Module* M, - #else - sprintf(fName, "%s.%s.ll", funcName, fileName); - #endif -- raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None); -+ raw_fd_ostream fd(fName, EC, OF_NONE); - M->print(fd, annotater); - fd.flush(); - } -@@ -512,7 +520,7 @@ void JitManager::DumpToFile(Function* f, const char* fileName) - #else - sprintf(fName, "%s.%s.ll", funcName, fileName); - #endif -- raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None); -+ raw_fd_ostream fd(fName, EC, OF_NONE); - f->print(fd, nullptr); - - #if defined(_WIN32) -@@ -522,7 +530,7 @@ void JitManager::DumpToFile(Function* f, const char* fileName) - #endif - fd.flush(); - -- raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::F_Text); -+ raw_fd_ostream fd_cfg(fName, EC, OF_TEXT); - WriteGraph(fd_cfg, (const Function*)f); - - fd_cfg.flush(); -@@ -726,7 +734,7 @@ void JitCache::notifyObjectCompiled(const llvm::Module* M, llvm::MemoryBufferRef - - { - std::error_code err; -- llvm::raw_fd_ostream fileObj(objPath.c_str(), err, llvm::sys::fs::F_None); -+ llvm::raw_fd_ostream fileObj(objPath.c_str(), err, OF_NONE); - fileObj << Obj.getBuffer(); - fileObj.flush(); - } -@@ -734,7 +742,7 @@ void JitCache::notifyObjectCompiled(const llvm::Module* M, llvm::MemoryBufferRef - - { - std::error_code err; -- llvm::raw_fd_ostream fileObj(filePath.c_str(), err, llvm::sys::fs::F_None); -+ llvm::raw_fd_ostream fileObj(filePath.c_str(), err, OF_NONE); - - uint32_t objcrc = ComputeCRC(0, Obj.getBufferStart(), Obj.getBufferSize()); - -diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h -index c361959b76ff0799f5102ad4b8ddf23d345105d9..64a690b47fac9ee99eba8f1259ffccf20f0e5fa0 100644 ---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h -+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h -@@ -41,31 +41,29 @@ namespace SwrJit - BuilderGfxMem(JitManager* pJitMgr); - virtual ~BuilderGfxMem() {} - -- virtual Value* GEP(Value* Ptr, Value* Idx, Type* Ty = nullptr, bool isReadOnly = true, const Twine& Name = ""); -- virtual Value* GEP(Type* Ty, Value* Ptr, Value* Idx, const Twine& Name = ""); -- virtual Value* -- GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr); -- virtual Value* -- GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr); -+ virtual Value* GEP(Value* Ptr, Value* Idx, Type* Ty = nullptr, bool isReadOnly = true, const Twine& Name = "") override; -+ virtual Value* GEP(Type* Ty, Value* Ptr, Value* Idx, const Twine& Name = "") override; -+ virtual Value* GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr) override; -+ virtual Value* GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr) override; - - virtual LoadInst* LOAD(Value* Ptr, - const char* Name, - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - virtual LoadInst* LOAD(Value* Ptr, - const Twine& Name = "", - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - virtual LoadInst* LOAD(Value* Ptr, - bool isVolatile, - const Twine& Name = "", - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - virtual LoadInst* LOAD(Value* BasePtr, - const std::initializer_list& offset, - const llvm::Twine& Name = "", - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - - virtual CallInst* MASKED_LOAD(Value* Ptr, - unsigned Align, -@@ -73,32 +71,32 @@ namespace SwrJit - Value* PassThru = nullptr, - const Twine& Name = "", - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - -- virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -- -- virtual StoreInst* STORE(Value* Val, Value* BasePtr, const std::initializer_list& offset, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - -- virtual CallInst* MASKED_STORE(Value *Val, Value *Ptr, unsigned Align, Value *Mask, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ virtual StoreInst* STORE(Value* Val, Value* BasePtr, const std::initializer_list& offset, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; -+ -+ virtual CallInst* MASKED_STORE(Value *Val, Value *Ptr, unsigned Align, Value *Mask, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - - virtual Value* GATHERPS(Value* src, - Value* pBase, - Value* indices, - Value* mask, - uint8_t scale = 1, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - virtual Value* GATHERDD(Value* src, - Value* pBase, - Value* indices, - Value* mask, - uint8_t scale = 1, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - - virtual void SCATTERPS(Value* pDst, - Value* vSrc, - Value* vOffsets, - Value* vMask, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - - Value* TranslateGfxAddressForRead(Value* xpGfxAddress, - Type* PtrTy = nullptr, -@@ -108,13 +106,13 @@ namespace SwrJit - Type* PtrTy = nullptr, - const Twine& Name = "", - MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -- -+ - protected: - void AssertGFXMemoryParams(Value* ptr, MEM_CLIENT usage); - - virtual void NotifyPrivateContextSet(); - -- virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant* offset); -+ virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant* offset) override; - - Value* TranslationHelper(Value* Ptr, Type* Ty, Value* pfnTranslateGfxAddress); - void TrackerHelper(Value* Ptr, Type* Ty, MEM_CLIENT usage, bool isRead); -diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp -index b5eb0a782b15214bcf954a7893cd628649a990fc..a16b5d11dbb2f2f1a0bcdc07e4d306b14a90dc4c 100644 ---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp -+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp -@@ -82,7 +82,12 @@ namespace SwrJit - std::vector indices; - for (auto i : indexList) - indices.push_back(i); -+#if LLVM_VERSION_MAJOR >= 13 -+ Type *EltTy = cast(ptr->getType())->getElementType(); -+ return IN_BOUNDS_GEP(EltTy, ptr, indices); -+#else - return IN_BOUNDS_GEP(ptr, indices); -+#endif - } - - Value* Builder::IN_BOUNDS_GEP(Value* ptr, const std::initializer_list& indexList) -@@ -90,7 +95,12 @@ namespace SwrJit - std::vector indices; - for (auto i : indexList) - indices.push_back(C(i)); -+#if LLVM_VERSION_MAJOR >= 13 -+ Type *EltTy = cast(ptr->getType())->getElementType(); -+ return IN_BOUNDS_GEP(EltTy, ptr, indices); -+#else - return IN_BOUNDS_GEP(ptr, indices); -+#endif - } - - LoadInst* Builder::LOAD(Value* Ptr, const char* Name, Type* Ty, MEM_CLIENT usage) -@@ -130,6 +140,22 @@ namespace SwrJit - return Builder::LOAD(GEPA(basePtr, valIndices), name); - } - -+ CallInst* Builder::MASKED_LOAD(Value* Ptr, -+ unsigned Align, -+ Value* Mask, -+ Value* PassThru, -+ const Twine& Name, -+ Type* Ty, -+ MEM_CLIENT usage) -+ { -+#if LLVM_VERSION_MAJOR >= 13 -+ Type *EltTy = cast(Ptr->getType())->getElementType(); -+ return IRB()->CreateMaskedLoad(EltTy, Ptr, AlignType(Align), Mask, PassThru, Name); -+#else -+ return IRB()->CreateMaskedLoad(Ptr, AlignType(Align), Mask, PassThru, Name); -+#endif -+ } -+ - LoadInst* Builder::LOADV(Value* basePtr, - const std::initializer_list& indices, - const llvm::Twine& name) -@@ -234,7 +260,12 @@ namespace SwrJit - /// @param pVecPassthru - SIMD wide vector of values to load when lane is inactive - Value* Builder::GATHER_PTR(Value* pVecSrcPtr, Value* pVecMask, Value* pVecPassthru) - { -+#if LLVM_VERSION_MAJOR >= 13 -+ Type *EltTy = cast(pVecSrcPtr->getType())->getElementType(); -+ return MASKED_GATHER(EltTy, pVecSrcPtr, AlignType(4), pVecMask, pVecPassthru); -+#else - return MASKED_GATHER(pVecSrcPtr, AlignType(4), pVecMask, pVecPassthru); -+#endif - } - - void Builder::SCATTER_PTR(Value* pVecDstPtr, Value* pVecSrc, Value* pVecMask) -diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h -index 429d5779a4db2a6a3b6c7a7d02169773c935bb95..6682ad892b4038d4b3172b932a34e31a89cd7790 100644 ---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h -+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h -@@ -82,10 +82,7 @@ virtual CallInst* MASKED_LOAD(Value* Ptr, - Value* PassThru = nullptr, - const Twine& Name = "", - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) --{ -- return IRB()->CreateMaskedLoad(Ptr, AlignType(Align), Mask, PassThru, Name); --} -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); - - virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) - { -diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp -index bd5f7588c9189275ddaf3075b0a75e2e8fc1ecf5..2a4cf74722bc9ef1831d25fe6c2bb2f510b8fceb 100644 ---- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp -+++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp -@@ -276,7 +276,8 @@ Function* FetchJit::Create(const FETCH_COMPILE_STATE& fetchState) - JitManager::DumpToFile(fetch, "src"); - - #if defined(_DEBUG) -- verifyFunction(*fetch); -+ // Note that false is returned if there are no errors -+ SWR_ASSERT(!verifyFunction(*fetch, &llvm::errs())); - #endif - - ::FunctionPassManager setupPasses(JM()->mpCurrentModule); -diff --git a/src/gallium/drivers/swr/swr_shader.cpp b/src/gallium/drivers/swr/swr_shader.cpp -index 315036920fb3ad364d0039349e148c70e5ba1818..a643b46cd081c026b5a3558d22be557338d4f220 100644 ---- a/src/gallium/drivers/swr/swr_shader.cpp -+++ b/src/gallium/drivers/swr/swr_shader.cpp -@@ -1557,8 +1557,10 @@ BuilderSWR::CompileGS(struct swr_context *ctx, swr_jit_gs_key &key) - AttributeSet attrSet = AttributeSet::get( - JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); - pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); --#else -+#elif LLVM_VERSION_MAJOR < 14 - pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); -+#else -+ pFunction->addFnAttrs(attrBuilder); - #endif - - BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); -@@ -1785,8 +1787,10 @@ BuilderSWR::CompileTES(struct swr_context *ctx, swr_jit_tes_key &key) - AttributeSet attrSet = AttributeSet::get( - JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); - pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); --#else -+#elif LLVM_VERSION_MAJOR < 14 - pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); -+#else -+ pFunction->addFnAttrs(attrBuilder); - #endif - - BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); -@@ -2086,8 +2090,10 @@ BuilderSWR::CompileTCS(struct swr_context *ctx, swr_jit_tcs_key &key) - AttributeSet attrSet = AttributeSet::get( - JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); - pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); --#else -+#elif LLVM_VERSION_MAJOR < 14 - pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); -+#else -+ pFunction->addFnAttrs(attrBuilder); - #endif - - BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); -@@ -2341,8 +2347,10 @@ BuilderSWR::CompileVS(struct swr_context *ctx, swr_jit_vs_key &key) - AttributeSet attrSet = AttributeSet::get( - JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); - pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); --#else -+#elif LLVM_VERSION_MAJOR < 14 - pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); -+#else -+ pFunction->addFnAttrs(attrBuilder); - #endif - - BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); -@@ -2646,8 +2654,10 @@ BuilderSWR::CompileFS(struct swr_context *ctx, swr_jit_fs_key &key) - AttributeSet attrSet = AttributeSet::get( - JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); - pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); --#else -+#elif LLVM_VERSION_MAJOR < 14 - pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); -+#else -+ pFunction->addFnAttrs(attrBuilder); - #endif - - BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); diff --git a/ports/mesa/swr-msvc-2.patch b/ports/mesa/swr-msvc-2.patch deleted file mode 100644 index f202fa0e865dc6..00000000000000 --- a/ports/mesa/swr-msvc-2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 68d1addf6f0cf693fdb42db3555112e257a3d771 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= -Date: Sun, 24 Oct 2021 21:36:09 -0400 -Subject: [PATCH] swr: fix MSVC build - ---- - src/gallium/drivers/swr/swr_draw.cpp | 6 +++--- - src/gallium/drivers/swr/swr_state.cpp | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/gallium/drivers/swr/swr_draw.cpp b/src/gallium/drivers/swr/swr_draw.cpp -index 4b42a8e0390..5d862adb39d 100644 ---- a/src/gallium/drivers/swr/swr_draw.cpp -+++ b/src/gallium/drivers/swr/swr_draw.cpp -@@ -62,7 +62,7 @@ swr_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info, - - if (!indirect && - !info->primitive_restart && -- !u_trim_pipe_prim(info->mode, (unsigned*)&draws[0].count)) -+ !u_trim_pipe_prim((enum pipe_prim_type)info->mode, (unsigned*)&draws[0].count)) - return; - - if (!swr_check_render_cond(pipe)) -@@ -102,7 +102,7 @@ swr_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info, - STREAMOUT_COMPILE_STATE state = {0}; - struct pipe_stream_output_info *so = &ctx->vs->pipe.stream_output; - -- state.numVertsPerPrim = u_vertices_per_prim(info->mode); -+ state.numVertsPerPrim = u_vertices_per_prim((enum pipe_prim_type)info->mode); - - uint32_t offsets[MAX_SO_STREAMS] = {0}; - uint32_t num = 0; -@@ -221,7 +221,7 @@ swr_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info, - if (ctx->gs) - topology = (pipe_prim_type)ctx->gs->info.base.properties[TGSI_PROPERTY_GS_OUTPUT_PRIM]; - else -- topology = info->mode; -+ topology = (enum pipe_prim_type)info->mode; - - switch (topology) { - case PIPE_PRIM_TRIANGLE_FAN: -diff --git a/src/gallium/drivers/swr/swr_state.cpp b/src/gallium/drivers/swr/swr_state.cpp -index 5f1464e6d0e..818328750bd 100644 ---- a/src/gallium/drivers/swr/swr_state.cpp -+++ b/src/gallium/drivers/swr/swr_state.cpp -@@ -1731,7 +1731,7 @@ swr_update_derived(struct pipe_context *pipe, - /* Has to be before fragment shader, since it sets SWR_NEW_FS */ - if (p_draw_info) { - bool new_prim_is_poly = -- (u_reduced_prim(p_draw_info->mode) == PIPE_PRIM_TRIANGLES) && -+ (u_reduced_prim((enum pipe_prim_type)p_draw_info->mode) == PIPE_PRIM_TRIANGLES) && - (ctx->derived.rastState.fillMode == SWR_FILLMODE_SOLID); - if (new_prim_is_poly != ctx->poly_stipple.prim_is_poly) { - ctx->dirty |= SWR_NEW_FS; --- -2.25.1 - diff --git a/ports/mesa/swravx512-post-static-link.patch b/ports/mesa/swravx512-post-static-link.patch deleted file mode 100644 index ac88d9bd738c58..00000000000000 --- a/ports/mesa/swravx512-post-static-link.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build -index 11ea7d3f43e..f34e88b1eec 100644 ---- a/src/gallium/drivers/swr/meson.build -+++ b/src/gallium/drivers/swr/meson.build -@@ -213,7 +213,7 @@ endif - - if with_swr_arches.contains('skx') - swr_skx_args = cpp.first_supported_argument( -- '-march=skylake-avx512', '-target-cpu=x86-skylake', '-xCORE-AVX512', -+ '-march=skylake-avx512', '-target-cpu=x86-skylake', '-xCORE-AVX512', '/arch:AVX512', - ) - if swr_skx_args == [] - error('Cannot find SKX support for swr.') -@@ -252,7 +252,7 @@ endif - - if with_swr_arches.contains('knl') - swr_knl_args = cpp.first_supported_argument( -- '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512', -+ '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512', '/arch:AVX512', - ) - if swr_knl_args == [] - error('Cannot find KNL support for swr.') diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index a3456cdc9fa77b..6218984c0b0231 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mesa", - "version": "21.2.5", - "port-version": 4, + "version": "22.0.2", "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "license": "MIT AND BSL-1.0 AND SGI-B-2.0", diff --git a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json index a956452255c458..eb563a5114da76 100644 --- a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json @@ -9,6 +9,7 @@ "name": "llvm", "default-features": false, "features": [ + "bolt", "clang", "disable-assertions", "disable-clang-static-analyzer", @@ -21,6 +22,7 @@ "enable-zlib", "lld", "lldb", + "openmp", "polly", "target-aarch64", "target-amdgpu", diff --git a/versions/baseline.json b/versions/baseline.json index b1b367af03422b..4e749b7e2aacf3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2721,7 +2721,7 @@ "port-version": 1 }, "halide": { - "baseline": "13.0.2", + "baseline": "14.0.0", "port-version": 0 }, "happly": { @@ -4265,8 +4265,8 @@ "port-version": 2 }, "llvm": { - "baseline": "13.0.0", - "port-version": 5 + "baseline": "14.0.3", + "port-version": 0 }, "lmdb": { "baseline": "0.9.29", @@ -4469,8 +4469,8 @@ "port-version": 2 }, "mesa": { - "baseline": "21.2.5", - "port-version": 4 + "baseline": "22.0.2", + "port-version": 0 }, "meschach": { "baseline": "1.2b", diff --git a/versions/h-/halide.json b/versions/h-/halide.json index c313ea05b6b22d..c0d638418e5da4 100644 --- a/versions/h-/halide.json +++ b/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8beaf9e4b505e3a59e286d220492de1af4381154", + "version": "14.0.0", + "port-version": 0 + }, { "git-tree": "92aa2ed7a51a38dfb53cdcb2f4b9c54f58030d52", "version": "13.0.2", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 09fea1d5e9b8d1..a2af523ae03617 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "751084451d4807176af868b2edab17131c2e4a09", + "version": "14.0.3", + "port-version": 0 + }, { "git-tree": "1c835fcc79ad542a73ac25fd939556039ff75cd1", "version": "13.0.0", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index 418d136588c168..47f3b1968ea992 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7df282d97d0ef5ec5a19b770dced8cd773e570c0", + "version": "22.0.2", + "port-version": 0 + }, { "git-tree": "32925250dd7d2e060ca2cfe9fbda1d3f4312f29a", "version": "21.2.5", From e162e68c7e5103d85f3599211bb1fe706964f553 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 17 May 2022 02:44:02 +0800 Subject: [PATCH 259/383] [termcolor] update to v2.1.0 (#23329) * [termcolor] update to the master * add port version * update version * update v2.1.0 * update version * format version * overwrite version * add license * update version * update license * update verison --- ports/termcolor/portfile.cmake | 17 ++++++++--------- ports/termcolor/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 2 +- versions/t-/termcolor.json | 5 +++++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ports/termcolor/portfile.cmake b/ports/termcolor/portfile.cmake index 5a781d65daef2c..bde6d13908a6c1 100644 --- a/ports/termcolor/portfile.cmake +++ b/ports/termcolor/portfile.cmake @@ -1,17 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ikalnytskyi/termcolor - REF 67eb0aa55e48ead9fe2aab049f0b1aa7943ba0ea #v2.0.0 - SHA512 c076f0acafa455fb3ed58bca5f0a0989dc3824e9b4f264fc5aa5b599068cc6551ccc2cfe1180a4ff0f8424e6adbfbbfeed50d395ab5f288b8c678cfa42e8fa17 + REF b3cb0f365f8435588df7a6b12a82b2ac5fc1fe95 #v2.1.0 + SHA512 8a95c654b68728a2258eba1c40daf0e5cc69ba24e15e839f75341a694a20a930c042820d68c661ca1971b68dcc93f895513dc73774818b94e205a3a73199b550 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${port}/ TARGET_PATH share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${port}/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/termcolor/vcpkg.json b/ports/termcolor/vcpkg.json index 5ea5c349cc9635..8ec81e13b8ae2b 100644 --- a/ports/termcolor/vcpkg.json +++ b/ports/termcolor/vcpkg.json @@ -1,6 +1,17 @@ { "name": "termcolor", - "version-semver": "2.0.0", + "version": "2.1.0", "description": "Termcolor is a header-only C++ library for printing colored messages to the terminal.", - "homepage": "https://github.com/ikalnytskyi/termcolor" + "homepage": "https://github.com/ikalnytskyi/termcolor", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4e749b7e2aacf3..0b4b072a9cc8f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6921,7 +6921,7 @@ "port-version": 1 }, "termcolor": { - "baseline": "2.0.0", + "baseline": "2.1.0", "port-version": 0 }, "tesseract": { diff --git a/versions/t-/termcolor.json b/versions/t-/termcolor.json index f0438dc33fa948..b561e18eab0efb 100644 --- a/versions/t-/termcolor.json +++ b/versions/t-/termcolor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15926920dc728ce16644bdb00bcca056efb293e8", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "a357134080b4f2553d91d289f167cc23ddc8c102", "version-semver": "2.0.0", From d1135a5fe2098c4048f96e72808b4bff77478a4d Mon Sep 17 00:00:00 2001 From: seladb Date: Mon, 16 May 2022 12:38:05 -0700 Subject: [PATCH 260/383] [pcapplusplus] Update to 22.05 (#24697) * Update PcapPlusPlus * Run `x-add-version` * Update ports/pcapplusplus/vcpkg.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * update version * update version * update version Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/pcapplusplus/portfile.cmake | 4 ++-- ports/pcapplusplus/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/pcapplusplus.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/pcapplusplus/portfile.cmake b/ports/pcapplusplus/portfile.cmake index 1da5a37ab43987..60336eb0403c07 100644 --- a/ports/pcapplusplus/portfile.cmake +++ b/ports/pcapplusplus/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO seladb/PcapPlusPlus - REF v21.11 - SHA512 ad10034950c0c3e6a4638e8b314c8983ce42609948d7d8d40ad0ff678820a2469807bd29aff77e657a150008602475b50cea84a0766ad87ea203985519cb38ac + REF v22.05 + SHA512 8ffe33406b903fe104f7bf0cf7254028bb3a9997bb5f4b226276af3b2a310e1ed1621558b9fd96ed09c75fa05dfcbfbd7111fe4b19a9288eb214ebcf1254cf6b HEAD_REF master ) file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/pcapplusplus/vcpkg.json b/ports/pcapplusplus/vcpkg.json index b1df5ae7af61d7..83438c9bea33d0 100644 --- a/ports/pcapplusplus/vcpkg.json +++ b/ports/pcapplusplus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pcapplusplus", - "version": "21.11", - "port-version": 1, + "version-string": "22.05", "description": "PcapPlusPlus is a multi-platform C++ library for capturing, parsing and crafting of network packets", "homepage": "https://github.com/seladb/PcapPlusPlus", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 0b4b072a9cc8f3..b35dfafa75c654 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5337,8 +5337,8 @@ "port-version": 6 }, "pcapplusplus": { - "baseline": "21.11", - "port-version": 1 + "baseline": "22.05", + "port-version": 0 }, "pcg": { "baseline": "2021-04-06", diff --git a/versions/p-/pcapplusplus.json b/versions/p-/pcapplusplus.json index c90a7c04976638..2f03288a1e6e28 100644 --- a/versions/p-/pcapplusplus.json +++ b/versions/p-/pcapplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bcf1e7a1ad1f7899adc1c423c248fea6b86553e", + "version-string": "22.05", + "port-version": 0 + }, { "git-tree": "f1f63c9365f0cb128761835ebceeafb6b162c815", "version": "21.11", From e50057d13fbb8beb522d1c9cf54168a71d72ebbb Mon Sep 17 00:00:00 2001 From: Robert Kearns <52675269+robertkearns@users.noreply.github.com> Date: Mon, 16 May 2022 13:40:11 -0600 Subject: [PATCH 261/383] Exclude .DS_Store, fixing #24700 (#24701) --- scripts/cmake/vcpkg_extract_source_archive.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/cmake/vcpkg_extract_source_archive.cmake b/scripts/cmake/vcpkg_extract_source_archive.cmake index e389d7a121d113..2b27194ba2d206 100644 --- a/scripts/cmake/vcpkg_extract_source_archive.cmake +++ b/scripts/cmake/vcpkg_extract_source_archive.cmake @@ -218,6 +218,8 @@ function(vcpkg_extract_source_archive) cmake_path(SET temp_source_path "${temp_dir}") else() file(GLOB archive_directory "${temp_dir}/*") + # Exclude .DS_Store entries created by the finder on macOS + list(FILTER archive_directory EXCLUDE REGEX ".*/.DS_Store$") # make sure `archive_directory` is only a single file if(NOT archive_directory MATCHES ";" AND IS_DIRECTORY "${archive_directory}") cmake_path(SET temp_source_path "${archive_directory}") From b7e46dda25ba2a1cddfdfd5ebcdaee807b0225b3 Mon Sep 17 00:00:00 2001 From: "Michael R. P. Ragazzon" Date: Mon, 16 May 2022 21:40:27 +0200 Subject: [PATCH 262/383] [rmlui] Update to version 4.4 (#24702) --- ports/rmlui/portfile.cmake | 4 ++-- ports/rmlui/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rmlui.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index e90a48cc9a2078..551393904a68f2 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mikke89/RmlUi - REF 4.3 - SHA512 70ceefb8ff9a62ef2be2271a3625d0d3ea411c097776fdfd8f469d462eb3a04514cb320c1f1296e7f1e49e7a89562498255976d3bb7d2317c0ad080dbb8ce542 + REF 4.4 + SHA512 b0c0a4c6cbc6892fe2ae5bbed21b672b7ec842de04347341925bd34712a37c84da4589578c6fbf1ab4ce8137b5530244f545d7c5bc1fbbd7ffa54eb83a6952d4 HEAD_REF master PATCHES add-robin-hood.patch diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json index 03cbc9960a24b6..6396b098b303a6 100644 --- a/ports/rmlui/vcpkg.json +++ b/ports/rmlui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rmlui", - "version": "4.3", + "version": "4.4", "maintainers": "Michael R. P. Ragazzon ", "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", "homepage": "https://github.com/mikke89/RmlUi", diff --git a/versions/baseline.json b/versions/baseline.json index b35dfafa75c654..2fcead70864286 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6221,7 +6221,7 @@ "port-version": 0 }, "rmlui": { - "baseline": "4.3", + "baseline": "4.4", "port-version": 0 }, "roaring": { diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index 2c292a49c3eb7f..07524e0ac91659 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d98cdd5cd06d9640e908e0b08f81c35a07e36b18", + "version": "4.4", + "port-version": 0 + }, { "git-tree": "aaaaf8e01725428c22bcd3f6dcfef56568433dec", "version": "4.3", From 8652ccf0ee67542a482fedc0caf975872886b588 Mon Sep 17 00:00:00 2001 From: friendlyanon <1736896+friendlyanon@users.noreply.github.com> Date: Mon, 16 May 2022 21:41:17 +0200 Subject: [PATCH 263/383] [stb] Update to 2021-09-10 (#24718) * [stb] Update to 2021-09-10 * Update stb's dependees * Add license fields to sfml and libtcod * Fix broken patch for libtcod * Use `version-date` instead of `version` Co-authored-by: friendlyanon --- ports/libtcod/portfile.cmake | 2 ++ ports/libtcod/stb-headers.patch | 11 +++++++++++ ports/libtcod/vcpkg.json | 2 ++ ports/mnn/use-package-and-install.patch | 4 +--- ports/mnn/vcpkg.json | 2 +- ports/sfml/stb_include.patch | 6 ++---- ports/sfml/vcpkg.json | 3 ++- ports/stb/portfile.cmake | 4 ++-- ports/stb/vcpkg.json | 3 +-- versions/baseline.json | 10 +++++----- versions/l-/libtcod.json | 5 +++++ versions/m-/mnn.json | 5 +++++ versions/s-/sfml.json | 5 +++++ versions/s-/stb.json | 5 +++++ 14 files changed, 49 insertions(+), 18 deletions(-) create mode 100644 ports/libtcod/stb-headers.patch diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index 155042f525c375..d185df19fbcc72 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 1.20.1 SHA512 bef3751dd1b190769163ff7c188479fe100d425fa98d3f0f97a3a81045fe0f0c24690b64bcde29f7af1eb7fd34915371223146598b1f0cab173e69a78c1dfc76 HEAD_REF develop + PATCHES + stb-headers.patch ) vcpkg_cmake_configure( diff --git a/ports/libtcod/stb-headers.patch b/ports/libtcod/stb-headers.patch new file mode 100644 index 00000000000000..742ae773a121b0 --- /dev/null +++ b/ports/libtcod/stb-headers.patch @@ -0,0 +1,11 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -91,7 +91,7 @@ + message("Will be vendored: stb") + target_include_directories(${PROJECT_NAME} PRIVATE "vendor/") + elseif(LIBTCOD_STB STREQUAL "vcpkg") +- find_path(STB_INCLUDE_DIRS "stb.h") ++ find_path(STB_INCLUDE_DIRS stb_ds.h) + target_include_directories(${PROJECT_NAME} PRIVATE ${STB_INCLUDE_DIRS}) + else() + message(FATAL_ERROR "Unknown option for LIBTCOD_STB: '${LIBTCOD_STB}'") diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index 8af4572e93a6eb..29c5e4036d407e 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,10 +1,12 @@ { "name": "libtcod", "version": "1.20.1", + "port-version": 1, "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", "documentation": "https://libtcod.readthedocs.io/en/latest/", + "license": "BSD-3-Clause", "dependencies": [ "glad", "lodepng-c", diff --git a/ports/mnn/use-package-and-install.patch b/ports/mnn/use-package-and-install.patch index dce33c8edebc16..be5329111be590 100644 --- a/ports/mnn/use-package-and-install.patch +++ b/ports/mnn/use-package-and-install.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 993f15d..53f24ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -270,18 +270,24 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "^Linux") @@ -11,7 +9,7 @@ index 993f15d..53f24ae 100644 + find_package(OpenCL REQUIRED) +endif() +find_package(RapidJSON CONFIG REQUIRED) -+find_path(STB_INCLUDE_DIRS "stb.h") ++find_path(STB_INCLUDE_DIRS stb_image.h) +find_package(Flatbuffers CONFIG REQUIRED) include_directories(${CMAKE_CURRENT_LIST_DIR}/include/ ${CMAKE_CURRENT_LIST_DIR}/source/ diff --git a/ports/mnn/vcpkg.json b/ports/mnn/vcpkg.json index 0b21ba2f4a8251..d23de738ea2770 100644 --- a/ports/mnn/vcpkg.json +++ b/ports/mnn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mnn", "version": "1.1.0", - "port-version": 2, + "port-version": 3, "description": "MNN is a blazing fast, lightweight deep learning framework, battle-tested by business-critical use cases in Alibaba", "homepage": "https://www.mnn.zone/", "license": "Apache-2.0", diff --git a/ports/sfml/stb_include.patch b/ports/sfml/stb_include.patch index 3519b1c1e61233..0ead09af5255d7 100644 --- a/ports/sfml/stb_include.patch +++ b/ports/sfml/stb_include.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e821a49bc..c68264ef2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,6 +188,9 @@ if(SFML_USE_SYSTEM_DEPS) @@ -7,8 +5,8 @@ index e821a49bc..c68264ef2 100644 list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH) + -+ find_path(STB_INCLUDE_DIR stb.h) -+ include_directories(${STB_INCLUDE_DIR}) ++ find_path(STB_INCLUDE_DIR stb_image.h) ++ include_directories("${STB_INCLUDE_DIR}") endif() # Visual C++: remove warnings regarding SL security and algorithms on pointers diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index de544f640ea9dd..f700631de62ac4 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sfml", "version": "2.5.1", - "port-version": 12, + "port-version": 13, "description": "Simple and fast multimedia library", "homepage": "https://github.com/sfml/sfml", + "license": "Zlib", "dependencies": [ "freetype", "libflac", diff --git a/ports/stb/portfile.cmake b/ports/stb/portfile.cmake index 922522f02803bc..5f42687d3fecd9 100644 --- a/ports/stb/portfile.cmake +++ b/ports/stb/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nothings/stb - REF b42009b3b9d4ca35bc703f5310eedc74f584be58 # accessed on 2020-09-14 - SHA512 a9ba80d19dae4e527171bb02e1caa4d3eb0704cdf7f8fef1a7a09e6b05c65b829b0aa580f469f158a39bf13018289f40c1680ab5c22bfa5e932bff94eced475d + REF af1a5bc352164740c1cc1354942b1c6b72eacb8a # committed on 2021-09-10 + SHA512 5937baa1a9b7342ddc0e41c37ba0ea6b0c878f670a81b55bb124681e6b5e381fdc1d9557c96637e3ba082d6d968ed67a78b47f16aa5555c1c43394d1f9e57f2d HEAD_REF master ) diff --git a/ports/stb/vcpkg.json b/ports/stb/vcpkg.json index 1b05b19b67e3b6..599b59f6ee205e 100644 --- a/ports/stb/vcpkg.json +++ b/ports/stb/vcpkg.json @@ -1,7 +1,6 @@ { "name": "stb", - "version": "2020-09-14", - "port-version": 2, + "version-date": "2021-09-10", "description": "public domain header-only libraries", "homepage": "https://github.com/nothings/stb", "license": "MIT OR CC-PDDC" diff --git a/versions/baseline.json b/versions/baseline.json index 2fcead70864286..15c7037df9dbd3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4074,7 +4074,7 @@ }, "libtcod": { "baseline": "1.20.1", - "port-version": 0 + "port-version": 1 }, "libtess2": { "baseline": "2021-12-27", @@ -4582,7 +4582,7 @@ }, "mnn": { "baseline": "1.1.0", - "port-version": 2 + "port-version": 3 }, "modp-base64": { "baseline": "2020-09-26", @@ -6470,7 +6470,7 @@ }, "sfml": { "baseline": "2.5.1", - "port-version": 12 + "port-version": 13 }, "sfsexp": { "baseline": "1.3.1", @@ -6793,8 +6793,8 @@ "port-version": 1 }, "stb": { - "baseline": "2020-09-14", - "port-version": 2 + "baseline": "2021-09-10", + "port-version": 0 }, "stftpitchshift": { "baseline": "1.4.1", diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index 4dcdd5289c598b..83b242ce74fac4 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34c13b63430589533e25be1fdec7afc8fbe68f6c", + "version": "1.20.1", + "port-version": 1 + }, { "git-tree": "ec66d469b71cab685daede349e5193d15ab866c7", "version": "1.20.1", diff --git a/versions/m-/mnn.json b/versions/m-/mnn.json index af46b0080e8793..6f5141ac9be49a 100644 --- a/versions/m-/mnn.json +++ b/versions/m-/mnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f76a851632ab292ad4fbabcf5b6e94c0c6d957b", + "version": "1.1.0", + "port-version": 3 + }, { "git-tree": "e77125ae365a54bdcbbdb5bb2d77d32834a4487b", "version": "1.1.0", diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index d9360682b05140..3519276cfd4092 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca14334e4fdf097424958412912356dc2c186b9d", + "version": "2.5.1", + "port-version": 13 + }, { "git-tree": "bc9b03c639a91f2deff1fb78ab943cce64876ffe", "version": "2.5.1", diff --git a/versions/s-/stb.json b/versions/s-/stb.json index 7686352928ea81..1068c6d4ab1450 100644 --- a/versions/s-/stb.json +++ b/versions/s-/stb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2da639ecba7048e0f722dc01fae6cef32d671991", + "version-date": "2021-09-10", + "port-version": 0 + }, { "git-tree": "41ce7d73e93526a943f08e5e4601c6b2325ba527", "version": "2020-09-14", From 306c9a9e22e4a4425e21da69d141e8b102a5b956 Mon Sep 17 00:00:00 2001 From: Hamish Moffatt <7577172+hmoffatt@users.noreply.github.com> Date: Tue, 17 May 2022 07:07:38 +1000 Subject: [PATCH 264/383] [fluidsynth] enable sound drivers on Mac/Linux build (#24667) * enable fluidsynth output drivers on Linux and Mac * ensure Fluidsynth drivers are enabled on Windows * update versions for fluidsynth 2.2.6#2 --- ports/fluidsynth/portfile.cmake | 19 ++++++++++++++++++- ports/fluidsynth/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/f-/fluidsynth.json | 5 +++++ 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index fb009c4a96a3c0..e94e1852f6ca78 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -31,12 +31,29 @@ vcpkg_check_features( sndfile enable-libsndfile ) -set(feature_list dbus jack libinstpatch midishare opensles oboe oss sdl2 pulseaudio readline lash alsa systemd coreaudio coremidi dart) +set(feature_list dbus jack libinstpatch midishare opensles oboe oss sdl2 pulseaudio readline lash systemd dart) vcpkg_list(SET FEATURE_OPTIONS) foreach(_feature IN LISTS feature_list) list(APPEND FEATURE_OPTIONS -Denable-${_feature}:BOOL=OFF) endforeach() +# enable platform-specific features, and force the build to fail if the +# required libraries are not found +list(APPEND FEATURE_OPTIONS -Denable-dsound=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -Denable-wasapi=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -Denable-waveout=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -Denable-winmidi=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -DHAVE_MMSYSTEM_H=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -DHAVE_DSOUND_H=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -DHAVE_WASAPI_HEADERS=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -DHAVE_OBJBASE_H=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -Denable-coreaudio=${VCPKG_TARGET_IS_OSX}) +list(APPEND FEATURE_OPTIONS -Denable-coremidi=${VCPKG_TARGET_IS_OSX}) +list(APPEND FEATURE_OPTIONS -DCOREAUDIO_FOUND=${VCPKG_TARGET_IS_OSX}) +list(APPEND FEATURE_OPTIONS -DCOREMIDI_FOUND=${VCPKG_TARGET_IS_OSX}) +list(APPEND FEATURE_OPTIONS -Denable-alsa=${VCPKG_TARGET_IS_LINUX}) +list(APPEND FEATURE_OPTIONS -DALSA_FOUND=${VCPKG_TARGET_IS_LINUX}) + vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") vcpkg_find_acquire_program(PKGCONFIG) diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index 6ad2fdb4a4c721..499513780e9266 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,11 +1,15 @@ { "name": "fluidsynth", "version": "2.2.6", - "port-version": 1, + "port-version": 2, "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", "homepage": "https://github.com/FluidSynth/fluidsynth", "license": "LGPL-2.1-or-later", "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, { "name": "fluidsynth", "host": true, diff --git a/versions/baseline.json b/versions/baseline.json index 15c7037df9dbd3..0e2150a62d0fb7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2262,7 +2262,7 @@ }, "fluidsynth": { "baseline": "2.2.6", - "port-version": 1 + "port-version": 2 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index f2b4168fd3e571..334e47e9e1eff3 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad0fa73283950f13ecfff01deb0688c30a57c330", + "version": "2.2.6", + "port-version": 2 + }, { "git-tree": "e5c0f85546fe88c0e9aaf67734a929f2b717b1ef", "version": "2.2.6", From fe2d25fa9052a76364605a0ee6f2281b8224d4b1 Mon Sep 17 00:00:00 2001 From: elms Date: Tue, 17 May 2022 11:13:39 -0700 Subject: [PATCH 265/383] [new port] Add wolfSSL projects (#24348) * Add wolfSSL port * Add wolfMQTT * Add wolfTPM * Update ci.baseline.txt for wolfSSL, wolfMQTT, wolfTPM * curl: Add wolfSSL feature * wolfSSL: Always build out of tree and enable DES3 * wolfssl: support !uwp and use PORT variable for copyright install * curl: use `VCPKG_TARGET_IS_WINDOWS` instead of triplet and `MATCHES` Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * curl[wolfssl]: add DES_ECB and add patch to resolve ntlm includes * Fix version database. Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/curl/portfile.cmake | 2 ++ ports/curl/vcpkg.json | 7 +++++++ ports/curl/wolfssl-ntlm.patch | 38 +++++++++++++++++++++++++++++++++++ ports/wolfmqtt/portfile.cmake | 28 ++++++++++++++++++++++++++ ports/wolfmqtt/vcpkg.json | 19 ++++++++++++++++++ ports/wolfssl/portfile.cmake | 36 +++++++++++++++++++++++++++++++++ ports/wolfssl/vcpkg.json | 18 +++++++++++++++++ ports/wolftpm/portfile.cmake | 24 ++++++++++++++++++++++ ports/wolftpm/vcpkg.json | 19 ++++++++++++++++++ versions/baseline.json | 14 ++++++++++++- versions/c-/curl.json | 5 +++++ versions/w-/wolfmqtt.json | 9 +++++++++ versions/w-/wolfssl.json | 9 +++++++++ versions/w-/wolftpm.json | 9 +++++++++ 14 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 ports/curl/wolfssl-ntlm.patch create mode 100644 ports/wolfmqtt/portfile.cmake create mode 100644 ports/wolfmqtt/vcpkg.json create mode 100644 ports/wolfssl/portfile.cmake create mode 100644 ports/wolfssl/vcpkg.json create mode 100644 ports/wolftpm/portfile.cmake create mode 100644 ports/wolftpm/vcpkg.json create mode 100644 versions/w-/wolfmqtt.json create mode 100644 versions/w-/wolfssl.json create mode 100644 versions/w-/wolftpm.json diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 09297cab157f40..98c30a5289f427 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( 0022-deduplicate-libs.patch mbedtls-ws2_32.patch export-components.patch + wolfssl-ntlm.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) @@ -38,6 +39,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES # Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. http2 USE_NGHTTP2 + wolfssl CURL_USE_WOLFSSL openssl CURL_USE_OPENSSL mbedtls CURL_USE_MBEDTLS ssh CURL_USE_LIBSSH2 diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 016b2c1899b699..ad8b1b91c069aa 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", "version": "7.83.1", + "port-version": 1, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, @@ -183,6 +184,12 @@ ] } ] + }, + "wolfssl": { + "description": "SSL support (wolfSSL)", + "dependencies": [ + "wolfssl" + ] } } } diff --git a/ports/curl/wolfssl-ntlm.patch b/ports/curl/wolfssl-ntlm.patch new file mode 100644 index 00000000000000..a86ab800b4fed3 --- /dev/null +++ b/ports/curl/wolfssl-ntlm.patch @@ -0,0 +1,38 @@ +--- a/lib/curl_ntlm_core.c ++++ b/lib/curl_ntlm_core.c +@@ -60,12 +60,17 @@ + + #ifdef USE_WOLFSSL + #include +-#endif +- ++# include ++# include ++# include ++# include ++#else + # include + # include + # include + # include ++#endif ++ + # if (defined(OPENSSL_VERSION_NUMBER) && \ + (OPENSSL_VERSION_NUMBER < 0x00907001L)) && !defined(USE_WOLFSSL) + # define DES_key_schedule des_key_schedule +diff -ur a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h +--- a/lib/curl_ntlm_core.h 2022-05-10 23:11:15.000000000 -0700 ++++ b/lib/curl_ntlm_core.h 2022-05-16 16:48:39.931726300 -0700 +@@ -35,10 +35,10 @@ + #define NTLM_NEEDS_NSS_INIT + #endif + +-#if defined(USE_OPENSSL) || defined(USE_WOLFSSL) + #ifdef USE_WOLFSSL + # include +-#endif ++# include ++#else + # include + #endif + diff --git a/ports/wolfmqtt/portfile.cmake b/ports/wolfmqtt/portfile.cmake new file mode 100644 index 00000000000000..a8d47137a871f0 --- /dev/null +++ b/ports/wolfmqtt/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfssl/wolfmqtt + REF v1.13.0 + SHA512 2bd05471c548bacf6fc5166d9c2ee546b3ce5c4fab89ff16175de9ab7696b8b570cdd7d4377378fc0cb579447488dbf727cb938192eb3180ed007414cb949a8a + HEAD_REF master + ) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWOLFMQTT_EXAMPLES=no + OPTIONS_DEBUG + -DCMAKE_C_FLAGS='-DDEBUG_MQTT' + ) + + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wolfmqtt) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/wolfmqtt/vcpkg.json b/ports/wolfmqtt/vcpkg.json new file mode 100644 index 00000000000000..a148d4a72cabe7 --- /dev/null +++ b/ports/wolfmqtt/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wolfmqtt", + "version": "1.13.0", + "description": "MQTT library used with wolfSSL libraray for many platforms", + "homepage": "https://wolfssl.com", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wolfssl" + ] +} diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake new file mode 100644 index 00000000000000..00faef9dbd45cd --- /dev/null +++ b/ports/wolfssl/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfssl/wolfssl + REF v5.3.0-stable + SHA512 399d2b8aad58471d237d21dea68c33fde2b9a3c117c554c241d9174db02847a6c31afae2908839d18f9ada317b2388560a24c077b76014f663227061342bf045 + HEAD_REF master + ) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWOLFSSL_BUILD_OUT_OF_TREE=yes + -DWOLFSSL_EXAMPLES=no + -DWOLFSSL_CRYPT_TESTS=no + -DWOLFSSL_OPENSSLEXTRA=yes + -DWOLFSSL_TPM=yes + -DWOLFSSL_TLSX=yes + -DWOLFSSL_OCSP=yes + -DWOLFSSL_OCSPSTAPLING=yes + -DWOLFSSL_OCSPSTAPLING_V2=yes + -DWOLFSSL_CRL=yes + -DWOLFSSL_DES3=yes + -DCMAKE_C_FLAGS='-DWOLFSSL_ALT_CERT_CHAINS\ -DWOLFSSL_DES_ECB' + OPTIONS_DEBUG + -DWOLFSSL_DEBUG=yes) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wolfssl) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json new file mode 100644 index 00000000000000..048f6f0c46c05e --- /dev/null +++ b/ports/wolfssl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "wolfssl", + "version": "5.3.0", + "description": "TLS and Cryptographic libraray for many platforms", + "homepage": "https://wolfssl.com", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/wolftpm/portfile.cmake b/ports/wolftpm/portfile.cmake new file mode 100644 index 00000000000000..e43b43fe859c07 --- /dev/null +++ b/ports/wolftpm/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfssl/wolftpm + REF v2.4.0 + SHA512 82aa43f8773cc230d403d7e6cdbc4dc7dc8a3cb8e2f942c810a5ef0d60647d288ce82910820127ed6e67771d3900cfc55c5f9d87b722e0847bcb6a81c4e41441 + HEAD_REF master + ) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWOLFTPM_EXAMPLES=no + OPTIONS_DEBUG + -DCMAKE_C_FLAGS='-DDEBUG_WOLFTPM' + ) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wolftpm) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/wolftpm/vcpkg.json b/ports/wolftpm/vcpkg.json new file mode 100644 index 00000000000000..839a4a8a10c762 --- /dev/null +++ b/ports/wolftpm/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wolftpm", + "version": "2.4.0", + "description": "TPM library used with wolfSSL libraray for many platforms", + "homepage": "https://wolfssl.com", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wolfssl" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0e2150a62d0fb7..e26402e1e68132 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1746,7 +1746,7 @@ }, "curl": { "baseline": "7.83.1", - "port-version": 0 + "port-version": 1 }, "curlpp": { "baseline": "2018-06-15", @@ -7524,6 +7524,18 @@ "baseline": "1.0.2", "port-version": 3 }, + "wolfmqtt": { + "baseline": "1.13.0", + "port-version": 0 + }, + "wolfssl": { + "baseline": "5.3.0", + "port-version": 0 + }, + "wolftpm": { + "baseline": "2.4.0", + "port-version": 0 + }, "wordnet": { "baseline": "3.0", "port-version": 1 diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 74f57726b8244b..36970ab9624416 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69e1aaae731455f5ed18b7eea4da75ee10bd073a", + "version": "7.83.1", + "port-version": 1 + }, { "git-tree": "6f536c70dc927199fe430fde4e93f8d66d53b6f6", "version": "7.83.1", diff --git a/versions/w-/wolfmqtt.json b/versions/w-/wolfmqtt.json new file mode 100644 index 00000000000000..33d661bbec711c --- /dev/null +++ b/versions/w-/wolfmqtt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bc6b26e4254f8938dc9db7f7b5dc84958a45c877", + "version": "1.13.0", + "port-version": 0 + } + ] +} diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json new file mode 100644 index 00000000000000..e5cba80c29da93 --- /dev/null +++ b/versions/w-/wolfssl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4dee782f3dda81bc4a72959bcda6d1377a24cbaa", + "version": "5.3.0", + "port-version": 0 + } + ] +} diff --git a/versions/w-/wolftpm.json b/versions/w-/wolftpm.json new file mode 100644 index 00000000000000..31f2abb4a92aad --- /dev/null +++ b/versions/w-/wolftpm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "647740c5ad277ccf2d910605595118087f3bc342", + "version": "2.4.0", + "port-version": 0 + } + ] +} From d132d128b48b1fd9418a873e8694cd18ae69ae06 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 17 May 2022 20:15:06 +0200 Subject: [PATCH 266/383] [many ports] Fix cmake warnings (#24706) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [aubio] * [bitserializer] * [crfsuite] Update to 2020-08-27 * format * [freealut] * [libe57] * version * [libe57] Remove docs * version * [libffi] * [libmodplug] * [libsodium] * [libsrtp] * [libfio] * [ned14-internal-quickcpplib] * version string * version * version * [matio] Update to 1.5.23 * [matplusplus] Update to 1.1.0 * [pystring] * [rdbl] * [recast] * [restinfo] * [sockpp] * [sziĆ¼] * [taglib] * [thor] * [workflow] * version * [Forkflow] Fix typo * version * [pystring] license * version * license * version * [sockpp] * version * [refl-cpp] * [pixel] Fix synthax warning * version * [matplotplusplus] * version * license * version * [szip, workflow] Remove docs * version * license * version * [szip] Fix license install * version * [matplotplusplus] Revert update * version --- ports/aubio/portfile.cmake | 19 ++----- ports/aubio/vcpkg.json | 2 +- ports/bitserializer/portfile.cmake | 7 ++- ports/bitserializer/vcpkg.json | 2 + ports/crfsuite/portfile.cmake | 9 ++-- ports/crfsuite/vcpkg.json | 10 ++-- ports/freealut/portfile.cmake | 7 ++- ports/freealut/vcpkg.json | 3 +- ports/libe57/portfile.cmake | 13 ++--- ports/libe57/vcpkg.json | 2 +- ports/libffi/portfile.cmake | 5 +- ports/libffi/vcpkg.json | 3 +- ports/libmodplug/portfile.cmake | 10 ++-- ports/libmodplug/vcpkg.json | 13 +++-- ports/libsodium/portfile.cmake | 23 ++++---- ports/libsodium/vcpkg.json | 3 +- ports/libsrtp/portfile.cmake | 1 - ports/libsrtp/vcpkg.json | 3 +- ports/llfio/portfile.cmake | 1 - ports/llfio/vcpkg.json | 4 +- ports/matio/portfile.cmake | 7 ++- ports/matio/vcpkg.json | 4 +- ports/matplotplusplus/portfile.cmake | 3 +- ports/matplotplusplus/vcpkg.json | 2 +- .../ned14-internal-quickcpplib/portfile.cmake | 3 +- ports/ned14-internal-quickcpplib/vcpkg.json | 4 +- ports/pixel/portfile.cmake | 2 +- ports/pixel/vcpkg.json | 1 + ports/pystring/portfile.cmake | 7 ++- ports/pystring/vcpkg.json | 3 +- ports/rbdl/portfile.cmake | 6 +-- ports/rbdl/vcpkg.json | 3 +- ports/recast/portfile.cmake | 5 +- ports/recast/vcpkg.json | 3 +- ports/refl-cpp/portfile.cmake | 2 +- ports/refl-cpp/vcpkg.json | 4 +- ports/restinio/portfile.cmake | 7 ++- ports/restinio/vcpkg.json | 1 + ports/sockpp/portfile.cmake | 13 +++-- ports/sockpp/vcpkg.json | 6 +-- ports/szip/portfile.cmake | 8 +-- ports/szip/vcpkg.json | 3 +- ports/taglib/portfile.cmake | 11 ++-- ports/taglib/vcpkg.json | 4 +- ports/thor/portfile.cmake | 21 ++++---- ports/thor/vcpkg.json | 9 +++- ports/workflow/portfile.cmake | 9 ++-- ports/workflow/vcpkg.json | 2 + versions/a-/aubio.json | 5 ++ versions/b-/bitserializer.json | 5 ++ versions/baseline.json | 52 +++++++++---------- versions/c-/crfsuite.json | 5 ++ versions/f-/freealut.json | 5 ++ versions/l-/libe57.json | 5 ++ versions/l-/libffi.json | 5 ++ versions/l-/libmodplug.json | 5 ++ versions/l-/libsodium.json | 5 ++ versions/l-/libsrtp.json | 5 ++ versions/l-/llfio.json | 5 ++ versions/m-/matio.json | 5 ++ versions/m-/matplotplusplus.json | 5 ++ versions/n-/ned14-internal-quickcpplib.json | 5 ++ versions/p-/pixel.json | 5 ++ versions/p-/pystring.json | 5 ++ versions/r-/rbdl.json | 5 ++ versions/r-/recast.json | 5 ++ versions/r-/refl-cpp.json | 5 ++ versions/r-/restinio.json | 5 ++ versions/s-/sockpp.json | 5 ++ versions/s-/szip.json | 5 ++ versions/t-/taglib.json | 5 ++ versions/t-/thor.json | 5 ++ versions/w-/workflow.json | 5 ++ 73 files changed, 295 insertions(+), 170 deletions(-) diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index e8d49dce4c0dbb..f7ab0f1abf840b 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -16,8 +16,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_RELEASE -DTOOLS_INSTALLDIR=tools/aubio @@ -31,15 +30,7 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright and credentials -file(COPY - ${SOURCE_PATH}/COPYING - ${SOURCE_PATH}/AUTHORS - ${SOURCE_PATH}/ChangeLog - ${SOURCE_PATH}/README.md - DESTINATION - ${CURRENT_PACKAGES_DIR}/share/${PORT}) - vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index bbae92425a9f02..e7740453434b17 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aubio", "version-semver": "0.4.9", - "port-version": 8, + "port-version": 9, "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", "license": "GPL-3.0-or-later", diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index 7e0f67a1d480b7..28c43ace76a999 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -15,15 +15,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH share/bitserializer) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json index 09a3a8b1b331d8..42b09e65d214a3 100644 --- a/ports/bitserializer/vcpkg.json +++ b/ports/bitserializer/vcpkg.json @@ -1,8 +1,10 @@ { "name": "bitserializer", "version": "0.44", + "port-version": 1, "description": "C++ 17 library for serialization to JSON, XML, YAML", "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/crfsuite/portfile.cmake b/ports/crfsuite/portfile.cmake index 14e3392163644a..dac715441e0a19 100644 --- a/ports/crfsuite/portfile.cmake +++ b/ports/crfsuite/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chokkan/crfsuite - REF 5d1bd3b803bb26582ed5cc274d6b5af6cc7f9cae - SHA512 e7f329f96fb0dc0e347b3e7a3e26b23ceb45e6fae7b59ace05633a24d58a31665826ebc5280e5a864f50598772791e4b5b3e7da7f46994655cbe03806f823f73 + REF a2a1547727985e3aff6a35cffe073f57f0223e9d + SHA512 d80f72fe13288bc516772542438c09439c6abbd4c15b06650f1de1fee7f7f710c1eed924d4300141807b8f86af398ae5d217974c13a65044515ceb163de441a4 HEAD_REF master ) @@ -13,11 +13,10 @@ list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs_debug.lib") file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFIX_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/crfsuite/vcpkg.json b/ports/crfsuite/vcpkg.json index 5899466d52bf20..b15828231253e5 100644 --- a/ports/crfsuite/vcpkg.json +++ b/ports/crfsuite/vcpkg.json @@ -1,11 +1,15 @@ { "name": "crfsuite", - "version-date": "2019-07-21", - "port-version": 3, + "version-date": "2020-08-27", "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.", "homepage": "https://www.chokkan.org/software/crfsuite/", + "license": null, "supports": "!uwp", "dependencies": [ - "liblbfgs" + "liblbfgs", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/freealut/portfile.cmake b/ports/freealut/portfile.cmake index 668b64e3a02bfe..5db22992db1acf 100644 --- a/ports/freealut/portfile.cmake +++ b/ports/freealut/portfile.cmake @@ -10,8 +10,7 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_EXAMPLES=OFF @@ -19,7 +18,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() @@ -39,4 +38,4 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config") endif() -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) diff --git a/ports/freealut/vcpkg.json b/ports/freealut/vcpkg.json index 81739956c98f74..a6f1860ae7865a 100644 --- a/ports/freealut/vcpkg.json +++ b/ports/freealut/vcpkg.json @@ -1,12 +1,13 @@ { "name": "freealut", "version": "1.1.0", - "port-version": 1, + "port-version": 2, "description": [ "FreeALUT is a free implementation of OpenAL's ALUT standard.", "ALUT is a set of portable functions which remove the annoying details of getting an audio application started. It is the OpenAL counterpart of what GLUT is for OpenGL. " ], "homepage": "https://github.com/vancegroup/freealut", + "license": "LGPL-2.0-only", "supports": "!uwp", "dependencies": [ "openal-soft", diff --git a/ports/libe57/portfile.cmake b/ports/libe57/portfile.cmake index c260430d67d37d..afb1b4af4c42e6 100644 --- a/ports/libe57/portfile.cmake +++ b/ports/libe57/portfile.cmake @@ -1,5 +1,5 @@ set(VERSION 1.1.332) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION}) +set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION}") vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH @@ -13,11 +13,10 @@ vcpkg_from_sourceforge( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" ) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/share/libe57) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/libe57") vcpkg_cmake_install() vcpkg_cmake_config_fixup() @@ -28,5 +27,7 @@ vcpkg_copy_tools( AUTO_CLEAN ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/e57refimpl/CHANGES.TXT") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/e57refimpl/README.TXT") diff --git a/ports/libe57/vcpkg.json b/ports/libe57/vcpkg.json index eb35fdaab4f877..03f74169f585ee 100644 --- a/ports/libe57/vcpkg.json +++ b/ports/libe57/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libe57", "version-semver": "1.1.332", - "port-version": 1, + "port-version": 2, "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", "homepage": "http://www.libe57.org/", "license": "BSL-1.0", diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index 7e397e685d43c1..81bce85bae73f0 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -3,7 +3,7 @@ set(VERSION 3.4.2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libffi/libffi - REF v${VERSION} + REF "v${VERSION}" SHA512 d399319efcca375fe901b05722e25eca31d11a4261c6a5d5079480bbc552d4e4b42de2026912689d3b2f886ebb3c8bebbea47102e38a2f6acbc526b8d5bba388 HEAD_REF master ) @@ -13,9 +13,8 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in" DESTINATION "${SOURC vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS - -DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h + "-DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h" OPTIONS_DEBUG -DFFI_SKIP_HEADERS=ON ) diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index 83130d841f47b6..bebdbc62ea9b4c 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libffi", "version": "3.4.2", - "port-version": 4, + "port-version": 5, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index a7af03816114d3..cbc4e440737a30 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -4,7 +4,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(STATIC_PATCH "001-automagically-define-modplug-static.patch") endif() -vcpkg_from_github(ARCHIVE +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Konstanty/libmodplug REF ${MODPLUG_HASH} @@ -17,14 +17,14 @@ vcpkg_from_github(ARCHIVE 005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61 ) -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -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) diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json index d5c841955434f3..d9a4feaa5c623f 100644 --- a/ports/libmodplug/vcpkg.json +++ b/ports/libmodplug/vcpkg.json @@ -1,8 +1,15 @@ { "name": "libmodplug", - "version-string": "0.8.9.0", - "port-version": 9, + "version": "0.8.9.0", + "port-version": 10, "description": "The ModPlug mod file playing library.", "homepage": "https://github.com/Konstanty/libmodplug", - "supports": "!uwp" + "license": null, + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index f4afdc19788f45..6fd98241f59b26 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -6,11 +6,10 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) @@ -24,20 +23,16 @@ vcpkg_cmake_config_fixup( ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am) +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/Makefile.am") configure_file( - ${SOURCE_PATH}/LICENSE - ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright - COPYONLY -) - -configure_file( - ${CMAKE_CURRENT_LIST_DIR}/sodiumConfig.cmake.in - ${CURRENT_PACKAGES_DIR}/share/unofficial-sodium/unofficial-sodiumConfig.cmake + "${CMAKE_CURRENT_LIST_DIR}/sodiumConfig.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/unofficial-sodium/unofficial-sodiumConfig.cmake" @ONLY ) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsodium/vcpkg.json b/ports/libsodium/vcpkg.json index 24a31c5be3de53..d2b01af14e65dd 100644 --- a/ports/libsodium/vcpkg.json +++ b/ports/libsodium/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libsodium", "version": "1.0.18", - "port-version": 6, + "port-version": 7, "description": "A modern and easy-to-use crypto library", "homepage": "https://github.com/jedisct1/libsodium", + "license": "ISC", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libsrtp/portfile.cmake b/ports/libsrtp/portfile.cmake index d4074da0e4ab90..4651baecc2937b 100644 --- a/ports/libsrtp/portfile.cmake +++ b/ports/libsrtp/portfile.cmake @@ -19,7 +19,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) vcpkg_cmake_install() diff --git a/ports/libsrtp/vcpkg.json b/ports/libsrtp/vcpkg.json index 5ca1f135200830..9131a77f82af81 100644 --- a/ports/libsrtp/vcpkg.json +++ b/ports/libsrtp/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libsrtp", "version": "2.4.2", - "port-version": 1, + "port-version": 2, "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel.", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index f896ba23920d19..6f133d71c17bc9 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -59,7 +59,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index d35443deb38b3f..52457a800bf4bb 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,8 +1,10 @@ { "name": "llfio", - "version-string": "2.0-20220112", + "version": "2.0-20220112", + "port-version": 1, "description": "P1031 low level file i/o and filesystem library for the C++ standard", "homepage": "https://github.com/ned14/llfio", + "license": "Apache-2.0 OR BSL-1.0", "supports": "!uwp", "dependencies": [ "outcome", diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake index c72bd3e4d0ce3c..924b302cabb4b1 100644 --- a/ports/matio/portfile.cmake +++ b/ports/matio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tbeu/matio - REF ca56394e5672115df1981996ed12524d1d551259 # v1.5.19 - SHA512 67c239d8aabafaa935775f3b260ba0756c196b0d845ef5116365c9aa6a0b24dae70d92c4e74d5d43ae073ae0744f084f0f58ead864eb77c813d43dbbb3e4ec5e + REF e9e063e08ef2a27fcc22b1e526258fea5a5de329 # v1.5.23 + SHA512 78b13f4796870158f5cf2b8234c0ab6dc8b449cba49608ce40c51a3f91994c33c29b8a6de1ceed94a81fc7faa798d8c3a45a275f3a3abba70a0cd7be731e1d9c HEAD_REF master PATCHES fix-dependencies.patch ) @@ -19,8 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DMATIO_SHARED=${BUILD_SHARED} -DMATIO_USE_CONAN=OFF diff --git a/ports/matio/vcpkg.json b/ports/matio/vcpkg.json index 7e4b8d05ad09e2..c325999aaffaf8 100644 --- a/ports/matio/vcpkg.json +++ b/ports/matio/vcpkg.json @@ -1,9 +1,9 @@ { "name": "matio", - "version-semver": "1.5.19", - "port-version": 1, + "version-semver": "1.5.23", "description": "MATLAB MAT File I/O Library", "homepage": "https://github.com/tbeu/matio", + "license": "BSD-2-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/matplotplusplus/portfile.cmake b/ports/matplotplusplus/portfile.cmake index 8755fc8f2a66c1..155d0738498244 100644 --- a/ports/matplotplusplus/portfile.cmake +++ b/ports/matplotplusplus/portfile.cmake @@ -31,8 +31,7 @@ vcpkg_check_features( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DCPM_USE_LOCAL_PACKAGES=ON -DBUILD_EXAMPLES=OFF diff --git a/ports/matplotplusplus/vcpkg.json b/ports/matplotplusplus/vcpkg.json index 296b6f8802b0f7..dce9fa30f52ba6 100644 --- a/ports/matplotplusplus/vcpkg.json +++ b/ports/matplotplusplus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "matplotplusplus", "version-date": "2021-04-11", - "port-version": 5, + "port-version": 6, "description": "A C++ graphics library for data visualization", "homepage": "https://alandefreitas.github.io/matplotplusplus/", "license": "MIT", diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index d4c6318e6d4aa9..8f78243a0a80a2 100644 --- a/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/ports/ned14-internal-quickcpplib/portfile.cmake @@ -8,7 +8,7 @@ # known to be compatible with QuickCppLib. It has occurred in the # past that newer versions were severely broken with QuickCppLib. -include(${CURRENT_PORT_DIR}/sha_manifest.cmake) +include("${CURRENT_PORT_DIR}/sha_manifest.cmake") if (NOT "cxx20" IN_LIST FEATURES) message(WARNING [=[ @@ -66,7 +66,6 @@ vcpkg_check_features( # Use QuickCppLib's own build process, skipping examples and tests. vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON diff --git a/ports/ned14-internal-quickcpplib/vcpkg.json b/ports/ned14-internal-quickcpplib/vcpkg.json index d79bfba9533086..2bd11b31ec07ed 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,8 +1,10 @@ { "name": "ned14-internal-quickcpplib", - "version-string": "0.0.0-cad832c8", + "version": "0.0.0-cad832c8", + "port-version": 1, "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", "homepage": "https://github.com/ned14/quickcpplib", + "license": "Apache-2.0", "dependencies": [ "byte-lite", "gsl-lite", diff --git a/ports/pixel/portfile.cmake b/ports/pixel/portfile.cmake index 1cac519bf86642..36c5424f494e2d 100644 --- a/ports/pixel/portfile.cmake +++ b/ports/pixel/portfile.cmake @@ -1,5 +1,5 @@ if(VCPKG_TARGET_IS_LINUX) - message(WARNING"${PORT} currently requires libglu1-mesa from the system package manager: + message(WARNING "${PORT} currently requires libglu1-mesa from the system package manager: This can be installed on Ubuntu systems via sudo apt install libglu1-mesa-dev") endif() diff --git a/ports/pixel/vcpkg.json b/ports/pixel/vcpkg.json index 00d5b4c22d14b3..cc01890b4b2cf3 100644 --- a/ports/pixel/vcpkg.json +++ b/ports/pixel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pixel", "version-date": "2022-03-15", + "port-version": 1, "description": "Simple 2D Graphics based on standard and portable OpenGL.", "homepage": "https://github.com/dascandy/pixel", "license": "Apache-2.0", diff --git a/ports/pystring/portfile.cmake b/ports/pystring/portfile.cmake index 31143c5c9cab97..bc370a0c2cf682 100644 --- a/ports/pystring/portfile.cmake +++ b/ports/pystring/portfile.cmake @@ -8,11 +8,10 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) @@ -20,4 +19,4 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pystring/vcpkg.json b/ports/pystring/vcpkg.json index 4011f52e790ce6..915b006049dd71 100644 --- a/ports/pystring/vcpkg.json +++ b/ports/pystring/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pystring", "version-semver": "1.1.3", - "port-version": 4, + "port-version": 5, "description": "Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string", "homepage": "https://github.com/imageworks/pystring", + "license": "LGPL-2.1-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake index be6a63c81a1981..750e4c6754af4c 100644 --- a/ports/rbdl/portfile.cmake +++ b/ports/rbdl/portfile.cmake @@ -4,7 +4,7 @@ endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) -vcpkg_from_github(ARCHIVE +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rbdl/rbdl REF v2.6.0 @@ -27,5 +27,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json index 96a3389ae331ea..9bc73197e3fbc1 100644 --- a/ports/rbdl/vcpkg.json +++ b/ports/rbdl/vcpkg.json @@ -1,9 +1,10 @@ { "name": "rbdl", "version": "2.6.0", - "port-version": 2, + "port-version": 3, "description": "Rigid Body Dynamics Library", "homepage": "https://github.com/rbdl/rbdl", + "license": "Zlib", "dependencies": [ "eigen3", { diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake index 11484caa16b9d1..ebace1d11c492a 100644 --- a/ports/recast/portfile.cmake +++ b/ports/recast/portfile.cmake @@ -11,8 +11,7 @@ vcpkg_from_github( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() @@ -20,6 +19,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-recast CONFIG_PATH share/unofficial-recast) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/recast/vcpkg.json b/ports/recast/vcpkg.json index 5abe9f93b06f5d..7163e255a9721c 100644 --- a/ports/recast/vcpkg.json +++ b/ports/recast/vcpkg.json @@ -1,9 +1,10 @@ { "name": "recast", "version": "1.5.1", - "port-version": 4, + "port-version": 5, "description": "Navigation-mesh Toolset for Games", "homepage": "https://github.com/recastnavigation/recastnavigation", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/refl-cpp/portfile.cmake b/ports/refl-cpp/portfile.cmake index c6f83e865662f4..3ef302408c2b18 100644 --- a/ports/refl-cpp/portfile.cmake +++ b/ports/refl-cpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO veselink1/refl-cpp - REF ce47c1355219f3b9af56ae91d997daf2b1555d97 v0.12.3 + REF ce47c1355219f3b9af56ae91d997daf2b1555d97 #v0.12.3 SHA512 f73e542a9ee00d677e2445c148b732cbdf6247adc1f4f412ad8e9587c5971b3cb02b39b15cdb9b0788f53e9efea6c5a485367505ecb569a367be012f6246ea92 HEAD_REF master ) diff --git a/ports/refl-cpp/vcpkg.json b/ports/refl-cpp/vcpkg.json index 8cbcc31a5b1900..88defcfddae3b7 100644 --- a/ports/refl-cpp/vcpkg.json +++ b/ports/refl-cpp/vcpkg.json @@ -1,6 +1,8 @@ { "name": "refl-cpp", "version": "0.12.3", + "port-version": 1, "description": "Static reflection for C++17 (compile-time enumeration, attributes, proxies, overloads, template functions, metaprogramming).", - "homepage": "https://github.com/veselink1/refl-cpp" + "homepage": "https://github.com/veselink1/refl-cpp", + "license": "MIT" } diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 2b13c483417c05..0d36ca26c90122 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -6,13 +6,12 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/vcpkg - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}/vcpkg" ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restinio) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/restinio/vcpkg.json b/ports/restinio/vcpkg.json index 5cf1ad2986905a..ed6cc623b933d7 100644 --- a/ports/restinio/vcpkg.json +++ b/ports/restinio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "restinio", "version": "0.6.14", + "port-version": 1, "description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.", "homepage": "https://github.com/Stiffstream/restinio", "license": "BSD-3-Clause", diff --git a/ports/sockpp/portfile.cmake b/ports/sockpp/portfile.cmake index f9af412b42dde3..2ab525a968d386 100644 --- a/ports/sockpp/portfile.cmake +++ b/ports/sockpp/portfile.cmake @@ -8,11 +8,10 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_replace_string(${SOURCE_PATH}/CMakeLists.txt "\${SOCKPP}-static" "\${SOCKPP}") +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "\${SOCKPP}-static" "\${SOCKPP}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSOCKPP_BUILD_SHARED=OFF -DSOCKPP_BUILD_STATIC=ON @@ -23,9 +22,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/sockppConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/sockppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sockpp/vcpkg.json b/ports/sockpp/vcpkg.json index c985086f14128b..07d6f3f000c196 100644 --- a/ports/sockpp/vcpkg.json +++ b/ports/sockpp/vcpkg.json @@ -1,17 +1,15 @@ { "name": "sockpp", "version": "0.7.1", + "port-version": 1, "description": "Simple, modern, C++ socket library. This is a fairly low-level C++ wrapper around the Berkeley sockets library using socket, acceptor, and connector classes that are familiar concepts from other languages.", "homepage": "https://github.com/fpagliughi/sockpp", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake index 038736e7a99002..1f5a9fb2f6d45e 100644 --- a/ports/szip/portfile.cmake +++ b/ports/szip/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF szip-${SZIP_VERSION} + REF "szip-${SZIP_VERSION}" PATCHES fix-linkage-config.patch mingw-lib-names.patch @@ -16,7 +16,6 @@ vcpkg_extract_source_archive_ex( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DSZIP_INSTALL_DATA_DIR=share/szip/data -DSZIP_INSTALL_CMAKE_DIR=share/szip @@ -62,7 +61,8 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib") endif() vcpkg_fixup_pkgconfig() -file(RENAME "${CURRENT_PACKAGES_DIR}/share/szip/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/szip/copyright") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/szip/data") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/szip/vcpkg.json b/ports/szip/vcpkg.json index 7c83b1a157ffdc..a0e93f315505fd 100644 --- a/ports/szip/vcpkg.json +++ b/ports/szip/vcpkg.json @@ -1,9 +1,10 @@ { "name": "szip", "version": "2.1.1", - "port-version": 7, + "port-version": 8, "description": "Szip compression software, providing lossless compression of scientific data", "homepage": "https://support.hdfgroup.org/ftp/lib-external/szip", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake index a951b7e64a24dd..c376de69a3f4ef 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -13,7 +13,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS ${WINRT_OPTIONS} ) vcpkg_cmake_install() @@ -32,12 +31,6 @@ endif() # remove the debug/include files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -# copyright file -file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") -file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright") - file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/taglib-config.cmd" "${CURRENT_PACKAGES_DIR}/debug/bin/taglib-config.cmd") # Contains absolute paths # remove bin directory for static builds (taglib creates a cmake batch file there) @@ -48,3 +41,7 @@ endif() vcpkg_copy_pdbs() +# copyright file +file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") +file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright") diff --git a/ports/taglib/vcpkg.json b/ports/taglib/vcpkg.json index 54e9759ba27a56..2a3f1c97a63fcf 100644 --- a/ports/taglib/vcpkg.json +++ b/ports/taglib/vcpkg.json @@ -1,10 +1,10 @@ { "name": "taglib", "version-semver": "1.12.0", - "port-version": 2, + "port-version": 3, "description": "TagLib Audio Meta-Data Library", "homepage": "https://taglib.org/", - "license": "LGPL-2.1 OR MPL-1.1", + "license": "LGPL-2.1-only OR MPL-1.1", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/thor/portfile.cmake b/ports/thor/portfile.cmake index 8371f16139dd21..c45ca4297e3074 100644 --- a/ports/thor/portfile.cmake +++ b/ports/thor/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_from_github(ARCHIVE +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Bromeon/Thor REF v2.0 @@ -6,24 +6,23 @@ vcpkg_from_github(ARCHIVE HEAD_REF master PATCHES fix-dependency-sfml.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake) +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake") -file(REMOVE_RECURSE ${SOURCE_PATH}/extlibs) -file(COPY ${CURRENT_INSTALLED_DIR}/include/Aurora DESTINATION ${SOURCE_PATH}/extlibs/aurora/include) +file(REMOVE_RECURSE "${SOURCE_PATH}/extlibs") +file(COPY "${CURRENT_INSTALLED_DIR}/include/Aurora" DESTINATION "${SOURCE_PATH}/extlibs/aurora/include") file(WRITE "${SOURCE_PATH}/extlibs/aurora/License.txt") string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" THOR_STATIC_STD_LIBS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" THOR_SHARED_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTHOR_SHARED_LIBS=${THOR_SHARED_LIBS} -DTHOR_STATIC_STD_LIBS=${THOR_STATIC_STD_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -48,10 +47,10 @@ if(LICENSE) file(REMOVE ${LICENSE}) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/Aurora) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/Aurora") if(NOT VCPKG_TARGET_IS_WINDOWS) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/thor/vcpkg.json b/ports/thor/vcpkg.json index 3b1c3cfee0b324..17b1ad360f4eab 100644 --- a/ports/thor/vcpkg.json +++ b/ports/thor/vcpkg.json @@ -1,11 +1,16 @@ { "name": "thor", "version": "2.0", - "port-version": 4, + "port-version": 5, "description": "Extends the multimedia library SFML with higher-level features", "homepage": "www.bromeon.ch/libraries/thor", + "license": "Zlib", "dependencies": [ "aurora", - "sfml" + "sfml", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/workflow/portfile.cmake b/ports/workflow/portfile.cmake index 5075bbde4b47b0..300b21cc327dd8 100644 --- a/ports/workflow/portfile.cmake +++ b/ports/workflow/portfile.cmake @@ -17,15 +17,16 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/workflow/vcpkg.json b/ports/workflow/vcpkg.json index bbea8566355b1c..66c55a536ec12d 100644 --- a/ports/workflow/vcpkg.json +++ b/ports/workflow/vcpkg.json @@ -1,8 +1,10 @@ { "name": "workflow", "version": "0.9.7", + "port-version": 1, "description": "About C++ Parallel Computing and Asynchronous Networking Engine", "homepage": "https://github.com/sogou/workflow", + "license": "Apache-2.0", "dependencies": [ "openssl", { diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index 9528d263f51df9..11156e198e3b03 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "511a11ecdc92221bcde518ad98f22512788a07a4", + "version-semver": "0.4.9", + "port-version": 9 + }, { "git-tree": "4888190139ae3bd7f3fdb15f79453b25f59a45f5", "version-semver": "0.4.9", diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index a58466de15e4c7..00d44d04e1f619 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e25c895f4054e151b1865640ae8500efcddda95b", + "version": "0.44", + "port-version": 1 + }, { "git-tree": "66c9246073510ab554418a0b63ef9ee471b05b76", "version": "0.44", diff --git a/versions/baseline.json b/versions/baseline.json index e26402e1e68132..794458caacd104 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -222,7 +222,7 @@ }, "aubio": { "baseline": "0.4.9", - "port-version": 8 + "port-version": 9 }, "audiofile": { "baseline": "1.1.0", @@ -466,7 +466,7 @@ }, "bitserializer": { "baseline": "0.44", - "port-version": 0 + "port-version": 1 }, "bitserializer-cpprestjson": { "baseline": "alias", @@ -1689,8 +1689,8 @@ "port-version": 0 }, "crfsuite": { - "baseline": "2019-07-21", - "port-version": 3 + "baseline": "2020-08-27", + "port-version": 0 }, "croncpp": { "baseline": "2020-09-04", @@ -2318,7 +2318,7 @@ }, "freealut": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "freeglut": { "baseline": "3.2.2", @@ -3522,7 +3522,7 @@ }, "libe57": { "baseline": "1.1.332", - "port-version": 1 + "port-version": 2 }, "libe57format": { "baseline": "2.2.0", @@ -3554,7 +3554,7 @@ }, "libffi": { "baseline": "3.4.2", - "port-version": 4 + "port-version": 5 }, "libfido2": { "baseline": "1.10.0", @@ -3782,7 +3782,7 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 9 + "port-version": 10 }, "libmorton": { "baseline": "0.2.8", @@ -4018,7 +4018,7 @@ }, "libsodium": { "baseline": "1.0.18", - "port-version": 6 + "port-version": 7 }, "libsoundio": { "baseline": "2.0.0", @@ -4046,7 +4046,7 @@ }, "libsrtp": { "baseline": "2.4.2", - "port-version": 1 + "port-version": 2 }, "libssh": { "baseline": "0.9.6", @@ -4258,7 +4258,7 @@ }, "llfio": { "baseline": "2.0-20220112", - "port-version": 0 + "port-version": 1 }, "llgl": { "baseline": "2019-08-15", @@ -4425,8 +4425,8 @@ "port-version": 0 }, "matio": { - "baseline": "1.5.19", - "port-version": 1 + "baseline": "1.5.23", + "port-version": 0 }, "matplotlib-cpp": { "baseline": "2020-08-27", @@ -4434,7 +4434,7 @@ }, "matplotplusplus": { "baseline": "2021-04-11", - "port-version": 5 + "port-version": 6 }, "matroska": { "baseline": "1.6.3", @@ -4814,7 +4814,7 @@ }, "ned14-internal-quickcpplib": { "baseline": "0.0.0-cad832c8", - "port-version": 0 + "port-version": 1 }, "neon2sse": { "baseline": "2021-09-16", @@ -5426,7 +5426,7 @@ }, "pixel": { "baseline": "2022-03-15", - "port-version": 0 + "port-version": 1 }, "pixman": { "baseline": "0.40.0", @@ -5638,7 +5638,7 @@ }, "pystring": { "baseline": "1.1.3", - "port-version": 4 + "port-version": 5 }, "python2": { "baseline": "2.7.18", @@ -6114,7 +6114,7 @@ }, "rbdl": { "baseline": "2.6.0", - "port-version": 2 + "port-version": 3 }, "rbdl-orb": { "baseline": "3.1.2", @@ -6154,7 +6154,7 @@ }, "recast": { "baseline": "1.5.1", - "port-version": 4 + "port-version": 5 }, "redis-plus-plus": { "baseline": "1.3.2", @@ -6162,7 +6162,7 @@ }, "refl-cpp": { "baseline": "0.12.3", - "port-version": 0 + "port-version": 1 }, "refprop-headers": { "baseline": "2019-04-14", @@ -6198,7 +6198,7 @@ }, "restinio": { "baseline": "0.6.14", - "port-version": 0 + "port-version": 1 }, "rexo": { "baseline": "0.2.2", @@ -6602,7 +6602,7 @@ }, "sockpp": { "baseline": "0.7.1", - "port-version": 0 + "port-version": 1 }, "soem": { "baseline": "1.4.0", @@ -6854,7 +6854,7 @@ }, "szip": { "baseline": "2.1.1", - "port-version": 7 + "port-version": 8 }, "tabulate": { "baseline": "2019-01-06", @@ -6866,7 +6866,7 @@ }, "taglib": { "baseline": "1.12.0", - "port-version": 2 + "port-version": 3 }, "taocpp-json": { "baseline": "2020-09-14", @@ -6954,7 +6954,7 @@ }, "thor": { "baseline": "2.0", - "port-version": 4 + "port-version": 5 }, "threadpool": { "baseline": "0.2.5", @@ -7542,7 +7542,7 @@ }, "workflow": { "baseline": "0.9.7", - "port-version": 0 + "port-version": 1 }, "wpilib": { "baseline": "2020.3.2", diff --git a/versions/c-/crfsuite.json b/versions/c-/crfsuite.json index 0458068996234f..f81e1ca2c12ca0 100644 --- a/versions/c-/crfsuite.json +++ b/versions/c-/crfsuite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f290a396def84e4a24ca49e29d17d7218b8e410", + "version-date": "2020-08-27", + "port-version": 0 + }, { "git-tree": "b74e8dd91be02cf5bbbd6f6387d66468fe579e8e", "version-date": "2019-07-21", diff --git a/versions/f-/freealut.json b/versions/f-/freealut.json index 6bc300bb798ce0..457bdf8ebd8e70 100644 --- a/versions/f-/freealut.json +++ b/versions/f-/freealut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb6f48903b677ac0c8560a068e53f7a028b2a5d4", + "version": "1.1.0", + "port-version": 2 + }, { "git-tree": "ba650aae9b1cf7a21c83ad0303f1bc520a82740b", "version": "1.1.0", diff --git a/versions/l-/libe57.json b/versions/l-/libe57.json index 0371207eac8941..647a2835154d35 100644 --- a/versions/l-/libe57.json +++ b/versions/l-/libe57.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e53fb4c480d35feeeb67361182d4d630ac3834ca", + "version-semver": "1.1.332", + "port-version": 2 + }, { "git-tree": "e38a82bc97129e317606207d234101aefe7dcb17", "version-semver": "1.1.332", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index f69e9547616907..ba4f4807ce0638 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14f8b4d7dc645ea8f2ddfe77eeaaeef55f123cb5", + "version": "3.4.2", + "port-version": 5 + }, { "git-tree": "05f73f7c0bbd49045d312d90683a01405f5ffd83", "version": "3.4.2", diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json index a342cd4762cdf8..0cc70772131d42 100644 --- a/versions/l-/libmodplug.json +++ b/versions/l-/libmodplug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "605d260810f9d1a489af7fb484d509581b39763d", + "version": "0.8.9.0", + "port-version": 10 + }, { "git-tree": "28b465d4794e5c5545cb486da31a9a7ce208654b", "version-string": "0.8.9.0", diff --git a/versions/l-/libsodium.json b/versions/l-/libsodium.json index 7c623c5346469a..b193c35e2707e7 100644 --- a/versions/l-/libsodium.json +++ b/versions/l-/libsodium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ffdf9b217021918c33311af9faa9b4a3086d004", + "version": "1.0.18", + "port-version": 7 + }, { "git-tree": "06e21819c9b176b52aa0b9226c3e2bc07ec20a23", "version": "1.0.18", diff --git a/versions/l-/libsrtp.json b/versions/l-/libsrtp.json index 85c54b46b8e78b..07d81e3305f0dd 100644 --- a/versions/l-/libsrtp.json +++ b/versions/l-/libsrtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c935c9b1559cab3460f928c2a6abb25271cfb65", + "version": "2.4.2", + "port-version": 2 + }, { "git-tree": "a7e8bce682acd4a29f666961a69127864cd93374", "version": "2.4.2", diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index f2a4b5461d84e2..f7910b2e6d0e8e 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc96b88ab308808ce26135e75038c4b316d5533c", + "version": "2.0-20220112", + "port-version": 1 + }, { "git-tree": "aaacb49264f3175de57367f28c90bd3904d7209f", "version-string": "2.0-20220112", diff --git a/versions/m-/matio.json b/versions/m-/matio.json index 74bf34be5db111..472498c7912d5b 100644 --- a/versions/m-/matio.json +++ b/versions/m-/matio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e018403a4c2e749f8983b6a64f60dac577342853", + "version-semver": "1.5.23", + "port-version": 0 + }, { "git-tree": "c11c8ba1ca5c7f0286165d497088779ec0df756a", "version-semver": "1.5.19", diff --git a/versions/m-/matplotplusplus.json b/versions/m-/matplotplusplus.json index 6d730f39d3ef62..8dc2b38c290633 100644 --- a/versions/m-/matplotplusplus.json +++ b/versions/m-/matplotplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8554ae7ec807245bdcd27b44ddebd39608edfe53", + "version-date": "2021-04-11", + "port-version": 6 + }, { "git-tree": "e0496a49614d3fc1f77f20f230b3168720140c3b", "version-date": "2021-04-11", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index dbd0afaa80c26b..28e233935356ca 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be7fa7b222ea2c080583b12ad2f203d63c7ed55c", + "version": "0.0.0-cad832c8", + "port-version": 1 + }, { "git-tree": "af77893b0d87106812194f8bc866ecfbc6ade24a", "version-string": "0.0.0-cad832c8", diff --git a/versions/p-/pixel.json b/versions/p-/pixel.json index f0bfad783880e6..3e2ca86e6a320c 100644 --- a/versions/p-/pixel.json +++ b/versions/p-/pixel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54bad3e5b7d0455972d0cc84fa90e5d6549b6203", + "version-date": "2022-03-15", + "port-version": 1 + }, { "git-tree": "dbf76415a78802e7dc2717280e2a44123a04df69", "version-date": "2022-03-15", diff --git a/versions/p-/pystring.json b/versions/p-/pystring.json index 7fef6450f65e29..ab15494a5abe1b 100644 --- a/versions/p-/pystring.json +++ b/versions/p-/pystring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0b08ff66f53aeb63ab3797212c667a822c88a3e", + "version-semver": "1.1.3", + "port-version": 5 + }, { "git-tree": "ed5bf60bd6e1720457de5eaa39f01f5b3a414f01", "version-semver": "1.1.3", diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json index cc9bc2e16bce36..b229336aa065fa 100644 --- a/versions/r-/rbdl.json +++ b/versions/r-/rbdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d0f94e12844bb594f54986246e876569cfca0c1", + "version": "2.6.0", + "port-version": 3 + }, { "git-tree": "48b44c8cf3286f0ce9c87b95e126634997d03137", "version": "2.6.0", diff --git a/versions/r-/recast.json b/versions/r-/recast.json index 82f778cd71bafd..76bccf1b4dfa70 100644 --- a/versions/r-/recast.json +++ b/versions/r-/recast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe2b42ef737e0b51a58bb9f56340e324ab8f82c3", + "version": "1.5.1", + "port-version": 5 + }, { "git-tree": "2f34af0b398b4c37f0cdf3fcd8dc9db965e4dd5e", "version": "1.5.1", diff --git a/versions/r-/refl-cpp.json b/versions/r-/refl-cpp.json index 2eb82df9d67fcb..349e371cdeb009 100644 --- a/versions/r-/refl-cpp.json +++ b/versions/r-/refl-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb8d6fa4720dd349ab60b95ad01380b55d0d4e1c", + "version": "0.12.3", + "port-version": 1 + }, { "git-tree": "7018b2c10e3c2e2be8dd774fb43d2f04fa520a02", "version": "0.12.3", diff --git a/versions/r-/restinio.json b/versions/r-/restinio.json index 43569965bf0b4e..7939d0c292abb9 100644 --- a/versions/r-/restinio.json +++ b/versions/r-/restinio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea4d99d764e913dd233ac8d1df27c6720f5ccbd9", + "version": "0.6.14", + "port-version": 1 + }, { "git-tree": "65493f16b394fd5a61f908afc058dae965a60989", "version": "0.6.14", diff --git a/versions/s-/sockpp.json b/versions/s-/sockpp.json index d54217a9c59dd8..792eb3f5de70cb 100644 --- a/versions/s-/sockpp.json +++ b/versions/s-/sockpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "608151660b414b2bbcdec35bdd622fdce5620abb", + "version": "0.7.1", + "port-version": 1 + }, { "git-tree": "d54d2c1ee9ebaae60a83c72c50207b83d56f3917", "version": "0.7.1", diff --git a/versions/s-/szip.json b/versions/s-/szip.json index 83945853f397d9..de4087f88f0509 100644 --- a/versions/s-/szip.json +++ b/versions/s-/szip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c8569ffc46401d06cff22755c0b95953ce5e828", + "version": "2.1.1", + "port-version": 8 + }, { "git-tree": "6f810fcedf9469940a80e5c343d983a55134332b", "version": "2.1.1", diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json index 4c35acb6486875..74616d0a260b8b 100644 --- a/versions/t-/taglib.json +++ b/versions/t-/taglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68a57ea8641a01a2a1c353f91acb5a3020c0769b", + "version-semver": "1.12.0", + "port-version": 3 + }, { "git-tree": "246255cab48b434b3c78aaa315f5f62b4692f255", "version-semver": "1.12.0", diff --git a/versions/t-/thor.json b/versions/t-/thor.json index 708cdd8038e00e..be1564b2370025 100644 --- a/versions/t-/thor.json +++ b/versions/t-/thor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45ba80aa43a83b1c810d757922428538f82d8123", + "version": "2.0", + "port-version": 5 + }, { "git-tree": "cada171d405874f848790c8e10a7f332bbed1e6c", "version": "2.0", diff --git a/versions/w-/workflow.json b/versions/w-/workflow.json index 67609cd7f7ed22..fd24509a37eb97 100644 --- a/versions/w-/workflow.json +++ b/versions/w-/workflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e673ba0fd8857c0d13f6137e32b3ce5cfda65d9", + "version": "0.9.7", + "port-version": 1 + }, { "git-tree": "864387c239d4b0fadabfc4b314564d75c9bc07bc", "version": "0.9.7", From 22b4033861f1d52afb5ac4b5cd0b0243967a2467 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 17 May 2022 13:03:13 -0700 Subject: [PATCH 267/383] Update VMs for Patch Tuesday May 2022 (#24695) * Install Ubuntu nasm package rather than building from source; 2.14 which is available in Ubuntu 20.04 is sufficient for intel-ipsec. * Add cmake and ninja. * Update CUDA signing key. * Update pwsh to 7.2.3 * Remove clean downloads step obsoleted since we ripped out pacman. * Note that haskell-stack is for bond. * Cherry pick from https://github.com/microsoft/vcpkg/pull/23569 : add cuda-nvml-dev-11-6 * Update pools. * Baseline updates PASSING, REMOVE FROM FAIL LIST: mesa:x64-windows-static-md (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). :) ``` REGRESSION: cppgraphqlgen:arm64-windows failed with BUILD_FAILED. If expected, add cppgraphqlgen:arm64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: cppgraphqlgen:x64-windows failed with BUILD_FAILED. If expected, add cppgraphqlgen:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: cppgraphqlgen:x64-windows-static failed with BUILD_FAILED. If expected, add cppgraphqlgen:x64-windows-static=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: cppgraphqlgen:x64-windows-static-md failed with BUILD_FAILED. If expected, add cppgraphqlgen:x64-windows-static-md=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: cppgraphqlgen:x86-windows failed with BUILD_FAILED. If expected, add cppgraphqlgen:x86-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` This is a compiler behavior change or bug in VS 2022 16.2: ``` C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1432~1.313\bin\Hostx64\x86\cl.exe /TP -DGRAPHQL_DLLEXPORTS -DIMPL_GRAPHQLSERVICE_DLL -Dgraphqlservice_EXPORTS -ID:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\..\include -ID:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\..\PEGTL\include -external:ID:\installed\x86-windows\include -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 -MDd /W4 /WX /permissive- -std:c++20 /showIncludes /Fosrc\CMakeFiles\graphqlservice.dir\GraphQLService.cpp.obj /Fdsrc\CMakeFiles\graphqlservice.dir\ /FS -c D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\GraphQLService.cpp cl : Command line warning D9025 : overriding '/W3' with '/W4' D:\installed\x86-windows\include\tao\pegtl/demangle.hpp(147): error C2338: static_assert failed: 'internal::dependent_true< T > && ( begin != std::string_view::npos )' D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\include\graphqlservice/internal/SyntaxTree.h(120): note: see reference to function template instantiation 'std::string_view tao::graphqlpeg::demangle(void) noexcept' being compiled D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\include\graphqlservice/internal/SyntaxTree.h(53): note: see reference to function template instantiation 'std::string_view graphql::peg::ast_node::type_name(void) noexcept' being compiled D:\buildtrees\cppgraphqlgen\src\v4.3.1-9d04ffd723.clean\src\GraphQLService.cpp(310): note: see reference to function template instantiation 'bool graphql::peg::ast_node::is_type(void) noexcept const' being compiled ninja: build stopped: subcommand failed. ``` This is a compiler behavior change in 17.2. @wravery do you have comments? ``` REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtwebengine:x64-windows failed with BUILD_FAILED. If expected, add qtwebengine:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` qtwebengine doesn't report logs, but I'm pretty sure it's this ICE: https://developercommunity.visualstudio.com/t/Visual-Studio-2022-v1720-reports-fata/10039296 @Neumann-A ``` REGRESSION: rsocket:x64-windows failed with BUILD_FAILED. If expected, add rsocket:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: rsocket:x64-windows-static failed with BUILD_FAILED. If expected, add rsocket:x64-windows-static=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: rsocket:x64-windows-static-md failed with BUILD_FAILED. If expected, add rsocket:x64-windows-static-md=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` ICE :( https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1490389 Other changes: * Removed qt5-webengine skips because they are now skipped by a "supports" clause. * Removed ctp skips because asset caching exists. * [stxxl] Guard definition of log2 for current MSVCs. --- ports/stxxl/0001-fix-visual-studio.patch | 529 +++++++++--------- ports/stxxl/vcpkg.json | 4 +- scripts/azure-pipelines/azure-pipelines.yml | 4 +- .../azure-pipelines/linux/provision-image.sh | 18 +- .../windows/azure-pipelines.yml | 3 - .../azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- scripts/ci.baseline.txt | 28 +- scripts/vcpkgTools.xml | 8 +- versions/baseline.json | 2 +- versions/s-/stxxl.json | 5 + 10 files changed, 304 insertions(+), 299 deletions(-) diff --git a/ports/stxxl/0001-fix-visual-studio.patch b/ports/stxxl/0001-fix-visual-studio.patch index 3506c51abfd65f..287b0ae3df965c 100644 --- a/ports/stxxl/0001-fix-visual-studio.patch +++ b/ports/stxxl/0001-fix-visual-studio.patch @@ -1,272 +1,289 @@ -diff --git a/include/stxxl/bits/algo/ksort.h b/include/stxxl/bits/algo/ksort.h -index 33ec8cf..4079a57 100644 ---- a/include/stxxl/bits/algo/ksort.h -+++ b/include/stxxl/bits/algo/ksort.h -@@ -299,11 +299,7 @@ create_runs( - template --struct run_cursor2_cmp : public std::binary_function< -- run_cursor2, -- run_cursor2, -- bool -- > +diff --git a/include/stxxl/bits/algo/ksort.h b/include/stxxl/bits/algo/ksort.h +index 33ec8cf..8101741 100644 +--- a/include/stxxl/bits/algo/ksort.h ++++ b/include/stxxl/bits/algo/ksort.h +@@ -299,11 +299,7 @@ create_runs( + template +-struct run_cursor2_cmp : public std::binary_function< +- run_cursor2, +- run_cursor2, +- bool +- > +struct run_cursor2_cmp - { - typedef run_cursor2 cursor_type; - KeyExtractor keyobj; -@@ -327,7 +323,7 @@ private: - }; - - template --class key_comparison : public std::binary_function + { + typedef run_cursor2 cursor_type; + KeyExtractor keyobj; +@@ -327,7 +323,7 @@ private: + }; + + template +-class key_comparison : public std::binary_function +class key_comparison - { - KeyExtractor ke; - -diff --git a/include/stxxl/bits/algo/sort_helper.h b/include/stxxl/bits/algo/sort_helper.h -index 524e40d..69234c4 100644 ---- a/include/stxxl/bits/algo/sort_helper.h -+++ b/include/stxxl/bits/algo/sort_helper.h -@@ -51,7 +51,6 @@ struct trigger_entry - - template - struct trigger_entry_cmp -- : public std::binary_function - { - typedef TriggerEntryType trigger_entry_type; - ValueCmp cmp; -@@ -67,11 +66,6 @@ template - struct run_cursor2_cmp -- : public std::binary_function< -- run_cursor2, -- run_cursor2, -- bool -- > - { - typedef BlockType block_type; - typedef PrefetcherType prefetcher_type; -diff --git a/include/stxxl/bits/compat/unique_ptr.h b/include/stxxl/bits/compat/unique_ptr.h -index 9df12ff..7110246 100644 ---- a/include/stxxl/bits/compat/unique_ptr.h -+++ b/include/stxxl/bits/compat/unique_ptr.h -@@ -22,12 +22,7 @@ STXXL_BEGIN_NAMESPACE - - template - struct compat_unique_ptr { --#if __cplusplus >= 201103L && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40400) - typedef std::unique_ptr result; --#else -- // auto_ptr is inherently broken and is deprecated by unique_ptr in c++0x -- typedef std::auto_ptr result; --#endif - }; - - STXXL_END_NAMESPACE -diff --git a/include/stxxl/bits/containers/btree/leaf.h b/include/stxxl/bits/containers/btree/leaf.h -index d7c619f..c6b2fcc 100644 ---- a/include/stxxl/bits/containers/btree/leaf.h -+++ b/include/stxxl/bits/containers/btree/leaf.h -@@ -66,7 +66,7 @@ public: - typedef node_cache leaf_cache_type; - - public: -- struct value_compare : public std::binary_function + { + KeyExtractor ke; + +diff --git a/include/stxxl/bits/algo/sort_helper.h b/include/stxxl/bits/algo/sort_helper.h +index 524e40d..69234c4 100644 +--- a/include/stxxl/bits/algo/sort_helper.h ++++ b/include/stxxl/bits/algo/sort_helper.h +@@ -51,7 +51,6 @@ struct trigger_entry + + template + struct trigger_entry_cmp +- : public std::binary_function + { + typedef TriggerEntryType trigger_entry_type; + ValueCmp cmp; +@@ -67,11 +66,6 @@ template + struct run_cursor2_cmp +- : public std::binary_function< +- run_cursor2, +- run_cursor2, +- bool +- > + { + typedef BlockType block_type; + typedef PrefetcherType prefetcher_type; +diff --git a/include/stxxl/bits/compat/unique_ptr.h b/include/stxxl/bits/compat/unique_ptr.h +index 9df12ff..7110246 100644 +--- a/include/stxxl/bits/compat/unique_ptr.h ++++ b/include/stxxl/bits/compat/unique_ptr.h +@@ -22,12 +22,7 @@ STXXL_BEGIN_NAMESPACE + + template + struct compat_unique_ptr { +-#if __cplusplus >= 201103L && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40400) + typedef std::unique_ptr result; +-#else +- // auto_ptr is inherently broken and is deprecated by unique_ptr in c++0x +- typedef std::auto_ptr result; +-#endif + }; + + STXXL_END_NAMESPACE +diff --git a/include/stxxl/bits/containers/btree/leaf.h b/include/stxxl/bits/containers/btree/leaf.h +index d7c619f..969adfd 100644 +--- a/include/stxxl/bits/containers/btree/leaf.h ++++ b/include/stxxl/bits/containers/btree/leaf.h +@@ -66,7 +66,7 @@ public: + typedef node_cache leaf_cache_type; + + public: +- struct value_compare : public std::binary_function + struct value_compare - { - key_compare comp; - -diff --git a/include/stxxl/bits/containers/btree/node.h b/include/stxxl/bits/containers/btree/node.h -index 13dec7b..a4c47d8 100644 ---- a/include/stxxl/bits/containers/btree/node.h -+++ b/include/stxxl/bits/containers/btree/node.h -@@ -71,7 +71,7 @@ public: - typedef node_cache node_cache_type; - - private: -- struct value_compare : public std::binary_function + { + key_compare comp; + +diff --git a/include/stxxl/bits/containers/btree/node.h b/include/stxxl/bits/containers/btree/node.h +index 13dec7b..c26cfff 100644 +--- a/include/stxxl/bits/containers/btree/node.h ++++ b/include/stxxl/bits/containers/btree/node.h +@@ -71,7 +71,7 @@ public: + typedef node_cache node_cache_type; + + private: +- struct value_compare : public std::binary_function + struct value_compare - { - key_compare comp; - -diff --git a/include/stxxl/bits/containers/hash_map/hash_map.h b/include/stxxl/bits/containers/hash_map/hash_map.h -index 0759bd2..ecf19cd 100644 ---- a/include/stxxl/bits/containers/hash_map/hash_map.h -+++ b/include/stxxl/bits/containers/hash_map/hash_map.h -@@ -1258,10 +1258,7 @@ protected: - * lexicographically by Note: the hash-value has already - * been computed. - */ -- struct Cmp : public std::binary_function< -- std::pair, -- std::pair, bool -- > + { + key_compare comp; + +diff --git a/include/stxxl/bits/containers/hash_map/hash_map.h b/include/stxxl/bits/containers/hash_map/hash_map.h +index 0759bd2..edcc2ac 100644 +--- a/include/stxxl/bits/containers/hash_map/hash_map.h ++++ b/include/stxxl/bits/containers/hash_map/hash_map.h +@@ -1258,10 +1258,7 @@ protected: + * lexicographically by Note: the hash-value has already + * been computed. + */ +- struct Cmp : public std::binary_function< +- std::pair, +- std::pair, bool +- > + struct Cmp - { - self_type& map_; - Cmp(self_type& map) : map_(map) { } -@@ -1520,7 +1517,7 @@ protected: - - public: - //! Construct an equality predicate from the comparison operator -- struct equal_to : public std::binary_function + { + self_type& map_; + Cmp(self_type& map) : map_(map) { } +@@ -1520,7 +1517,7 @@ protected: + + public: + //! Construct an equality predicate from the comparison operator +- struct equal_to : public std::binary_function + struct equal_to - { - //! reference to hash_map - const self_type& m_map; -diff --git a/include/stxxl/bits/io/wbtl_file.h b/include/stxxl/bits/io/wbtl_file.h -index 933a216..30828a0 100644 ---- a/include/stxxl/bits/io/wbtl_file.h -+++ b/include/stxxl/bits/io/wbtl_file.h -@@ -65,7 +65,7 @@ class wbtl_file : public disk_queued_file - size_type curpos; - request_ptr backend_request; - -- struct FirstFit : public std::binary_function + { + //! reference to hash_map + const self_type& m_map; +diff --git a/include/stxxl/bits/io/wbtl_file.h b/include/stxxl/bits/io/wbtl_file.h +index 933a216..d9f0674 100644 +--- a/include/stxxl/bits/io/wbtl_file.h ++++ b/include/stxxl/bits/io/wbtl_file.h +@@ -65,7 +65,7 @@ class wbtl_file : public disk_queued_file + size_type curpos; + request_ptr backend_request; + +- struct FirstFit : public std::binary_function + struct FirstFit - { - bool operator () ( - const place& entry, -diff --git a/include/stxxl/bits/mng/block_alloc.h b/include/stxxl/bits/mng/block_alloc.h -index 19ade8b..887f0e6 100644 ---- a/include/stxxl/bits/mng/block_alloc.h -+++ b/include/stxxl/bits/mng/block_alloc.h -@@ -138,7 +138,7 @@ private: - perm[i] = i; - - stxxl::random_number rnd; -- std::random_shuffle(perm.begin(), perm.end(), rnd _STXXL_FORCE_SEQUENTIAL); + { + bool operator () ( + const place& entry, +diff --git a/include/stxxl/bits/mng/block_alloc.h b/include/stxxl/bits/mng/block_alloc.h +index 19ade8b..dac408f 100644 +--- a/include/stxxl/bits/mng/block_alloc.h ++++ b/include/stxxl/bits/mng/block_alloc.h +@@ -138,7 +138,7 @@ private: + perm[i] = i; + + stxxl::random_number rnd; +- std::random_shuffle(perm.begin(), perm.end(), rnd _STXXL_FORCE_SEQUENTIAL); + std::shuffle(perm.begin(), perm.end(), std::mt19937(std::random_device()())); - } - - public: -diff --git a/include/stxxl/bits/mng/block_alloc_interleaved.h b/include/stxxl/bits/mng/block_alloc_interleaved.h -index a82ee34..5aba23a 100644 ---- a/include/stxxl/bits/mng/block_alloc_interleaved.h -+++ b/include/stxxl/bits/mng/block_alloc_interleaved.h -@@ -93,7 +93,7 @@ struct interleaved_RC : public interleaved_striping - perms[i][j] = j; - - random_number rnd; -- std::random_shuffle(perms[i].begin(), perms[i].end(), rnd _STXXL_FORCE_SEQUENTIAL); + } + + public: +diff --git a/include/stxxl/bits/mng/block_alloc_interleaved.h b/include/stxxl/bits/mng/block_alloc_interleaved.h +index a82ee34..83925a3 100644 +--- a/include/stxxl/bits/mng/block_alloc_interleaved.h ++++ b/include/stxxl/bits/mng/block_alloc_interleaved.h +@@ -93,7 +93,7 @@ struct interleaved_RC : public interleaved_striping + perms[i][j] = j; + + random_number rnd; +- std::random_shuffle(perms[i].begin(), perms[i].end(), rnd _STXXL_FORCE_SEQUENTIAL); + std::shuffle(perms[i].begin(), perms[i].end(), std::mt19937(std::random_device()())); - } - } - -diff --git a/include/stxxl/bits/mng/disk_allocator.h b/include/stxxl/bits/mng/disk_allocator.h -index 59ad085..c1e0f83 100644 ---- a/include/stxxl/bits/mng/disk_allocator.h -+++ b/include/stxxl/bits/mng/disk_allocator.h -@@ -44,7 +44,7 @@ class disk_allocator : private noncopyable - { - typedef std::pair place; - -- struct first_fit : public std::binary_function + } + } + +diff --git a/include/stxxl/bits/mng/disk_allocator.h b/include/stxxl/bits/mng/disk_allocator.h +index 59ad085..a4e534e 100644 +--- a/include/stxxl/bits/mng/disk_allocator.h ++++ b/include/stxxl/bits/mng/disk_allocator.h +@@ -44,7 +44,7 @@ class disk_allocator : private noncopyable + { + typedef std::pair place; + +- struct first_fit : public std::binary_function + struct first_fit - { - bool operator () ( - const place& entry, -@@ -189,7 +189,7 @@ void disk_allocator::new_blocks(BID* begin, BID* end) - - sortseq::iterator space; - space = std::find_if(free_space.begin(), free_space.end(), -- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL); + { + bool operator () ( + const place& entry, +@@ -189,7 +189,7 @@ void disk_allocator::new_blocks(BID* begin, BID* end) + + sortseq::iterator space; + space = std::find_if(free_space.begin(), free_space.end(), +- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL); + std::bind(first_fit(), std::placeholders::_1, requested_size) _STXXL_FORCE_SEQUENTIAL); - - if (space == free_space.end() && requested_size == BlockSize) - { -@@ -207,7 +207,7 @@ void disk_allocator::new_blocks(BID* begin, BID* end) - grow_file(BlockSize); - - space = std::find_if(free_space.begin(), free_space.end(), -- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL); + + if (space == free_space.end() && requested_size == BlockSize) + { +@@ -207,7 +207,7 @@ void disk_allocator::new_blocks(BID* begin, BID* end) + grow_file(BlockSize); + + space = std::find_if(free_space.begin(), free_space.end(), +- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL); + std::bind(first_fit(), std::placeholders::_1, requested_size) _STXXL_FORCE_SEQUENTIAL); - } - - if (space != free_space.end()) -diff --git a/include/stxxl/bits/parallel.h b/include/stxxl/bits/parallel.h -index d973861..c858d87 100644 ---- a/include/stxxl/bits/parallel.h -+++ b/include/stxxl/bits/parallel.h -@@ -121,7 +121,6 @@ using __gnu_parallel::random_shuffle; - #elif STXXL_PARALLEL - - using std::sort; --using std::random_shuffle; - - #else - -diff --git a/include/stxxl/bits/parallel/base.h b/include/stxxl/bits/parallel/base.h -index 141d515..7dae74f 100644 ---- a/include/stxxl/bits/parallel/base.h -+++ b/include/stxxl/bits/parallel/base.h -@@ -33,7 +33,6 @@ namespace parallel { - */ - template - class binary_negate -- : public std::binary_function - { - protected: - Predicate pred; -@@ -80,7 +79,7 @@ static inline void decode2(lcas_t x, int& a, int& b) - * Constructs predicate for equality from strict weak ordering predicate - */ - template --class equal_from_less : public std::binary_function + } + + if (space != free_space.end()) +diff --git a/include/stxxl/bits/msvc_compatibility.h b/include/stxxl/bits/msvc_compatibility.h +index c2c937d..0cb22e5 100644 +--- a/include/stxxl/bits/msvc_compatibility.h ++++ b/include/stxxl/bits/msvc_compatibility.h +@@ -19,10 +19,12 @@ + + #include + ++#if _MSC_VER < 1900 + inline double log2(double x) + { + return (log(x) / log(2.)); + } ++#endif // ^^^ _MSC_VER < 1900 + + // http://msdn.microsoft.com/en-us/library/2ts7cx93.aspx + #define snprintf _snprintf +diff --git a/include/stxxl/bits/parallel.h b/include/stxxl/bits/parallel.h +index d973861..c858d87 100644 +--- a/include/stxxl/bits/parallel.h ++++ b/include/stxxl/bits/parallel.h +@@ -121,7 +121,6 @@ using __gnu_parallel::random_shuffle; + #elif STXXL_PARALLEL + + using std::sort; +-using std::random_shuffle; + + #else + +diff --git a/include/stxxl/bits/parallel/base.h b/include/stxxl/bits/parallel/base.h +index 141d515..1c970f9 100644 +--- a/include/stxxl/bits/parallel/base.h ++++ b/include/stxxl/bits/parallel/base.h +@@ -33,7 +33,6 @@ namespace parallel { + */ + template + class binary_negate +- : public std::binary_function + { + protected: + Predicate pred; +@@ -80,7 +79,7 @@ static inline void decode2(lcas_t x, int& a, int& b) + * Constructs predicate for equality from strict weak ordering predicate + */ + template +-class equal_from_less : public std::binary_function +class equal_from_less - { - private: - Comparator& comp; -@@ -126,7 +125,7 @@ median_of_three_iterators(RandomAccessIterator a, RandomAccessIterator b, - - /** Similar to std::equal_to, but allows two different types. */ - template --struct equal_to : std::binary_function + { + private: + Comparator& comp; +@@ -126,7 +125,7 @@ median_of_three_iterators(RandomAccessIterator a, RandomAccessIterator b, + + /** Similar to std::equal_to, but allows two different types. */ + template +-struct equal_to : std::binary_function +struct equal_to - { - bool operator () (const T1& t1, const T2& t2) const - { -@@ -136,7 +135,7 @@ struct equal_to : std::binary_function - - /** Similar to std::less, but allows two different types. */ - template --struct less : std::binary_function + { + bool operator () (const T1& t1, const T2& t2) const + { +@@ -136,7 +135,7 @@ struct equal_to : std::binary_function + + /** Similar to std::less, but allows two different types. */ + template +-struct less : std::binary_function +struct less - { - bool operator () (const T1& t1, const T2& t2) const - { -diff --git a/include/stxxl/bits/parallel/multiseq_selection.h b/include/stxxl/bits/parallel/multiseq_selection.h -index 57e7599..f41d9aa 100644 ---- a/include/stxxl/bits/parallel/multiseq_selection.h -+++ b/include/stxxl/bits/parallel/multiseq_selection.h -@@ -35,7 +35,6 @@ namespace parallel { - //! Compare a pair of types lexcigraphically, ascending. - template - class lexicographic -- : public std::binary_function, std::pair, bool> - { - protected: - Comparator& m_comp; -@@ -60,7 +59,6 @@ public: - //! Compare a pair of types lexcigraphically, descending. - template - class lexicographic_rev -- : public std::binary_function, std::pair, bool> - { - protected: - Comparator& m_comp; -diff --git a/lib/io/wbtl_file.cpp b/lib/io/wbtl_file.cpp -index 310d76a..6d52e2e 100644 ---- a/lib/io/wbtl_file.cpp -+++ b/lib/io/wbtl_file.cpp -@@ -304,7 +304,7 @@ wbtl_file::offset_type wbtl_file::get_next_write_block() - // mapping_lock has to be aquired by caller - sortseq::iterator space = - std::find_if(free_space.begin(), free_space.end(), -- bind2nd(FirstFit(), write_block_size) _STXXL_FORCE_SEQUENTIAL); + { + bool operator () (const T1& t1, const T2& t2) const + { +diff --git a/include/stxxl/bits/parallel/multiseq_selection.h b/include/stxxl/bits/parallel/multiseq_selection.h +index 57e7599..f41d9aa 100644 +--- a/include/stxxl/bits/parallel/multiseq_selection.h ++++ b/include/stxxl/bits/parallel/multiseq_selection.h +@@ -35,7 +35,6 @@ namespace parallel { + //! Compare a pair of types lexcigraphically, ascending. + template + class lexicographic +- : public std::binary_function, std::pair, bool> + { + protected: + Comparator& m_comp; +@@ -60,7 +59,6 @@ public: + //! Compare a pair of types lexcigraphically, descending. + template + class lexicographic_rev +- : public std::binary_function, std::pair, bool> + { + protected: + Comparator& m_comp; +diff --git a/lib/io/wbtl_file.cpp b/lib/io/wbtl_file.cpp +index 310d76a..5f1a766 100644 +--- a/lib/io/wbtl_file.cpp ++++ b/lib/io/wbtl_file.cpp +@@ -304,7 +304,7 @@ wbtl_file::offset_type wbtl_file::get_next_write_block() + // mapping_lock has to be aquired by caller + sortseq::iterator space = + std::find_if(free_space.begin(), free_space.end(), +- bind2nd(FirstFit(), write_block_size) _STXXL_FORCE_SEQUENTIAL); + std::bind(FirstFit(), std::placeholders::_1, write_block_size) _STXXL_FORCE_SEQUENTIAL); - - if (space != free_space.end()) - { + + if (space != free_space.end()) + { diff --git a/ports/stxxl/vcpkg.json b/ports/stxxl/vcpkg.json index e6a4029b0e1056..107a4324945337 100644 --- a/ports/stxxl/vcpkg.json +++ b/ports/stxxl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "stxxl", - "version-string": "2018-11-15", - "port-version": 4, + "version-date": "2018-11-15", + "port-version": 5, "description": "Standard Template Library for Extra Large Data Sets" } diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 7061cfb8c2cd3c..5c0e9350a1cd1e 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2022-04-13' - linux-pool: 'PrLin-2022-04-13' + windows-pool: 'PrWin-2022-05-16' + linux-pool: 'PrLin-2022-05-16' osx-pool: 'PrOsx-2022-02-04' jobs: diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index d72c669cca7b86..4855bd913e9989 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -14,7 +14,7 @@ APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \ libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \ flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \ - pkg-config meson" + pkg-config meson nasm cmake ninja-build" # Additionally required by qt5-base APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \ @@ -58,27 +58,17 @@ APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66" apt-get -y install $APT_PACKAGES -# Install newer version of nasm than the apt package, required by intel-ipsec -mkdir /tmp/nasm -cd /tmp/nasm -curl -O https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.gz -tar -xf nasm-2.15.05.tar.gz -cd nasm-2.15.05/ -./configure --prefix=/usr && make -j -make install -cd ~ - -# Install the latest Haskell stack +# Install the latest Haskell stack for bond curl -sSL https://get.haskellstack.org/ | sh # Install CUDA wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub +apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" apt-get -y update apt-get install -y --no-install-recommends cuda-compiler-11-6 cuda-libraries-dev-11-6 cuda-driver-dev-11-6 \ - cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev + cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 cuda-nvml-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev # Install PowerShell wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index de254db6476d01..8435a2c967b360 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -34,9 +34,6 @@ jobs: pwsh: true - script: .\bootstrap-vcpkg.bat displayName: 'Bootstrap vcpkg' - - script: | - if exist ${{ variables.VCPKG_DOWNLOADS }} rmdir /S /Q ${{ variables.VCPKG_DOWNLOADS }} 2>&1 - displayName: 'Clean downloads' # Note that we run docs checks before PR checks because they are likely to invalidate a whole run anyway - task: Powershell@2 displayName: 'Generate Documentation' diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 4707808edadf8c..ebb14c5ad9d129 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 064ab1b704d053..810e16e731099c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -172,6 +172,12 @@ cpp-netlib:x64-uwp=fail cppcoro:x64-linux=fail cppcoro:arm-uwp=fail cppcoro:x64-uwp=fail +# VS 2022 17.2 miscompiles this: +cppgraphqlgen:arm64-windows=fail +cppgraphqlgen:x64-windows=fail +cppgraphqlgen:x64-windows-static=fail +cppgraphqlgen:x64-windows-static-md=fail +cppgraphqlgen:x86-windows=fail # The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support. # This is known to work on x64-linux as of gcc 10.3.0. cppgraphqlgen:x64-linux=fail @@ -648,7 +654,6 @@ mecab:x64-windows-static-md=skip mecab:x86-windows = skip # Due to static crt. mesa:x64-windows-static=fail -mesa:x64-windows-static-md=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail @@ -933,9 +938,8 @@ qt5-webengine:x64-osx=fail # Succesful built requires protobuf to be installed after qt5-webengine not before. Otherwise the build picks up the wrong headers from inside vcpkg. qt5-webengine:x64-windows=skip qt5-webengine:x86-windows=skip -# Static builds of qt5-webengine are not supported by the port itself -qt5-webengine:x64-windows-static=skip -qt5-webengine:x64-windows-static-md=skip +# VS2022 17.2 ICE https://developercommunity.visualstudio.com/t/Visual-Studio-2022-v1720-reports-fata/10039296 +qtwebengine:x64-windows=fail # Missing system libraries qt5-x11extras:x64-osx=fail # Missing libraries @@ -1019,6 +1023,10 @@ rsasynccpp:x64-osx=fail rsm-binary-io:x64-linux=fail # Requires g++10 but CI compiler only has g++9 rsm-bsa:x64-linux=fail +# VS2022 17.2 ICE https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1490389 +rsocket:x64-windows=fail +rsocket:x64-windows-static=fail +rsocket:x64-windows-static-md=fail rtlsdr:x64-uwp=fail rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail @@ -1247,18 +1255,6 @@ yara:x64-uwp=fail z3:arm-uwp=fail z3:x64-uwp=fail -# Official downloading server of CTP library is only guaranteed to be available during trading hours of China futures market -# Skip CI to avoid random failures -ctp:arm64-windows=skip -ctp:arm-uwp=skip -ctp:x64-linux=skip -ctp:x64-osx=skip -ctp:x64-uwp=skip -ctp:x64-windows=skip -ctp:x64-windows-static=skip -ctp:x64-windows-static-md=skip -ctp:x86-windows=skip - # clapack is replaced by lapack-reference on the platforms lapack-reference supports clapack:x64-linux=skip clapack:x64-osx=skip diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 86dc96eb95c5d3..aa30aa15662482 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -187,11 +187,11 @@ ninja-freebsd-1.8.2.zip - 7.2.1 + 7.2.3 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x86.zip - f7a1d7de59c9400ee7d4f988a35daf6f52aef3206a9de9948e5f8d81b7e838301e07491b9cab417fc58f9fd2eb28773175e86a06158ae868c7ef076cc4be7882 - PowerShell-7.2.1-win-x86.zip + https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x86.zip + 4b275fd1dc6430e0d7b77d4c34ec54ad47502602592ebc1ec99c88610ec24d3adca27a41896dc4767ac820ad7e000f9c2b1d678b05e9dd76086ff52a11976f80 + PowerShell-7.2.3-win-x86.zip 16.12.0 diff --git a/versions/baseline.json b/versions/baseline.json index 794458caacd104..3a15b5e8327311 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6830,7 +6830,7 @@ }, "stxxl": { "baseline": "2018-11-15", - "port-version": 4 + "port-version": 5 }, "suitesparse": { "baseline": "5.8.0", diff --git a/versions/s-/stxxl.json b/versions/s-/stxxl.json index 25fcc439f2d420..2ad7095874349f 100644 --- a/versions/s-/stxxl.json +++ b/versions/s-/stxxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "769f42922523b172d890b697a65096ca47e06ff8", + "version-date": "2018-11-15", + "port-version": 5 + }, { "git-tree": "081a4c6de6290ce05297cc873fa0fde245133a8a", "version-string": "2018-11-15", From 423cf6c160913a8c76249f147693608ebba2d922 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 17 May 2022 16:47:01 -0700 Subject: [PATCH 268/383] Clarify that found license is the found license, not the suggested one. (#24735) See https://github.com/microsoft/vcpkg/issues/24709 --- .github/workflows/untrustedPR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index c094d894889994..141c7efd42f4eb 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -41,7 +41,7 @@ jobs: git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' > .github-pr.changed-manifest-files cat .github-pr.changed-manifest-files | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license - cat .github-pr.changed-manifest-files | while read filename; do match=$(grep -oiP '"license": ".*\K(AGPL-1\.0|AGPL-3\.0|BSD-2-Clause-FreeBSD|BSD-2-Clause-NetBSD|bzip2-1\.0\.5|eCos-2\.0|GFDL-1\.1|GFDL-1\.2|GFDL-1\.3|GPL-1\.0|GPL-1\.0\+|GPL-2\.0|GPL-2\.0\+|GPL-2\.0-with-autoconf-exception|GPL-2\.0-with-bison-exception|GPL-2\.0-with-classpath-exception|GPL-2\.0-with-font-exception|GPL-2\.0-with-GCC-exception|GPL-3\.0|GPL-3\.0\+|GPL-3\.0-with-autoconf-exception|GPL-3\.0-with-GCC-exception|LGPL-2\.0|LGPL-2\.0\+|LGPL-2\.1|LGPL-2\.1\+|LGPL-3\.0|LGPL-3\.0\+|Nunit|StandardML-NJ|wxWindows)(?=[ "])' "$filename" || true); if [ ! -z "$match" ]; then echo " - \`$filename\` (\`$match\`)" ; fi ; done > .github-pr.deprecated-license + cat .github-pr.changed-manifest-files | while read filename; do match=$(grep -oiP '"license": ".*\K(AGPL-1\.0|AGPL-3\.0|BSD-2-Clause-FreeBSD|BSD-2-Clause-NetBSD|bzip2-1\.0\.5|eCos-2\.0|GFDL-1\.1|GFDL-1\.2|GFDL-1\.3|GPL-1\.0|GPL-1\.0\+|GPL-2\.0|GPL-2\.0\+|GPL-2\.0-with-autoconf-exception|GPL-2\.0-with-bison-exception|GPL-2\.0-with-classpath-exception|GPL-2\.0-with-font-exception|GPL-2\.0-with-GCC-exception|GPL-3\.0|GPL-3\.0\+|GPL-3\.0-with-autoconf-exception|GPL-3\.0-with-GCC-exception|LGPL-2\.0|LGPL-2\.0\+|LGPL-2\.1|LGPL-2\.1\+|LGPL-3\.0|LGPL-3\.0\+|Nunit|StandardML-NJ|wxWindows)(?=[ "])' "$filename" || true); if [ ! -z "$match" ]; then echo " - \`$filename\` (has deprecated license \`$match\`)" ; fi ; done > .github-pr.deprecated-license ./vcpkg format-manifest --all --convert-control git diff > .github-pr.format-manifest git add -u From 61058871a9d0a671539b35f73c7fde8ac88d9014 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 17 May 2022 16:52:27 -0700 Subject: [PATCH 269/383] [openssl] Support custom cflags on Windows (#24133) * [openssl] Support custom cflags on Windows * [openssl] Add vcpkg-cmake-get-vars dependency * [openssl] Record version Co-authored-by: Billy Robert O'Neal --- ports/openssl/vcpkg.json | 10 ++++++++++ ports/openssl/windows/flags.patch | 22 +++++++++++++++++++++ ports/openssl/windows/portfile.cmake | 29 +++++++++++++++++++++++++--- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 5 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 ports/openssl/windows/flags.patch diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 008c3fa1304451..a0619265e18d29 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openssl", "version": "3.0.3", + "port-version": 1, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", @@ -8,6 +9,15 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true, + "platform": "windows & !mingw & !uwp" } ] } diff --git a/ports/openssl/windows/flags.patch b/ports/openssl/windows/flags.patch new file mode 100644 index 00000000000000..90f0e891078381 --- /dev/null +++ b/ports/openssl/windows/flags.patch @@ -0,0 +1,22 @@ +diff --git a/Configure b/Configure +index faf57b1..690a9b8 100644 +--- a/Configure ++++ b/Configure +@@ -556,7 +556,7 @@ my $list_separator_re = + # (we supported those before the change to "make variable" support. + my %user = ( + AR => env('AR'), +- ARFLAGS => [], ++ ARFLAGS => [ env('ARFLAGS') || () ], + AS => undef, + ASFLAGS => [], + CC => env('CC'), +@@ -569,7 +569,7 @@ my %user = ( + CPPINCLUDES => [], # Alternative for -I + CROSS_COMPILE => env('CROSS_COMPILE'), + HASHBANGPERL=> env('HASHBANGPERL') || env('PERL'), +- LD => undef, ++ LD => env('LD'), + LDFLAGS => [ env('LDFLAGS') || () ], # -L, -Wl, + LDLIBS => [ env('LDLIBS') || () ], # -l + MT => undef, diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index 5cd487300253ee..f4f346e184e6fa 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -1,6 +1,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/flags.patch" ) vcpkg_find_acquire_program(NASM) @@ -10,16 +11,29 @@ vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") vcpkg_find_acquire_program(JOM) set(OPENSSL_SHARED no-shared) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(OPENSSL_SHARED shared) endif() +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +set(ENV{CC} "${VCPKG_DETECTED_CMAKE_C_COMPILER}") +set(ENV{CXX} "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") +set(ENV{AR} "${VCPKG_DETECTED_CMAKE_AR}") +set(ENV{LD} "${VCPKG_DETECTED_CMAKE_LINKER}") + +# OpenSSL's buildsystem hardcodes certain PDB manipulations, so we cannot use Z7 +string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_C_FLAGS_RELEASE "${VCPKG_COMBINED_C_FLAGS_RELEASE}") +string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") +string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_CXX_FLAGS_RELEASE "${VCPKG_COMBINED_CXX_FLAGS_RELEASE}") +string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_CXX_FLAGS_DEBUG "${VCPKG_COMBINED_CXX_FLAGS_DEBUG}") + set(CONFIGURE_OPTIONS enable-static-engine enable-capieng no-ssl2 no-tests - -utf-8 ${OPENSSL_SHARED} ) @@ -51,7 +65,6 @@ file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - # Copy openssl sources. message(STATUS "Copying openssl release source files...") file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*) @@ -63,6 +76,11 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR}) + set(ENV{CFLAGS} "${VCPKG_COMBINED_C_FLAGS_RELEASE}") + set(ENV{CXXFLAGS} "${VCPKG_COMBINED_CXX_FLAGS_RELEASE}") + set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}") + set(ENV{ARFLAGS} "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE}") + message(STATUS "Configure ${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS @@ -102,6 +120,11 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug) + set(ENV{CFLAGS} "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + set(ENV{CXXFLAGS} "${VCPKG_COMBINED_CXX_FLAGS_DEBUG}") + set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") + set(ENV{ARFLAGS} "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG}") + message(STATUS "Configure ${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS diff --git a/versions/baseline.json b/versions/baseline.json index 3a15b5e8327311..5c78dcc9f7cc45 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5178,7 +5178,7 @@ }, "openssl": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 14d19fb9584b60..93f7b62b5cdc6e 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ac5c972c2c6c9af050334b2f7a41de1253c6a5e", + "version": "3.0.3", + "port-version": 1 + }, { "git-tree": "973408910bc03c5a350f502080548a0d1ac68352", "version": "3.0.3", From 8d59cb32d2b363e67993376dd6b9d44f6cbe2c72 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 18 May 2022 01:53:40 +0200 Subject: [PATCH 270/383] [liblzma] Update wrapper, add feature tools (#24708) * Fix liblzma wrapper for older CMake * Add feature for tools * Update versions * Test find_package(... REQUIRED) --- ports/liblzma/build-tools.patch | 18 ++++++++++++++++++ ports/liblzma/portfile.cmake | 7 +++++++ ports/liblzma/vcpkg-cmake-wrapper.cmake | 2 +- ports/liblzma/vcpkg.json | 10 ++++++++-- .../cmake-user/project/CMakeLists.txt | 2 ++ versions/baseline.json | 2 +- versions/l-/liblzma.json | 5 +++++ 7 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 ports/liblzma/build-tools.patch diff --git a/ports/liblzma/build-tools.patch b/ports/liblzma/build-tools.patch new file mode 100644 index 00000000000000..6ccfa2ce44a4ac --- /dev/null +++ b/ports/liblzma/build-tools.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cddbccb..63c8f3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -492,6 +492,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblzmaConfig.cmake" + COMPONENT liblzma_Development) + + ++if(BUILD_TOOLS) + ############################################################################# + # getopt_long + ############################################################################# +@@ -663,3 +664,4 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + COMPONENT xz) + endif() ++endif() +\ No newline at end of file diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index 7c1ce3b6e7d37f..052281e3fc9e9f 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -9,10 +9,17 @@ vcpkg_from_github( fix_config_include.patch win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. add_support_ios.patch # add install bundle info for support ios + build-tools.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/liblzma/vcpkg-cmake-wrapper.cmake b/ports/liblzma/vcpkg-cmake-wrapper.cmake index 32ea801553f568..826cdba0650ba6 100644 --- a/ports/liblzma/vcpkg-cmake-wrapper.cmake +++ b/ports/liblzma/vcpkg-cmake-wrapper.cmake @@ -13,7 +13,7 @@ if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND NOT CMAKE_DISA if(CMAKE_VERSION VERSION_LESS 3.16) # Older versions of FindLibLZMA.cmake need a single lib in LIBLZMA_LIBRARY. set(z_vcpkg_liblzma_fixup_needed 1) - set(LIBLZMA_LIBRARY "${LIBLZMA_LIBRARY_RELEASE}") + set(LIBLZMA_LIBRARY "${LIBLZMA_LIBRARY_RELEASE}" CACHE INTERNAL "") elseif(NOT TARGET LibLZMA::LibLZMA) set(z_vcpkg_liblzma_fixup_needed 1) endif() diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json index c2c5a5a84a2a46..9d37b9a05de9b9 100644 --- a/ports/liblzma/vcpkg.json +++ b/ports/liblzma/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblzma", "version-semver": "5.2.5", - "port-version": 5, + "port-version": 6, "description": "Compression library with an API similar to that of zlib.", "homepage": "https://github.com/xz-mirror/xz", "license": null, @@ -14,5 +14,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tools": { + "description": "Build tools", + "supports": "!windows, mingw" + } + } } diff --git a/scripts/test_ports/cmake-user/project/CMakeLists.txt b/scripts/test_ports/cmake-user/project/CMakeLists.txt index 9e74608cee734e..8ef35915402a3a 100644 --- a/scripts/test_ports/cmake-user/project/CMakeLists.txt +++ b/scripts/test_ports/cmake-user/project/CMakeLists.txt @@ -53,6 +53,8 @@ foreach(package ${FIND_PACKAGES}) message(SEND_ERROR "find_package(${package}) check: failed") continue() endif() + # REQUIRED changes the behaviour find_package_handle_standard_args. + find_package("${package}" REQUIRED) message(STATUS "find_package(${package}) check: success") set(libraries_var "") diff --git a/versions/baseline.json b/versions/baseline.json index 5c78dcc9f7cc45..1f0efa0ce6c438 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3738,7 +3738,7 @@ }, "liblzma": { "baseline": "5.2.5", - "port-version": 5 + "port-version": 6 }, "libmad": { "baseline": "0.15.1", diff --git a/versions/l-/liblzma.json b/versions/l-/liblzma.json index ce6deba1127359..77c763c101c132 100644 --- a/versions/l-/liblzma.json +++ b/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96b6aac6211ad3fd3da29508a519c3cd5f09716d", + "version-semver": "5.2.5", + "port-version": 6 + }, { "git-tree": "18b7cbd0972b536a6bd4c0ef0f41dce9c3f047ac", "version-semver": "5.2.5", From 04a8c2d3b49d9d1dce773e60ceaff7637dcb714f Mon Sep 17 00:00:00 2001 From: eao197 Date: Wed, 18 May 2022 02:56:09 +0300 Subject: [PATCH 271/383] [sobjectizer,so5extra] update to 5.7.4 and 1.5.1 (#24729) * SObjectizer and so5extra updated to the latest versions. * Versions of so-5.7.4 and so5extra-1.5.1 added to baseline. --- ports/so5extra/portfile.cmake | 4 ++-- ports/so5extra/vcpkg.json | 2 +- ports/sobjectizer/portfile.cmake | 4 ++-- ports/sobjectizer/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/s-/so5extra.json | 5 +++++ versions/s-/sobjectizer.json | 5 +++++ 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake index 3c7def1b9cdec4..caee67fd8ba5de 100644 --- a/ports/so5extra/portfile.cmake +++ b/ports/so5extra/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/so5extra - REF 713ed4876135dfaa9b744b567f7c300eae09800d # v.1.5.0 - SHA512 51b1e9521288c4cfbbf29aa9719b9da3ee0073e38af6fc275a5ec0a22b4bededf293b136aac0cf99a435b4411ccf0687556418fc25285f501a6f426f3a623c34 + REF 3105cfdaccf2609765f19cd9bc6173375a1ee18d # v.1.5.1 + SHA512 a53734afcc591cf114e654e5f798b973faa1c37926a18e71728571b6762133001147db5d92b872f5d63927c15e394b8c6f33968aa6f0ee23038fc94a271b9b85 ) vcpkg_cmake_configure( diff --git a/ports/so5extra/vcpkg.json b/ports/so5extra/vcpkg.json index b51bee5ecc6cb4..d5f31b47829ecf 100644 --- a/ports/so5extra/vcpkg.json +++ b/ports/so5extra/vcpkg.json @@ -1,6 +1,6 @@ { "name": "so5extra", - "version": "1.5.0", + "version": "1.5.1", "description": "A set of additional tools for SObjectizer framework.", "homepage": "https://github.com/Stiffstream/so5extra", "license": "BSD-3-Clause", diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index 55ca94ad81cf67..2fca780f5bdbff 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer - REF 4c3bf6e9da4eae21fa5cce31dd464aabaec803a4 # v.5.7.3 - SHA512 e5de6753d44c85c8077b133af1823bf892e1e7361659bbfc424b39c2f123e3b1c99b1292908e32034b538ef2410a41587c51723c8f8e1ffd85badd559f2a393c + REF 646ac5891c15af766181d8ed7061b4fa9fa43e9f # v.5.7.4 + SHA512 c2ed2e0f41b31e56865469ddfa6f67cc41af8b154f73b8d431aad75f7af5033bddae5445e64454e17fd9c8a207a19415c7dd33102205687c4937cf92bcfb3fa2 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 9b06fd9094b58f..984741690d1ded 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.7.3", + "version": "5.7.4", "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.", "homepage": "https://github.com/Stiffstream/sobjectizer", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 1f0efa0ce6c438..ef7bb542dd670a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6585,11 +6585,11 @@ "port-version": 1 }, "so5extra": { - "baseline": "1.5.0", + "baseline": "1.5.1", "port-version": 0 }, "sobjectizer": { - "baseline": "5.7.3", + "baseline": "5.7.4", "port-version": 0 }, "soci": { diff --git a/versions/s-/so5extra.json b/versions/s-/so5extra.json index 5f012450617faf..ff3914f4a6e933 100644 --- a/versions/s-/so5extra.json +++ b/versions/s-/so5extra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66d53f9403902601af81144cfe017b3576617643", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "a25bef02c9cea8f01ec3066d423b4f4ca6615959", "version": "1.5.0", diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index 9edb247a2de80d..971916b7d67369 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0434420bf7122407a1efe2ae663f5d09d70ce775", + "version": "5.7.4", + "port-version": 0 + }, { "git-tree": "6d0c49d93ac92669376ad08293de921d9e36352e", "version": "5.7.3", From 0eb37f499e95e6eaec955638bf3ab179d2daf01d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 18 May 2022 02:02:42 +0200 Subject: [PATCH 272/383] [libxml2] update to 2.9.14 (#24738) * update libxml2 * version db --- ports/libxml2/portfile.cmake | 4 ++-- ports/libxml2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libxml2.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index 3f0fb98303cd36..a9e869bd92f3b5 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxml2 - REF a075d256fd9ff15590b86d981b75a50ead124fca - SHA512 bcf437b43357400f89e8766a23e841c090c48dfc1bdbb200971013e6c9ed082fb03759248547dfbd5dabf4b6887f69fed6ad790174ec206e20d47dfde2c875ab + REF 7846b0a677f8d3ce72486125fa281e92ac9970e8 + SHA512 3b960e410cf812a94938cd31c317f9a8d4b2d5b3e148efb108f6dad86ce8c9553c0fe3b32dd68d15e3d5ada9db07b39f9e0b13906edf6ed1bb1cec4f137bca71 HEAD_REF master PATCHES disable-docs.patch diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 276a8079e09932..117810665d3195 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libxml2", - "version-semver": "2.9.13", + "version": "2.9.14", "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ef7bb542dd670a..fba437d9de106c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4193,7 +4193,7 @@ "port-version": 0 }, "libxml2": { - "baseline": "2.9.13", + "baseline": "2.9.14", "port-version": 0 }, "libxmlmm": { diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 63b6e758b1f95c..0f5e6419aeed72 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "454c94726c33c2893c30afbe34243d69dc4d91e0", + "version": "2.9.14", + "port-version": 0 + }, { "git-tree": "0da62e928cc294ad51a384594db59d6ff2dc49d4", "version-semver": "2.9.13", From 8de52b066fbe641faae2ac626f0d2dfdbfa9dc52 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Wed, 18 May 2022 08:03:10 +0800 Subject: [PATCH 273/383] [akali] Update string replace method to embed AKALI_STATIC (#24741) * [teemo] Update to v2.7 * [teemo] Format manifest * [teemo] Update to v2.7 * [akali] Update to v1.43 * [akali] Update to v1.43 * [akali] Update to v1.43 * overwrite version * add license * overwrite version * [akali] Update string replace method. * [akali] run x-add-version command. Co-authored-by: FrankXie Co-authored-by: admin --- ports/akali/portfile.cmake | 6 ++---- ports/akali/vcpkg.json | 1 + versions/a-/akali.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake index f489f6e263da07..3ed9ff3641a636 100644 --- a/ports/akali/portfile.cmake +++ b/ports/akali/portfile.cmake @@ -25,13 +25,11 @@ elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/akali") vcpkg_cmake_config_fixup(CONFIG_PATH share/akali) endif() -file(READ "${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "${AKALI_EXPORT_H}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "#ifdef AKALI_STATIC" "#if 1" AKALI_EXPORT_H "${AKALI_EXPORT_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 1") else() - string(REPLACE "#ifdef AKALI_STATIC" "#if 0" AKALI_EXPORT_H "${AKALI_EXPORT_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 0") endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "${AKALI_EXPORT_H}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/akali/vcpkg.json b/ports/akali/vcpkg.json index aa2f9c420e2a14..c06a223e7ba35f 100644 --- a/ports/akali/vcpkg.json +++ b/ports/akali/vcpkg.json @@ -1,6 +1,7 @@ { "name": "akali", "version": "1.43", + "port-version": 1, "description": "C++ Common Library.", "homepage": "https://github.com/winsoft666/akali", "license": "MIT", diff --git a/versions/a-/akali.json b/versions/a-/akali.json index 82a641a9c4f917..4d9c7e16a029bc 100644 --- a/versions/a-/akali.json +++ b/versions/a-/akali.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0090858a22905c2856b8796f852d1a403081be7", + "version": "1.43", + "port-version": 1 + }, { "git-tree": "5e97f0348cd1def4c594fda413436a01609923ec", "version": "1.43", diff --git a/versions/baseline.json b/versions/baseline.json index fba437d9de106c..e49220b9afcc12 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -38,7 +38,7 @@ }, "akali": { "baseline": "1.43", - "port-version": 0 + "port-version": 1 }, "alac": { "baseline": "2017-11-03-c38887c5", From 8639e65b88335e328b968954ee68c7d8eb6e3ea8 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 17 May 2022 17:12:53 -0700 Subject: [PATCH 274/383] [docs] Split integration.md per Build System. (#24737) * Split integration.md per Build System. Centralize buildsystem configuration. * PR comment --- README.md | 6 +- README_es.md | 2 +- README_fr.md | 2 +- README_ko_KR.md | 2 +- README_zh_CN.md | 2 +- docs/README.md | 2 +- docs/about/faq.md | 6 +- .../examples/installing-and-using-packages.md | 2 +- docs/users/buildsystems/cmake-integration.md | 224 ++++++++++++++++++ docs/users/buildsystems/export-command.md | 20 ++ docs/users/buildsystems/integration.md | 10 + docs/users/buildsystems/manual-integration.md | 31 +++ .../users/buildsystems/msbuild-integration.md | 139 +++++++++++ docs/users/integration.md | 177 -------------- docs/users/manifests.md | 207 ---------------- docs/users/triplets.md | 4 +- 16 files changed, 437 insertions(+), 399 deletions(-) create mode 100644 docs/users/buildsystems/cmake-integration.md create mode 100644 docs/users/buildsystems/export-command.md create mode 100644 docs/users/buildsystems/integration.md create mode 100644 docs/users/buildsystems/manual-integration.md create mode 100644 docs/users/buildsystems/msbuild-integration.md delete mode 100644 docs/users/integration.md diff --git a/README.md b/README.md index 3f17ba137753b7..5032e9fb235bce 100644 --- a/README.md +++ b/README.md @@ -212,8 +212,6 @@ You'll then be able to bootstrap vcpkg along with the [quick start guide](#quick ## Using vcpkg with CMake -If you're using vcpkg with CMake, the following may help! - ### Visual Studio Code with CMake Tools Adding the following to your workspace `settings.json` will make @@ -247,7 +245,7 @@ Finally, in `CMake options`, add the following line: -DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake ``` -Unfortunately, you'll have to add this to each profile. +You must add this line to each profile. ### Vcpkg as a Submodule @@ -265,7 +263,7 @@ by passing the `CMAKE_TOOLCHAIN_FILE` directly, but it will make the configure-build step slightly easier. [getting-started:using-a-package]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/integration.md +[getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #installing-linux-developer-tools diff --git a/README_es.md b/README_es.md index a10aa7adddf071..dad810127d91ad 100644 --- a/README_es.md +++ b/README_es.md @@ -319,7 +319,7 @@ puede usar un simple `vcpkg install --feature-flags=manifests` Para mĆ”s informaciĆ³n, revise la especificaciĆ³n de [manifiesto][getting-started:manifest-spec] [getting-started:using-a-package]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/integration.md +[getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #Instalando-Herramientas-de-desarrollo-en-Linux diff --git a/README_fr.md b/README_fr.md index 35f3c46c9ee525..140e8435b6ba13 100644 --- a/README_fr.md +++ b/README_fr.md @@ -245,7 +245,7 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems Cela permettra toujours aux gens de ne pas utiliser vcpkg, en passant directement le CMAKE_TOOLCHAIN_FILE, mais cela rendra l'Ć©tape de configuration-construction lĆ©gĆØrement plus facile. [getting-started:utiliser-un-paquet]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/integration.md +[getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #installing-linux-developer-tools diff --git a/README_ko_KR.md b/README_ko_KR.md index 8ab8cf116b4a1f..2b0a93997a7cdb 100644 --- a/README_ko_KR.md +++ b/README_ko_KR.md @@ -262,7 +262,7 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems vcpkgė„¼ ģ‚¬ģš©ķ•˜ģ§€ ģ•Šģ„ ģˆ˜ ģžˆģŠµė‹ˆė‹¤. [getting-started:using-a-package]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/integration.md +[getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #installing-linux-developer-tools diff --git a/README_zh_CN.md b/README_zh_CN.md index 7fbd913b4b829f..87890daf52924d 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -245,7 +245,7 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems ä½æē”Øę­¤ē§ę–¹å¼åÆę— éœ€č®¾ē½® `CMAKE_TOOLCHAIN_FILE` 即åÆä½æē”Øvcpkgļ¼Œäø”ę›“å®¹ę˜“å®Œęˆé…ē½®å·„ä½œć€‚ [getting-started:using-a-package]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/integration.md +[getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #installing-linux-developer-tools diff --git a/docs/README.md b/docs/README.md index 6b770e189ba4f8..eb3b90cd9a27f7 100644 --- a/docs/README.md +++ b/docs/README.md @@ -14,7 +14,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too ### User Help -- [Buildsystem Integration](users/integration.md) +- [Buildsystem Integration](users/buildsystems/integration.md) - [Triplet files](users/triplets.md) - [Configuration and Environment](users/config-environment.md) - [Authentication](users/authentication.md) diff --git a/docs/about/faq.md b/docs/about/faq.md index e5dcd4c4c03e15..bc9d0cf29f49af 100644 --- a/docs/about/faq.md +++ b/docs/about/faq.md @@ -6,7 +6,7 @@ If you want to contribute but don't have a particular library in mind then take of [new port requests](https://github.com/Microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+label%3Acategory%3Anew-port). ## Can Vcpkg create pre-built binary packages? What is the binary format used by Vcpkg? -Yes! See [the `export` command](../users/integration.md#export-command). +Yes! See [the `export` command](../users/buildsystems/integration.md#export-command). ## How do I update libraries? The `vcpkg update` command lists all packages which are out-of-sync with your current portfiles. To update a package, follow the instructions in the command. @@ -36,7 +36,7 @@ Execute `git pull` to get the latest sources, then run `bootstrap-vcpkg.bat` (Wi ## How do I use different versions of a library on one machine? Within a single instance of Vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in Vcpkg correspond to the `X-dev` or `X-devel` packages. -To use different versions of a library for different projects, we recommend making separate instances of Vcpkg and using the [per-project integration mechanisms](../users/integration.md). The versions of each library are specified by the files in `ports\`, so they are easily manipulated using standard `git` commands. This makes it very easy to roll back the entire set of libraries to a consistent set of older versions which all work with each other. If you need to then pin a specific library forward, that is as easy as checking out the appropriate version of `ports\\`. +To use different versions of a library for different projects, we recommend making separate instances of Vcpkg and using the [per-project integration mechanisms](../users/buildsystems/integration.md). The versions of each library are specified by the files in `ports\`, so they are easily manipulated using standard `git` commands. This makes it very easy to roll back the entire set of libraries to a consistent set of older versions which all work with each other. If you need to then pin a specific library forward, that is as easy as checking out the appropriate version of `ports\\`. If your application is very sensitive to the versions of libraries, we recommend checking in the specific set of portfiles you need into your source control along with your project sources and using the `--vcpkg-root` option to redirect the working directory of `vcpkg.exe`. @@ -88,7 +88,7 @@ Vcpkg uses CMake internally as a build scripting language. This is because CMake ## Will Vcpkg support downloading compiled binaries from a public or private server? We would like to eventually support downloading precompiled binaries, similar to other system package managers. -In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See the [`export`](../users/integration.md#export) command. +In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See the [`export`](../users/buildsystems/integration.md#export) command. ## What Visual C++ toolsets are supported? We support Visual Studio 2015 Update 3 and above. diff --git a/docs/examples/installing-and-using-packages.md b/docs/examples/installing-and-using-packages.md index 011df93a4cc9f9..d9511dbf1ba7a0 100644 --- a/docs/examples/installing-and-using-packages.md +++ b/docs/examples/installing-and-using-packages.md @@ -4,7 +4,7 @@ - [Step 2: Use](#use) - [VS/MSBuild Project (User-wide integration)](#msbuild) - [CMake (Toolchain file)](#cmake) - - [Other integration options](../users/integration.md) + - [Other integration options](../users/buildsystems/integration.md) --- diff --git a/docs/users/buildsystems/cmake-integration.md b/docs/users/buildsystems/cmake-integration.md new file mode 100644 index 00000000000000..ad3c7d565d5e53 --- /dev/null +++ b/docs/users/buildsystems/cmake-integration.md @@ -0,0 +1,224 @@ +# CMake Integration + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/cmake-integration.md).** + +See [Installing and Using Packages Example: sqlite](../../examples/installing-and-using-packages.md) for a fully worked example using CMake. + +## Table of Contents + +- [`CMAKE_TOOLCHAIN_FILE`](#cmake_toolchain_file) +- [IDE Integration](#ide-integration) + - [Visual Studio Code (CMake Tools extension)](#visual-studio-code-cmake-tools-extension) + - [Visual Studio](#visual-studio) + - [CLion](#clion) +- [Using Multiple Toolchain Files](#using-multiple-toolchain-files) +- [Settings Reference](#settings-reference) + +## `CMAKE_TOOLCHAIN_FILE` + +Projects configured to use the vcpkg toolchain file (via the CMake setting `CMAKE_TOOLCHAIN_FILE`) can find libraries from vcpkg using the standard CMake functions: `find_package()`, `find_path()`, and `find_library()`. + +```no-highlight +cmake ../my/project -DCMAKE_TOOLCHAIN_FILE=[vcpkg-root]/scripts/buildsystems/vcpkg.cmake +``` + +Since version 3.21, CMake will use the environment variable `CMAKE_TOOLCHAIN_FILE`[1] as the default value for `CMAKE_TOOLCHAIN_FILE`. + +**cmd** +```cmd +set CMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` +**Powershell** +```powershell +$env:CMAKE_TOOLCHAIN_FILE="[vcpkg root]/scripts/buildsystems/vcpkg.cmake" +``` +**bash** +```sh +export CMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +vcpkg does not automatically add any include or links paths into your project. To use a header-only library you can use `find_path()` which will correctly work on all platforms: + +```cmake +# To find and use catch2 +find_path(CATCH_INCLUDE_DIR NAMES catch.hpp PATH_SUFFIXES catch2) +include_directories(${CATCH_INCLUDE_DIR}) +``` + +[1]: https://cmake.org/cmake/help/latest/envvar/CMAKE_TOOLCHAIN_FILE.html + +## IDE Integration + +### Visual Studio Code (CMake Tools Extension) + +Adding the following to your workspace `settings.json` will make CMake Tools automatically use vcpkg for libraries: + +```json +{ + "cmake.configureSettings": { + "CMAKE_TOOLCHAIN_FILE": "[vcpkg root]/scripts/buildsystems/vcpkg.cmake" + } +} +``` + +### Visual Studio + +In the CMake Settings Editor, add the path to the vcpkg toolchain file under `CMake toolchain file`: + +``` +[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +### CLion + +Open the Toolchains settings (`File > Settings` on Windows and Linux, `CLion > Preferences` on macOS), and go to the CMake settings (`Build, Execution, Deployment > CMake`). In `CMake options`, add the following line: + +``` +-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +You must add this line to each profile separately. + +## Using Multiple Toolchain Files + +To combine vcpkg's toolchain file with another toolchain file, you can set the cmake variable `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`: + +```no-highlight +cmake ../my/project \ + -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=../my/project/toolchain.cmake +``` + +Alternatively, you can include the vcpkg toolchain at the end of the primary toolchain file: + +```cmake +# MyToolchain.cmake +set(CMAKE_CXX_COMPILER ...) +set(VCPKG_TARGET_TRIPLET x64-my-custom-windows-triplet) +include(/path/to/vcpkg/scripts/buildsystems/vcpkg.cmake) +``` + +**Note: vcpkg does not automatically apply your toolchain's settings, such as your compiler or compilation flags, while building libraries. To change vcpkg's library settings, you must make a [custom triplet file](../triplets.md) (which can [share your toolchain](../triplets.md#VCPKG_CHAINLOAD_TOOLCHAIN_FILE))** + +## Settings Reference + +All vcpkg-affecting variables must be defined before the first `project()` directive, such as via the command line or `set()` statements. + +### `VCPKG_TARGET_TRIPLET` + +This setting controls the [triplet](../triplets.md) vcpkg will install and consume libraries from. + +If unset, vcpkg will automatically detect an appropriate default triplet given the current compiler settings. If you change this CMake variable, you must delete your cache and reconfigure. + +### `VCPKG_HOST_TRIPLET` + +This variable controls which [triplet](../triplets.md) host dependencies will be installed for. + +If unset, vcpkg will automatically detect an appropriate native triplet (x64-windows, x64-osx, x64-linux). + +See also [Host Dependencies](../host-dependencies.md). + +### `VCPKG_INSTALLED_DIR` + +This variable sets the location where libraries will be installed and consumed from. + +In manifest mode, the default is `${CMAKE_BINARY_DIR}/vcpkg_installed`. + +In classic mode, the default is `${VCPKG_ROOT}/installed`. + +### `VCPKG_MANIFEST_MODE` + +This variable forces vcpkg to operate in either manifest mode or classic mode. + +Defaults to `ON` when `VCPKG_MANIFEST_DIR` is non-empty or `${CMAKE_SOURCE_DIR}/vcpkg.json` exists. + +To disable manifest mode while a `vcpkg.json` is detected, set this to `OFF`. + +### `VCPKG_MANIFEST_DIR` + +This variable specifies an alternate folder containing a `vcpkg.json` manifest. + +Defaults to `${CMAKE_SOURCE_DIR}` if `${CMAKE_SOURCE_DIR}/vcpkg.json` exists. + +### `VCPKG_MANIFEST_INSTALL` + +This variable controls whether vcpkg will be automatically run to install your dependencies during your configure step. + +Defaults to `ON` if `VCPKG_MANIFEST_MODE` is `ON`. + +### `VCPKG_BOOTSTRAP_OPTIONS` + +This variable can be set to additional command parameters to pass to `./bootstrap-vcpkg`. + +In manifest mode, vcpkg will be automatically bootstrapped if the executable does not exist. + +### `VCPKG_OVERLAY_TRIPLETS` + +This variable can be set to a list of paths to be passed on the command line as `--overlay-triplets=...` + +### `VCPKG_OVERLAY_PORTS` + +This variable can be set to a list of paths to be passed on the command line as `--overlay-ports=...` + +### `VCPKG_MANIFEST_FEATURES` + +This variable can be set to a list of features to activate when installing from your manifest. + +For example, features can be used by projects to control building with additional dependencies to enable tests or samples: + +```json +{ + "name": "mylibrary", + "version": "1.0", + "dependencies": [ "curl" ], + "features": { + "samples": { + "description": "Build Samples", + "dependencies": [ "fltk" ] + }, + "tests": { + "description": "Build Tests", + "dependencies": [ "gtest" ] + } + } +} +``` +```cmake +# CMakeLists.txt + +option(BUILD_TESTING "Build tests" OFF) +if(BUILD_TESTING) + list(APPEND VCPKG_MANIFEST_FEATURES "tests") +endif() + +option(BUILD_SAMPLES "Build samples" OFF) +if(BUILD_SAMPLES) + list(APPEND VCPKG_MANIFEST_FEATURES "samples") +endif() + +project(myapp) + +# ... +``` + +### `VCPKG_MANIFEST_NO_DEFAULT_FEATURES` + +This variable controls activation of default features in addition to those listed in `VCPKG_MANIFEST_FEATURES`. If set to `ON`, default features will not be automatically activated. + +Defaults to `OFF`. + +### `VCPKG_INSTALL_OPTIONS` + +This variable can be set to a list of additional command line parameters to pass to the vcpkg tool during automatic installation. + +### `VCPKG_PREFER_SYSTEM_LIBS` + +This variable controls whether vcpkg will append instead of prepend its paths to `CMAKE_PREFIX_PATH`, `CMAKE_LIBRARY_PATH` and `CMAKE_FIND_ROOT_PATH` so that vcpkg libraries/packages are found after toolchain/system libraries/packages. + +Defaults to `OFF`. + +### `VCPKG_FEATURE_FLAGS` + +This variable can be set to a list of feature flags to pass to the vcpkg tool during automatic installation to opt-in to experimental behavior. + +See the `--feature-flags=` command line option for more information. diff --git a/docs/users/buildsystems/export-command.md b/docs/users/buildsystems/export-command.md new file mode 100644 index 00000000000000..c591d188976a56 --- /dev/null +++ b/docs/users/buildsystems/export-command.md @@ -0,0 +1,20 @@ +# `export` Command + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/export-command.md).** + +The `export` command creates a shrinkwrapped archive containing a specific set of libraries (and their dependencies) that can be quickly and reliably shared with build servers or other users in your organization. `export` only supports classic mode at this time. + +- `--nuget`: NuGet package +- `--zip`: Zip archive +- `--7zip`: 7Zip archive +- `--raw`: Raw, uncompressed folder + +Each of these have the same internal layout which mimics the layout of a full vcpkg instance: + +- `installed/` contains the library files +- `scripts/buildsystems/vcpkg.cmake` is the [CMake toolchain file](cmake-integration.md) +- `scripts/buildsystems/msbuild/vcpkg.props` and `scripts/buildsystems/msbuild/vcpkg.targets` are the [MSBuild integration files](msbuild-integration.md) + +NuGet package exports will also contain a `build\native\vcpkg.targets` that integrates with MSBuild projects using the NuGet package manager. + +Please also see our [blog post](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/) for additional examples. diff --git a/docs/users/buildsystems/integration.md b/docs/users/buildsystems/integration.md new file mode 100644 index 00000000000000..4c2ace80b4a5af --- /dev/null +++ b/docs/users/buildsystems/integration.md @@ -0,0 +1,10 @@ +# Buildsystem Integration + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/integration.md).** + +vcpkg supports use from any buildsystem and has specific native integration into MSBuild and CMake. + +- [MSBuild Integration (Visual Studio)](msbuild-integration.md) +- [CMake Integration](cmake-integration.md) +- [Manual Integration](#manual-integration) +- [`export` Command](#export-command) diff --git a/docs/users/buildsystems/manual-integration.md b/docs/users/buildsystems/manual-integration.md new file mode 100644 index 00000000000000..5062123f15e074 --- /dev/null +++ b/docs/users/buildsystems/manual-integration.md @@ -0,0 +1,31 @@ +# Manual Integration + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/manual-integration.md).** + +When installing libraries, vcpkg creates a single common layout partitioned by triplet. + +The root of the tree in classic mode is `[vcpkg root]/installed`. The root of the tree in manifest mode is `[vcpkg.json directory]/vcpkg_installed`. + +Underneath this root, in a subfolder named after the triplet: + +* Header files: `include/` +* Release `.lib`, `.a`, and `.so` files: `lib/` or `lib/manual-link/` +* Release `.dll` files: `bin/` +* Release `.pc` files: `lib/pkgconfig/` +* Debug `.lib`, `.a`, and `.so` files: `debug/lib/` or `debug/lib/manual-link/` +* Debug `.dll` files: `debug/bin/` +* Debug `.pc` files: `debug/lib/pkgconfig/` +* Tools: `tools/[portname]/` + +For example, `zlib.h` for `zlib:x64-windows` in classic mode is located at `[vcpkg root]/installed/x64-windows/include/zlib.h`. + +See your build system specific documentation for how to use prebuilt binaries. For example, `Makefile` projects often accept environment variables: + +```sh +export CXXFLAGS=-I$(pwd)/installed/x64-linux/include +export CFLAGS=-I$(pwd)/installed/x64-linux/include +export LDFLAGS=-L$(pwd)/installed/x64-linux/lib +export PKG_CONFIG_PATH=$(pwd)/installed/x64-linux/lib/pkgconfig:$PKG_CONFIG_PATH +``` + +_On Windows dynamic triplets, such as x64-windows:_ To run any produced executables you will also need to either copy the needed DLL files to the same folder as your executable or *prepend* the correct `bin\` directory to your path. diff --git a/docs/users/buildsystems/msbuild-integration.md b/docs/users/buildsystems/msbuild-integration.md new file mode 100644 index 00000000000000..e9dbf12275c84e --- /dev/null +++ b/docs/users/buildsystems/msbuild-integration.md @@ -0,0 +1,139 @@ +# MSBuild Integration (Visual Studio) + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/msbuild-integration.md).** + +## Table of Contents + +- [Integration Methods](#integration-methods) + - [User-wide integration](#user-wide-integration) + - [Import `.props` and `.targets`](#import-props-and-targets) + - [Linked NuGet Package](#linked-nuget-package) +- [Common Configuration](#common-configuration) +- [Manifest Mode Configuration](#manifest-mode-configuration) +- [Classic Mode Configuration](#classic-mode-configuration) + +## Integration Methods + +### User-wide integration + +```no-highlight +vcpkg integrate install +``` +This will implicitly add Include Directories, Link Directories, and Link Libraries for all packages installed with Vcpkg to all VS2015, VS2017 and VS2019 MSBuild projects. We also add a post-build action for executable projects that will analyze and copy any DLLs you need to the output folder, enabling a seamless F5 experience. + +For the vast majority of libraries, this is all you need to do -- just File -> New Project and write code! However, some libraries perform conflicting behaviors such as redefining `main()`. Since you need to choose per-project which of these conflicting options you want, you will need to add those libraries to your linker inputs manually. + +Here are some examples, though this is not an exhaustive list: + +- Gtest provides `gtest`, `gmock`, `gtest_main`, and `gmock_main` +- SDL2 provides `SDL2main` +- SFML provides `sfml-main` +- Boost.Test provides `boost_test_exec_monitor` + +To get a full list for all your installed packages, run `vcpkg owns manual-link`. + +### Import `.props` and `.targets` + +vcpkg can also be integrated into MSBuild projects by explicitly importing the `scripts/buildsystems/vcpkg.props` and `scripts/buildsystems/vcpkg.targets` files into each `.vcxproj`. By using relative paths, this enables vcpkg to be consumed by a submodule and automatically acquired by users when they run `git clone`. + +The easiest way to add these to every project in your solution is to create `Directory.Build.props` and `Directory.Build.targets` files at the root of your repository. + +The following examples assume they are at the root of your repository with a submodule of `microsoft/vcpkg` at `vcpkg`. + +**Example `Directory.Build.props`**: +```xml + + + +``` + +**Example `Directory.Build.targets`**: +```xml + + + +``` + +More information about `Directory.Build.targets` and `Directory.Build.props` can be found in the [Customize your build][1] section of the official MSBuild documentation. + +[1]: https://docs.microsoft.com/visualstudio/msbuild/customize-your-build#directorybuildprops-and-directorybuildtargets + +### Linked NuGet Package + +**Note: This approach is not recommended for new projects, since it makes them difficult to share with others. For a portable, self-contained NuGet package, see the [`export command`](#export-command)** + +VS projects can also be integrated through a NuGet package. This will modify the project file, so we do not recommend this approach for open source projects. + +```no-highlight +PS D:\src\vcpkg> .\vcpkg integrate project +Created nupkg: D:\src\vcpkg\scripts\buildsystems\vcpkg.D.src.vcpkg.1.0.0.nupkg + +With a project open, go to Tools->NuGet Package Manager->Package Manager Console and paste: + Install-Package vcpkg.D.src.vcpkg -Source "D:/src/vcpkg/scripts/buildsystems" +``` + +*Note: The generated NuGet package does not contain the actual libraries. It instead acts like a shortcut (or symlink) to the vcpkg install and will "automatically" update with any changes (install/remove) to the libraries. You do not need to regenerate or update the NuGet package.* + +## Common Configuration + +### `VcpkgEnabled` (Use Vcpkg) + +This can be set to "false" to explicitly disable vcpkg integration for the project + +### `VcpkgConfiguration` (Vcpkg Configuration) + +If your configuration names are too complex for vcpkg to guess correctly, you can assign this property to `Release` or `Debug` to explicitly tell vcpkg what variant of libraries you want to consume. + +### `VcpkgEnableManifest` (Use Vcpkg Manifest) + +This property must be set to `true` in order to consume from a local `vcpkg.json` file. If set to `false`, any local `vcpkg.json` files will be ignored. + +This currently defaults to `false`, but will default to `true` in the future. + +### `VcpkgTriplet` (Triplet) + +This property controls the triplet to consume libraries from, such as `x64-windows-static` or `arm64-windows`. + +If this is not explicitly set, vcpkg will deduce the correct triplet based on your Visual Studio settings. vcpkg will only deduce triplets that use dynamic library linkage and dynamic CRT linkage; if you want static dependencies or to use the static CRT (`/MT`), you will need to set the triplet manually. + +You can see the automatically deduced triplet by setting your MSBuild verbosity to Normal or higher: + +> *Shortcut: Ctrl+Q "build and run"* +> +> Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project build output verbosity + +See also [Triplets](../triplets.md) + +### `VcpkgHostTriplet` (Host Triplet) + +This can be set to a custom triplet to use for resolving host dependencies. + +If unset, this will default to the "native" triplet (x64-windows). + +See also [Host Dependencies](../host-dependencies.md). + +### `VcpkgInstalledDir` (Installed Directory) + +This property defines the location vcpkg will install and consume libraries from. + +In manifest mode, this defaults to `$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\`. In classic mode, this defaults to `$(VcpkgRoot)\installed\`. + +## Manifest Mode Configuration + +To use manifests (`vcpkg.json`) with MSBuild, first you need to use one of the integration methods above. Then, add a vcpkg.json above your project file (such as in the root of your source repository) and set the property `VcpkgEnableManifest` to `true`. You can set this property via the IDE in `Project Properties -> Vcpkg -> Use Vcpkg Manifest` (note: you may need to reload the IDE to see the vcpkg Property Page). + +vcpkg will automatically run during your project's build and install any listed dependencies to `vcpkg_installed/$(VcpkgTriplet)/` adjacent to the `vcpkg.json` file; these libraries will then automatically be included in and linked to your MSBuild projects. + +**Known issues** + +* Visual Studio 2015 does not correctly track edits to the `vcpkg.json` and `vcpkg-configuration.json` files, and will not respond to changes unless a `.cpp` is edited. + + + +### `VcpkgAdditionalInstallOptions` (Additional Options) + +When using a manifest, this option specifies additional command line flags to pass to the underlying vcpkg tool invocation. This can be used to access features that have not yet been exposed through another option. + +### `VcpkgManifestInstall` (Install Vcpkg Dependencies) + +This property can be set to `false` to disable automatic dependency restoration during project build. Dependencies must be manually restored via the vcpkg command line separately. diff --git a/docs/users/integration.md b/docs/users/integration.md deleted file mode 100644 index 15a3072e3c7a1a..00000000000000 --- a/docs/users/integration.md +++ /dev/null @@ -1,177 +0,0 @@ -# Buildsystem Integration - -**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/integration.md).** -## Table of Contents -- [MSBuild Integration (Visual Studio)](#msbuild-integration-visual-studio) - - [User-wide integration](#user-wide-integration) - - [Per-project Integration](#per-project-integration) - - [Changing the triplet](#msbuild-changing-the-triplet) -- [CMake Integration](#cmake-integration) - - [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option) - - [Using multiple toolchain files](#using-multiple-toolchain-files) - - [Changing the triplet](#cmake-changing-the-triplet) -- [Manual Compiler Setup](#manual-compiler-setup) -- [`export` Command](#export-command) - -The buildsystem-specific integration styles have heuristics to deduce the correct [triplet][]. This can be overridden in a native way for [MSBuild](#msbuild-changing-the-triplet) and [CMake](#cmake-changing-the-triplet). - -## MSBuild Integration (Visual Studio) - -**If you are using manifest mode(`vcpkg.json`) see [here](manifests.md#msbuild-integration) for additional configuration options.** -### User-wide integration -```no-highlight -vcpkg integrate install -``` -This will implicitly add Include Directories, Link Directories, and Link Libraries for all packages installed with Vcpkg to all VS2015, VS2017 and VS2019 MSBuild projects. We also add a post-build action for executable projects that will analyze and copy any DLLs you need to the output folder, enabling a seamless F5 experience. - -For the vast majority of libraries, this is all you need to do -- just File -> New Project and write code! However, some libraries perform conflicting behaviors such as redefining `main()`. Since you need to choose per-project which of these conflicting options you want, you will need to add those libraries to your linker inputs manually. - -Here are some examples, though this is not an exhaustive list: - -- Gtest provides `gtest`, `gmock`, `gtest_main`, and `gmock_main` -- SDL2 provides `SDL2main` -- SFML provides `sfml-main` -- Boost.Test provides `boost_test_exec_monitor` - -To get a full list for all your installed packages, run `vcpkg owns manual-link`. - -**If you are using manifest mode (`vcpkg.json`) see [here](manifests.md#msbuild-integration) for all available options.** - -### Per-project integration - -**Note: This approach is not recommended for new projects, since it makes them difficult to share with others.** - -**For a portable, self-contained NuGet package, see the [`export command`](#export-command)** - -We also provide individual VS project integration through a NuGet package. This will modify the project file, so we do not recommend this approach for open source projects. -```no-highlight -PS D:\src\vcpkg> .\vcpkg integrate project -Created nupkg: D:\src\vcpkg\scripts\buildsystems\vcpkg.D.src.vcpkg.1.0.0.nupkg - -With a project open, go to Tools->NuGet Package Manager->Package Manager Console and paste: - Install-Package vcpkg.D.src.vcpkg -Source "D:/src/vcpkg/scripts/buildsystems" -``` -*Note: The generated NuGet package does not contain the actual libraries. It instead acts like a shortcut (or symlink) to the vcpkg install and will "automatically" update with any changes (install/remove) to the libraries. You do not need to regenerate or update the NuGet package.* - - - -### Changing the triplet -You can see the automatically deduced triplet by setting your MSBuild verbosity to Normal or higher: - -> *Shortcut: Ctrl+Q "build and run"* -> -> Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project build output verbosity - -To override the automatically chosen [triplet][], you can specify the MSBuild property `VcpkgTriplet` in your `.vcxproj`. We recommend adding this to the `Globals` PropertyGroup. -```xml - - - x86-windows-static - x64-windows-static - -``` - -## CMake Integration -```no-highlight -cmake ../my/project -DCMAKE_TOOLCHAIN_FILE=[vcpkg-root]/scripts/buildsystems/vcpkg.cmake -``` -Projects configured with the Vcpkg toolchain file will have the appropriate Vcpkg folders added to the cmake search paths. This makes all libraries available to be found through `find_package()`, `find_path()`, and `find_library()`. - -See [Installing and Using Packages Example: sqlite](../examples/installing-and-using-packages.md) for a fully worked example using our CMake toolchain. - -Note that we do not automatically add ourselves to your compiler include paths. To use a header-only library, simply use `find_path()`, which will correctly work on all platforms: -```cmake -# To find and use catch -find_path(CATCH_INCLUDE_DIR NAMES catch.hpp PATH_SUFFIXES catch2) -include_directories(${CATCH_INCLUDE_DIR}) -``` - -**If you are using manifest mode (`vcpkg.json`) see [here](manifests.md#cmake-integration) for all available options.** - -For different IDE integrations see [here](../../README.md#using-vcpkg-with-cmake). - -### Using an environment variable instead of a command line option - -The `CMAKE_TOOLCHAIN_FILE` setting simply must be set before the `project()` directive is first called. This means that you can easily read from an environment variable to avoid passing it on the configure line: - -```cmake -if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) - set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - CACHE STRING "") -endif() - -project(myproject CXX) -``` - -### Using multiple toolchain files - -To use an external toolchain file with a project using vcpkg, you can set the cmake variable `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` on the configure line: -```no-highlight -cmake ../my/project \ - -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \ - -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=../my/project/compiler-settings-toolchain.cmake -``` - -Alternatively, you can include the vcpkg toolchain at the end of the primary toolchain file: -```cmake -# MyToolchain.cmake -set(CMAKE_CXX_COMPILER ...) -set(VCPKG_TARGET_TRIPLET x64-my-custom-windows-triplet) -include(/path/to/vcpkg/scripts/buildsystems/vcpkg.cmake) -``` -**Note: vcpkg does _not_ see the settings in your own triplets, such as your compiler or compilation flags. To change vcpkg's settings, you must make a [custom triplet file](triplets.md) (which can [share your own toolchain](triplets.md#VCPKG_CHAINLOAD_TOOLCHAIN_FILE))** - - - -### Changing the triplet -You can set `VCPKG_TARGET_TRIPLET` on the configure line: -```no-highlight -cmake ../my/project -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=... -``` -If you use `VCPKG_DEFAULT_TRIPLET` [environment variable](config-environment.md) to control the unqualified triplet in vcpkg command lines you can default `VCPKG_TARGET_TRIPLET` in CMake like [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option): - -```cmake -if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET) - set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "") -endif() -``` -Finally, if you have your own toolchain file, you can set `VCPKG_TARGET_TRIPLET` there: -```cmake -# MyToolchain.cmake -set(CMAKE_CXX_COMPILER ...) -set(VCPKG_TARGET_TRIPLET x64-my-custom-triplet) -``` - -## Manual Compiler Setup - -Libraries are installed into the `installed\` subfolder in classic mode, partitioned by triplet (e.g. x86-windows): - -* The header files are installed to `installed\x86-windows\include` -* Release `.lib` files are installed to `installed\x86-windows\lib` or `installed\x86-windows\lib\manual-link` -* Release `.dll` files are installed to `installed\x86-windows\bin` -* Debug `.lib` files are installed to `installed\x86-windows\debug\lib` or `installed\x86-windows\debug\lib\manual-link` -* Debug `.dll` files are installed to `installed\x86-windows\debug\bin` - -See your build system specific documentation for how to use prebuilt binaries. - -_On Windows dynamic triplets:_ To run any produced executables you will also need to either copy the needed DLL files to the same folder as your executable or *prepend* the correct `bin\` directory to your path. - -## Export Command -This command creates a shrinkwrapped archive containing a specific set of libraries (and their dependencies) that can be quickly and reliably shared with build servers or other users in your organization. - -- `--nuget`: NuGet package -- `--zip`: Zip archive -- `--7zip`: 7Zip archive -- `--raw`: Raw, uncompressed folder - -Each of these have the same internal layout which mimics the layout of a full vcpkg instance: - -- `installed\` contains the installed package files -- `scripts\buildsystems\vcpkg.cmake` is a toolchain file suitable for use with CMake - -Additionally, NuGet packages will contain a `build\native\vcpkg.targets` that integrates with MSBuild projects. - -Please also see our [blog post](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/) for additional examples. - - -[triplet]: triplets.md diff --git a/docs/users/manifests.md b/docs/users/manifests.md index 387511b65e5066..bb0e28025368d7 100644 --- a/docs/users/manifests.md +++ b/docs/users/manifests.md @@ -16,9 +16,6 @@ project directory or build directory. This mode acts more similarly to language recommend using this manifest mode whenever possible, because it allows one to encode a project's dependencies explicitly in a project file, rather than in the documentation, making your project much easier to consume. -Manifest mode is in beta, but it can be used from the CMake or MSBuild integration, which will be stable when used via -things like `find_package`. This is the recommended way to use manifest mode. - Check out the [manifest cmake example](../examples/manifest-mode-cmake.md) for an example project using CMake and manifest mode. @@ -27,8 +24,6 @@ manifest mode. - [Simple Example Manifest](#simple-example-manifest) - [Manifest Syntax Reference](#manifest-syntax-reference) - [Command Line Interface](#command-line-interface) -- [CMake Integration](#cmake-integration) -- [MSBuild Integration](#msbuild-integration) See also [the original specification](../specifications/manifests.md) for more low-level details. @@ -317,205 +312,3 @@ Disables automatic activation of all default features listed in the `vcpkg.json` Specifies the directory containing `vcpkg.json`. Defaults to searching upwards from the current working directory. - -## CMake Integration - -Our [CMake Integration](integration.md#cmake) will automatically detect a `vcpkg.json` manifest file in the same -directory as the top-level `CMakeLists.txt` (`${CMAKE_SOURCE_DIR}/vcpkg.json`) and activate manifest mode. Vcpkg will be -automatically bootstrapped if missing and invoked to install your dependencies into your local build directory -(`${CMAKE_BINARY_DIR}/vcpkg_installed`). - -### Configuration - -All vcpkg-affecting variables must be defined before the first `project()` directive, such as via the command line or -`set()` statements. - -#### `VCPKG_TARGET_TRIPLET` - -This variable controls which triplet dependencies will be installed for. - -If unset, vcpkg will automatically detect an appropriate default triplet given the current compiler settings. - -#### `VCPKG_HOST_TRIPLET` - -This variable controls which triplet host dependencies will be installed for. - -If unset, vcpkg will automatically detect an appropriate native triplet (x64-windows, x64-osx, x64-linux). - -See also [Host Dependencies](host-dependencies.md). - -### `VCPKG_INSTALLED_DIR` - -This variable allows one to set the location of the `vcpkg_installed` directory. -It defaults to `${CMAKE_BINARY_DIR}/vcpkg_installed`. - -#### `VCPKG_MANIFEST_MODE` - -This variable controls whether vcpkg operates in manifest mode or in classic mode. To disable manifest mode even with a -`vcpkg.json`, set this to `OFF`. - -Defaults to `ON` when `VCPKG_MANIFEST_DIR` is non-empty or `${CMAKE_SOURCE_DIR}/vcpkg.json` exists. - -#### `VCPKG_MANIFEST_DIR` - -This variable can be defined to specify an alternate folder containing your `vcpkg.json` manifest. - -Defaults to `${CMAKE_SOURCE_DIR}` if `${CMAKE_SOURCE_DIR}/vcpkg.json` exists. - -#### `VCPKG_MANIFEST_INSTALL` - -This variable controls whether vcpkg will be automatically run to install your dependencies during your configure step. - -Defaults to `ON` if `VCPKG_MANIFEST_MODE` is `ON`. - -#### `VCPKG_BOOTSTRAP_OPTIONS` - -This variable can be set to additional command parameters to pass to `./bootstrap-vcpkg` (run in automatic restore mode -if the vcpkg tool does not exist). - -#### `VCPKG_OVERLAY_TRIPLETS` - -This variable can be set to a list of paths to be passed on the command line as `--overlay-triplets=...` - -#### `VCPKG_OVERLAY_PORTS` - -This variable can be set to a list of paths to be passed on the command line as `--overlay-ports=...` - -#### `VCPKG_MANIFEST_FEATURES` - -This variable can be set to a list of features to treat as active when installing from your manifest. - -For example, Features can be used by projects to control building with additional dependencies to enable tests or -samples: - -```json -{ - "name": "mylibrary", - "version": "1.0", - "dependencies": [ "curl" ], - "features": { - "samples": { - "description": "Build Samples", - "dependencies": [ "fltk" ] - }, - "tests": { - "description": "Build Tests", - "dependencies": [ "gtest" ] - } - } -} -``` -```cmake -# CMakeLists.txt - -option(BUILD_TESTING "Build tests" OFF) -if(BUILD_TESTING) - list(APPEND VCPKG_MANIFEST_FEATURES "tests") -endif() - -option(BUILD_SAMPLES "Build samples" OFF) -if(BUILD_SAMPLES) - list(APPEND VCPKG_MANIFEST_FEATURES "samples") -endif() - -project(myapp) - -# ... -``` - -#### `VCPKG_MANIFEST_NO_DEFAULT_FEATURES` - -This variable controls whether to automatically activate all default features in addition to those listed in -`VCPKG_MANIFEST_FEATURES`. If set to `ON`, default features will not be automatically activated. - -Defaults to `OFF`. - -#### `VCPKG_INSTALL_OPTIONS` - -This variable can be set to a list of additional command line parameters to pass to the vcpkg tool during automatic -installation. - -#### `VCPKG_PREFER_SYSTEM_LIBS` - -This variable controls whether vcpkg will appends instead of prepends its paths to `CMAKE_PREFIX_PATH`, `CMAKE_LIBRARY_PATH` and `CMAKE_FIND_ROOT_PATH` so that vcpkg libraries/packages are found after toolchain/system libraries/packages. - -Defaults to `OFF`. - -#### `VCPKG_FEATURE_FLAGS` - -This variable can be set to a list of feature flags to pass to the vcpkg tool during automatic installation to opt-in to -experimental behavior. - -See the `--feature-flags=` command line option for more information. - -## MSBuild Integration - -To use manifests with MSBuild, first you need to use an [existing integration method](integration.md#with-msbuild). -Then, add a vcpkg.json above your project file (such as in the root of your source repository) and set the -property `VcpkgEnableManifest` to `true`. You can set this property via the IDE in `Project Properties -> Vcpkg -> Use -Vcpkg Manifest`. - -As part of your project's build, vcpkg automatically be run and install any listed dependencies to `vcpkg_installed/$(VcpkgTriplet)/` -adjacent to the `vcpkg.json` file; these files will then automatically be included in and linked to your MSBuild -projects. - -### Known issues - -* Visual Studio 2015 does not correctly track edits to the `vcpkg.json` and `vcpkg-configuration.json` files, and will -not respond to changes unless a `.cpp` is edited. - -### MSBuild Properties - -When using Visual Studio 2015 integration, these properties can be set in your project file before the - -```xml - -``` - -line, which unfortunately requires manual editing of the `.vcxproj` or passing on the msbuild command line with `/p:`. -With 2017 or later integration, These properties can additionally be set via the Visual Studio GUI under -`Project Properties -> Vcpkg` or via a common `.props` file imported between `Microsoft.Cpp.props` and -`Microsoft.Cpp.targets`. - -#### `VcpkgEnabled` (Use Vcpkg) - -This can be set to "false" to explicitly disable vcpkg integration for the project - -#### `VcpkgTriplet` (Triplet) - -This can be set to a custom triplet to use for integration (such as x64-windows-static) - -#### `VcpkgHostTriplet` (Host Triplet) - -This can be set to a custom triplet to use for resolving host dependencies. - -If unset, this will default to the "native" triplet (x64-windows, x64-osx, x64-linux). - -See also [Host Dependencies](host-dependencies.md). - -#### `VcpkgAdditionalInstallOptions` (Additional Options) - -When using a manifest, this option specifies additional command line flags to pass to the underlying vcpkg tool -invocation. This can be used to access features that have not yet been exposed through another option. - -#### `VcpkgConfiguration` (Vcpkg Configuration) - -If your configuration names are too complex for vcpkg to guess correctly, you can assign this property to `Release` or -`Debug` to explicitly tell vcpkg what variant of libraries you want to consume. - -#### `VcpkgEnableManifest` (Use Vcpkg Manifest) - -This property must be set to true in order to consume from a local vcpkg.json file. If set to false, any local -vcpkg.json files will be ignored. This will default to true in the future. - -#### `VcpkgManifestInstall` (Install Vcpkg Dependencies) - -*(Requires `Use Vcpkg Manifest` set to `true`)* - -This property can be set to "false" to disable automatic dependency restoration on project build. Dependencies can be -manually restored via the vcpkg command line. - -#### `VcpkgInstalledDir` (Installed Directory) - -This property defines the location where headers and binaries are consumed from. In manifest mode, this directory is -created and populated based on your manifest. diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 166b2561e3bd4f..909fcce76c8814 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -6,9 +6,9 @@ Triplet is a standard term used in cross compiling as a way to completely captur In Vcpkg, we use triplets to describe an imaginary "target configuration set" for every library. Within a triplet, libraries are generally built with the same configuration, but it is not a requirement. For example, you could have one triplet that builds `openssl` statically and `zlib` dynamically, one that builds them both statically, and one that builds them both dynamically (all for the same target OS and architecture). A single build will consume files from a single triplet. -We currently provide many triplets by default (run `vcpkg help triplet`). However, you can easily customize or add your own by copying a built-in triplet from the `triplets\` directory into a project local location. Then, use overlay triplets (such as [`$VCPKG_OVERLAY_TRIPLETS`](config-environment.md#vcpkg_overlay_triplets), [CMake Manifest Mode](manifests.md#vcpkg_overlay_triplets), or [MSBuild Manifest Mode](manifests.md#vcpkgadditionalinstalloptions-additional-options)) to add that directory to vcpkg. See our [overlay triplets example](../examples/overlay-triplets-linux-dynamic.md) for a more detailed walkthrough. +We currently provide many triplets by default (run `vcpkg help triplet`). However, you can easily customize or add your own by copying a built-in triplet from the `triplets\` directory into a project local location. Then, use `--overlay-triplets=` (or equivalent such as [`$VCPKG_OVERLAY_TRIPLETS`](config-environment.md#vcpkg_overlay_triplets), [CMake `VCPKG_OVERLAY_TRIPLETS`](buildsystems/cmake-integration.md#vcpkg_overlay_triplets), or [MSBuild Additional Options](buildsystems/msbuild-integration.md#vcpkg-additional-install-options)) to add that directory to vcpkg. See our [overlay triplets example](../examples/overlay-triplets-linux-dynamic.md) for a more detailed walkthrough. -To change the triplet used by your project away from the default, see our [Integration Document](integration.md#triplet-selection). +To change the triplet used by your project away from the default, see our [Integration Document](buildsystems/integration.md#triplet-selection). ## Community triplets From 2247b397faefc8266e545bd86330d2192d6b6247 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 17 May 2022 17:25:56 -0700 Subject: [PATCH 275/383] [pegtl] Update to 3.2.6 for MSVC and GCC fixes (#24761) * [pegtl] Update to 3.2.6 for compiler fixes * vcpkg x-add-version --all * Remove cppgraphqlgen from baseline, as suggested in https://github.com/microsoft/vcpkg/pull/24761#issuecomment-1129414611 Co-authored-by: Billy Robert O'Neal III --- ports/pegtl/portfile.cmake | 6 +++--- ports/pegtl/vcpkg.json | 2 +- scripts/ci.baseline.txt | 6 ------ versions/baseline.json | 2 +- versions/p-/pegtl.json | 5 +++++ 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index 4183a10107b017..5746327c2bad58 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 3.2.5 - SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14 - HEAD_REF main + REF e65017d398a3b733aedab70bb64b8055472d47aa + SHA512 05ca3754a9c1c94a205c6823e4442dca1f11a890aadd4b0c96f6ccd8946eec061c0a723bc67f8b57b074154e1ab1171bdcdd035926f55e42b5517b9d5ecae873 + HEAD_REF 3.x ) vcpkg_cmake_configure( diff --git a/ports/pegtl/vcpkg.json b/ports/pegtl/vcpkg.json index b173e2ba83b201..e2455acb924f91 100644 --- a/ports/pegtl/vcpkg.json +++ b/ports/pegtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pegtl", - "version-semver": "3.2.5", + "version-semver": "3.2.6", "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", "homepage": "https://github.com/taocpp/PEGTL", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 810e16e731099c..5130762e498a53 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -172,12 +172,6 @@ cpp-netlib:x64-uwp=fail cppcoro:x64-linux=fail cppcoro:arm-uwp=fail cppcoro:x64-uwp=fail -# VS 2022 17.2 miscompiles this: -cppgraphqlgen:arm64-windows=fail -cppgraphqlgen:x64-windows=fail -cppgraphqlgen:x64-windows-static=fail -cppgraphqlgen:x64-windows-static-md=fail -cppgraphqlgen:x86-windows=fail # The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support. # This is known to work on x64-linux as of gcc 10.3.0. cppgraphqlgen:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index e49220b9afcc12..cce2918afe93b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5377,7 +5377,7 @@ "port-version": 0 }, "pegtl": { - "baseline": "3.2.5", + "baseline": "3.2.6", "port-version": 0 }, "pegtl-2": { diff --git a/versions/p-/pegtl.json b/versions/p-/pegtl.json index dae6a54d3cd697..45bf43ca6c7371 100644 --- a/versions/p-/pegtl.json +++ b/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed96fd80f2820b9e5ad6f38a9ea24d7aebfb64be", + "version-semver": "3.2.6", + "port-version": 0 + }, { "git-tree": "43adc8ee136a8dd0ea88b54a6a7fdc7325cf7327", "version-semver": "3.2.5", From 68c6835c82bdb0fdd5b3f3c7d2a4a5835dada001 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 18 May 2022 08:06:15 +0200 Subject: [PATCH 276/383] [new port] Add openctm (#24680) * New port: openctm * Change openctm from "version-semver" to "version" Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update openctm versions file * Use ${PORT} instead of openctm directly * Put CMake configs in the unofficial namespace. * dos2unix Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/openctm/CMakeLists.txt | 60 ++++++++++++++++++++++++++++++++++++ ports/openctm/portfile.cmake | 21 +++++++++++++ ports/openctm/vcpkg.json | 17 ++++++++++ versions/baseline.json | 4 +++ versions/o-/openctm.json | 9 ++++++ 5 files changed, 111 insertions(+) create mode 100644 ports/openctm/CMakeLists.txt create mode 100644 ports/openctm/portfile.cmake create mode 100644 ports/openctm/vcpkg.json create mode 100644 versions/o-/openctm.json diff --git a/ports/openctm/CMakeLists.txt b/ports/openctm/CMakeLists.txt new file mode 100644 index 00000000000000..2d1de6a455931b --- /dev/null +++ b/ports/openctm/CMakeLists.txt @@ -0,0 +1,60 @@ +cmake_minimum_required(VERSION 3.19...3.23) +project( + openctm + VERSION 1.0.3 + LANGUAGES C) + +set(PUBLIC_HEADERS lib/openctm.h lib/openctmpp.h) + +add_library( + openctm + lib/compressMG1.c + lib/compressMG2.c + lib/compressRAW.c + lib/openctm.c + lib/stream.c + lib/liblzma/Alloc.c + lib/liblzma/LzFind.c + lib/liblzma/LzmaDec.c + lib/liblzma/LzmaEnc.c + lib/liblzma/LzmaLib.c) + +target_include_directories( + openctm + PUBLIC $ + $ + $) +target_compile_definitions(openctm PRIVATE OPENCTM_BUILD LZMA_PREFIX_CTM) +if(NOT BUILD_SHARED_LIBS) + target_compile_definitions(openctm PUBLIC OPENCTM_STATIC) +endif() +target_compile_features(openctm PRIVATE c_std_99) +set_target_properties(openctm PROPERTIES C_VISIBILITY_PRESET hidden + PUBLIC_HEADER "${PUBLIC_HEADERS}") + +include(GNUInstallDirs) +install( + TARGETS openctm + EXPORT unofficial-openctmConfig + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT dev) + +include(CMakePackageConfigHelpers) +set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-openctmConfigVersion.cmake") +write_basic_package_version_file( + "${VERSION_FILE_PATH}" + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion) +install(FILES "${VERSION_FILE_PATH}" DESTINATION share/unofficial-openctm) + +install(FILES ${PUBLIC_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +install( + EXPORT unofficial-openctmConfig + FILE unofficial-openctmConfig.cmake + NAMESPACE unofficial::openctm:: + DESTINATION share/unofficial-openctm) + +export(PACKAGE openctm) diff --git a/ports/openctm/portfile.cmake b/ports/openctm/portfile.cmake new file mode 100644 index 00000000000000..5be1b1d06475cf --- /dev/null +++ b/ports/openctm/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO openctm + REF OpenCTM-1.0.3 + SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e + FILENAME "OpenCTM-1.0.3-src.tar.bz2" +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-openctm) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openctm/vcpkg.json b/ports/openctm/vcpkg.json new file mode 100644 index 00000000000000..fd0586f74158fe --- /dev/null +++ b/ports/openctm/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "openctm", + "version": "1.0.3", + "description": "OpenCTM ā€” the Open Compressed Triangle Mesh file format ā€” is a file format, a software library and a tool set for compression of 3D triangle meshes.", + "homepage": "http://openctm.sourceforge.net/", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index cce2918afe93b2..99108ceb17f22a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5100,6 +5100,10 @@ "baseline": "1.4.2", "port-version": 2 }, + "openctm": { + "baseline": "1.0.3", + "port-version": 0 + }, "opencv": { "baseline": "4.5.5", "port-version": 0 diff --git a/versions/o-/openctm.json b/versions/o-/openctm.json new file mode 100644 index 00000000000000..22d7ae8211ed2a --- /dev/null +++ b/versions/o-/openctm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ea30144a8ad57cb95b0603de14e4dc8e9f7b2ea2", + "version": "1.0.3", + "port-version": 0 + } + ] +} From 0a6002ef2591045826d29ea9ffe8f22149813645 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 17 May 2022 23:56:02 -0700 Subject: [PATCH 277/383] [curl] Don't try to include OpenSSL headers when OpenSSL backends aren't selected. (#24766) Fixes regression introduced in https://github.com/microsoft/vcpkg/pull/24348 --- ports/curl/vcpkg.json | 2 +- ports/curl/wolfssl-ntlm.patch | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index ad8b1b91c069aa..0352d403fd9321 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "curl", "version": "7.83.1", - "port-version": 1, + "port-version": 2, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, diff --git a/ports/curl/wolfssl-ntlm.patch b/ports/curl/wolfssl-ntlm.patch index a86ab800b4fed3..40e2dd67fb770a 100644 --- a/ports/curl/wolfssl-ntlm.patch +++ b/ports/curl/wolfssl-ntlm.patch @@ -32,7 +32,7 @@ diff -ur a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h # include -#endif +# include -+#else ++#elif defined(USE_OPENSSL) # include #endif diff --git a/versions/baseline.json b/versions/baseline.json index 99108ceb17f22a..f1238b360615f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1746,7 +1746,7 @@ }, "curl": { "baseline": "7.83.1", - "port-version": 1 + "port-version": 2 }, "curlpp": { "baseline": "2018-06-15", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 36970ab9624416..551cecf0e4ead1 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09dee7c9ae276d954fc8017b6a81002e43f81bb0", + "version": "7.83.1", + "port-version": 2 + }, { "git-tree": "69e1aaae731455f5ed18b7eea4da75ee10bd073a", "version": "7.83.1", From 0fbc2d963312d37840b9e7a879e5fe35cfaeb06a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 18 May 2022 08:57:24 +0200 Subject: [PATCH 278/383] [libarchive] Update to 3.6.1 (#24739) * update libarchive * version db stuff --- ...{fix-dependencies.patch => fix-deps.patch} | 91 +++++++------------ ports/libarchive/pkgconfig-modules.patch | 8 +- ports/libarchive/portfile.cmake | 11 ++- ports/libarchive/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/libarchive.json | 5 + 6 files changed, 54 insertions(+), 68 deletions(-) rename ports/libarchive/{fix-dependencies.patch => fix-deps.patch} (62%) diff --git a/ports/libarchive/fix-dependencies.patch b/ports/libarchive/fix-deps.patch similarity index 62% rename from ports/libarchive/fix-dependencies.patch rename to ports/libarchive/fix-deps.patch index 573361c4912b79..0c549b44ad2e69 100644 --- a/ports/libarchive/fix-dependencies.patch +++ b/ports/libarchive/fix-deps.patch @@ -1,27 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 39b5333..8164d8f 100644 +index d49db1b82..cbc2b7102 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -433,7 +433,7 @@ MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY) - # Find BZip2 - # - IF(ENABLE_BZip2) -- FIND_PACKAGE(BZip2) -+ FIND_PACKAGE(BZip2 REQUIRED) - ELSE() - SET(BZIP2_FOUND FALSE) # Override cached value - ENDIF() -@@ -462,7 +462,8 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES) - # Find LZMA - # - IF(ENABLE_LZMA) -- FIND_PACKAGE(LibLZMA) -+ FIND_PACKAGE(LibLZMA REQUIRED) -+ SET(LIBLZMA_LIBRARIES LibLZMA::LibLZMA) - ELSE() - SET(LIBLZMA_FOUND FALSE) # Override cached value - ENDIF() -@@ -470,6 +471,8 @@ ENDIF() +@@ -476,6 +476,8 @@ ENDIF() IF(LIBLZMA_FOUND) SET(HAVE_LIBLZMA 1) SET(HAVE_LZMA_H 1) @@ -30,10 +11,15 @@ index 39b5333..8164d8f 100644 CMAKE_PUSH_CHECK_STATE() INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) -@@ -555,22 +558,15 @@ IF(ENABLE_LZ4) - SET(LZ4_FIND_QUIETLY TRUE) - ENDIF (LZ4_INCLUDE_DIR) - +@@ -556,27 +558,15 @@ ENDIF(LIBB2_FOUND) + # Find LZ4 + # + IF(ENABLE_LZ4) +- IF (LZ4_INCLUDE_DIR) +- # Already in cache, be silent +- SET(LZ4_FIND_QUIETLY TRUE) +- ENDIF (LZ4_INCLUDE_DIR) +- - FIND_PATH(LZ4_INCLUDE_DIR lz4.h) - FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4) - INCLUDE(FindPackageHandleStandardArgs) @@ -42,8 +28,7 @@ index 39b5333..8164d8f 100644 ELSE(ENABLE_LZ4) SET(LZ4_FOUND FALSE) # Override cached value ENDIF(ENABLE_LZ4) --IF(LZ4_FOUND) -+IF(lz4_FOUND) + IF(LZ4_FOUND) + SET(HAVE_LZ4HC_H 1) SET(HAVE_LIBLZ4 1) SET(HAVE_LZ4_H 1) @@ -57,10 +42,15 @@ index 39b5333..8164d8f 100644 # # TODO: test for static library. # -@@ -586,25 +566,20 @@ IF(ENABLE_ZSTD) - SET(ZSTD_FIND_QUIETLY TRUE) - ENDIF (ZSTD_INCLUDE_DIR) - +@@ -587,31 +577,19 @@ MARK_AS_ADVANCED(CLEAR LZ4_LIBRARY) + # Find Zstd + # + IF(ENABLE_ZSTD) +- IF (ZSTD_INCLUDE_DIR) +- # Already in cache, be silent +- SET(ZSTD_FIND_QUIETLY TRUE) +- ENDIF (ZSTD_INCLUDE_DIR) +- - FIND_PATH(ZSTD_INCLUDE_DIR zstd.h) - FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd) - INCLUDE(FindPackageHandleStandardArgs) @@ -70,59 +60,46 @@ index 39b5333..8164d8f 100644 SET(ZSTD_FOUND FALSE) # Override cached value ENDIF(ENABLE_ZSTD) -IF(ZSTD_FOUND) -+IF(zstd_FOUND) - SET(HAVE_ZSTD_H 1) +- SET(HAVE_ZSTD_H 1) - INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR}) - LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY}) - CMAKE_PUSH_CHECK_STATE() - SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY}) - SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR}) -- CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_LIBZSTD) +- CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD) +- CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_LIBZSTD_COMPRESSOR) - # - # TODO: test for static library. - # - CMAKE_POP_CHECK_STATE() ++IF(zstd_FOUND) + SET(HAVE_LIBZSTD 1) + IF(TARGET zstd::libzstd_shared) -+ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_shared) -+ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_shared) ++ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_shared) ++ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_shared) + ELSE(TARGET zstd::libzstd_shared) -+ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_static) -+ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_static) ++ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_static) ++ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_static) + ENDIF(TARGET zstd::libzstd_shared) ENDIF(ZSTD_FOUND) MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR) MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY) -@@ -773,11 +742,11 @@ ENDIF(ENABLE_NETTLE) - # (Except on Mac, where OpenSSL is deprecated.) - # - IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") -- FIND_PACKAGE(OpenSSL) -- IF(OPENSSL_FOUND) -+ FIND_PACKAGE(OpenSSL REQUIRED) -+ IF(OpenSSL_FOUND) +@@ -783,8 +761,7 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + FIND_PACKAGE(OpenSSL) + IF(OPENSSL_FOUND) SET(HAVE_LIBCRYPTO 1) - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) - LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_CRYPTO_LIBRARY}) + LIST(APPEND ADDITIONAL_LIBS OpenSSL::Crypto) -+ message("OPENSSL_CRYPTO_LIBRARY: OpenSSL::Crypto") ENDIF(OPENSSL_FOUND) ELSE() SET(OPENSSL_FOUND FALSE) # Override cached value -@@ -896,7 +865,6 @@ main(int argc, char **argv) +@@ -903,7 +880,7 @@ main(int argc, char **argv) IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) - LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) ++ #LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM}) -@@ -1128,7 +1096,7 @@ ENDIF(ENABLE_ICONV) - # Find Libxml2 - # - IF(ENABLE_LIBXML2) -- FIND_PACKAGE(LibXml2) -+ FIND_PACKAGE(LibXml2 REQUIRED) - ELSE() - SET(LIBXML2_FOUND FALSE) - ENDIF() diff --git a/ports/libarchive/pkgconfig-modules.patch b/ports/libarchive/pkgconfig-modules.patch index 72ad81394e3024..266c094198ed95 100644 --- a/ports/libarchive/pkgconfig-modules.patch +++ b/ports/libarchive/pkgconfig-modules.patch @@ -91,8 +91,8 @@ index 7b6f0ad..18cf15c 100644 INCLUDE_DIRECTORIES(${NETTLE_INCLUDE_DIR}) LIST(APPEND CMAKE_REQUIRED_INCLUDES ${NETTLE_INCLUDE_DIR}) -@@ -753,6 +765,11 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") - IF(OpenSSL_FOUND) +@@ -753,5 +765,10 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + IF(OPENSSL_FOUND) SET(HAVE_LIBCRYPTO 1) LIST(APPEND ADDITIONAL_LIBS OpenSSL::Crypto) + IF(WIN32 AND NOT MINGW) @@ -100,7 +100,6 @@ index 7b6f0ad..18cf15c 100644 + ELSE() + STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libcrypto") + ENDIF() - message("OPENSSL_CRYPTO_LIBRARY: OpenSSL::Crypto") ENDIF(OPENSSL_FOUND) ELSE() @@ -767,6 +780,7 @@ IF(NOT OPENSSL_FOUND) @@ -111,10 +110,11 @@ index 7b6f0ad..18cf15c 100644 CMAKE_POP_CHECK_STATE() # Restore the state of the variables ENDIF(LIBMD_FOUND) ENDIF(NOT OPENSSL_FOUND) -@@ -872,6 +886,11 @@ main(int argc, char **argv) +@@ -872,7 +886,12 @@ main(int argc, char **argv) IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) + #LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) + IF(WIN32 AND NOT MINGW) + LIST(APPEND LIBARCHIVE_LIBS_PRIVATE "libssl") + ELSE() diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 5685a345b2acd3..5e82bfd8adccc8 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -1,25 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libarchive/libarchive - REF 1b2c437b99b361c7692538fa373e99955e9b93ae #v3.5.2 - SHA512 df527dd333b01ed85f07831ba0bd4b1d0b5384fe12cfa53474ad39c04509105a3c8574a2d21a430e3584a931c8f6ae923bca95df83945f0c593c1ffaed3f62da + REF 6c3301111caa75c76e1b2acb1afb2d71341932ef #v3.6.1 + SHA512 2fd56ac20e4249807174a2ae29de1cbca55c8f8f247500845f56fd1fd9ebf48c17b8a25a93156df71df9526c0061415ec7d72a6b46bbaca776047e381a2321a7 HEAD_REF master PATCHES disable-warnings.patch fix-buildsystem.patch fix-cpu-set.patch - fix-dependencies.patch + fix-deps.patch pkgconfig-modules.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES bzip2 ENABLE_BZip2 + bzip2 CMAKE_REQUIRE_FIND_PACKAGE_BZip2 libxml2 ENABLE_LIBXML2 + libxml2 CMAKE_REQUIRE_FIND_PACKAGE_LibXml2 lz4 ENABLE_LZ4 + lz4 CMAKE_REQUIRE_FIND_PACKAGE_lz4 lzma ENABLE_LZMA + lzma CMAKE_REQUIRE_FIND_PACKAGE_LibLZMA lzo ENABLE_LZO openssl ENABLE_OPENSSL + openssl CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL zstd ENABLE_ZSTD ) diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json index 0a0eb02d5b5e7b..cbfd80814a4b20 100644 --- a/ports/libarchive/vcpkg.json +++ b/ports/libarchive/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libarchive", - "version-semver": "3.5.2", - "port-version": 5, + "version": "3.6.1", "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index f1238b360615f5..c2fc8e8e93656e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3405,8 +3405,8 @@ "port-version": 4 }, "libarchive": { - "baseline": "3.5.2", - "port-version": 5 + "baseline": "3.6.1", + "port-version": 0 }, "libass": { "baseline": "0.15.2", diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json index a66f04ef51d9e0..ad02625e712af6 100644 --- a/versions/l-/libarchive.json +++ b/versions/l-/libarchive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84b70980f3d82a88b9f8628261efeefd4869755e", + "version": "3.6.1", + "port-version": 0 + }, { "git-tree": "aeb6f06729d407abcf56fa92b2fcff01c031035b", "version-semver": "3.5.2", From b34ae2aff5f934e7f579ee7295dedc66f04abd35 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Wed, 18 May 2022 15:57:56 +0900 Subject: [PATCH 279/383] [tensorpipe] update to latest (#23569) * [tensorpipe] version update * update patch files * support find_package for https://github.com/microsoft/vcpkg/pull/17199 * [tensorpipe] update versions JSON * [tensorpipe] use mainstream PR * rename existing patch files * update versions JSON * [tensorpipe] update license * [tensorpipe] fix patch's SHA512 value * Add cuda-nvml-dev-11-6 to VMs. Co-authored-by: Billy Robert O'Neal III --- ports/tensorpipe/fix-cmakelists.patch | 71 ------------------------- ports/tensorpipe/portfile.cmake | 27 ++++++---- ports/tensorpipe/support-pybind11.patch | 30 ----------- ports/tensorpipe/support-test.patch | 46 ++++++++-------- ports/tensorpipe/use-vcpkg.patch | 48 +++++++++++++++++ ports/tensorpipe/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/t-/tensorpipe.json | 5 ++ 8 files changed, 98 insertions(+), 137 deletions(-) delete mode 100644 ports/tensorpipe/fix-cmakelists.patch delete mode 100644 ports/tensorpipe/support-pybind11.patch create mode 100644 ports/tensorpipe/use-vcpkg.patch diff --git a/ports/tensorpipe/fix-cmakelists.patch b/ports/tensorpipe/fix-cmakelists.patch deleted file mode 100644 index 172ac1e671e727..00000000000000 --- a/ports/tensorpipe/fix-cmakelists.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 640054e..18de9ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,6 +23,6 @@ include(MiscCheck) - - add_subdirectory(tensorpipe) - --install(EXPORT TensorpipeTargets -- DESTINATION share/cmake/Tensorpipe -- FILE TensorpipeTargets.cmake) -+install(EXPORT tensorpipeTargets -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME} # share/tensorpipe -+ FILE tensorpipeTargets.cmake) -diff --git a/tensorpipe/CMakeLists.txt b/tensorpipe/CMakeLists.txt -index d8624b4..dce5c6f 100644 ---- a/tensorpipe/CMakeLists.txt -+++ b/tensorpipe/CMakeLists.txt -@@ -168,8 +168,9 @@ set(TP_PUBLIC_HEADERS ${TP_PUBLIC_HEADERS} - transport/uv/error.h - transport/uv/factory.h - transport/uv/utility.h) --find_package(uv REQUIRED) --target_link_libraries(tensorpipe PRIVATE uv::uv) -+# `libuv` in vcpkg -+find_package(unofficial-libuv CONFIG REQUIRED) -+target_link_libraries(tensorpipe PUBLIC unofficial::libuv::libuv ${CMAKE_DL_LIBS}) - - ### shm - -@@ -233,11 +234,14 @@ configure_file(config.h.in config.h) - - ## Libnop - --# We should keep libnop headers private as they should not be exposed to downstream users, --# but they're currently transitively included by tensorpipe/transport/connection.h (which --# is still unclear whether it should be a public or private header). --target_include_directories(tensorpipe PUBLIC $) -- -+# `libnop` in vcpkg -+find_path(LIBNOP_INCLUDE_DIRS "nop/serializer.h") -+if(LIBNOP_INCLUDE_DIRS-NOTFOUND) -+ message(FATAL_ERROR "Failed to find header of the 'libnop' package from vcpkg.") -+else() -+ message(STATUS "Using 'libnop': ${LIBNOP_INCLUDE_DIRS}") -+endif() -+target_include_directories(tensorpipe PUBLIC $) - - ## Python bindings - -@@ -262,10 +266,17 @@ endif() - - ## Install - -+install(DIRECTORY channel common core transport util -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tensorpipe -+ FILES_MATCHING PATTERN "*.h") -+install(FILES tensorpipe.h -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tensorpipe) -+ - install(TARGETS tensorpipe -- EXPORT TensorpipeTargets -- LIBRARY DESTINATION ${TP_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${TP_INSTALL_LIBDIR}) -+ EXPORT tensorpipeTargets -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - foreach(_header_file ${TP_PUBLIC_HEADERS}) - get_filename_component(_TP_HEADER_SUBDIR "${_header_file}" DIRECTORY) diff --git a/ports/tensorpipe/portfile.cmake b/ports/tensorpipe/portfile.cmake index b81a37c89117b7..5598679b6acfbc 100644 --- a/ports/tensorpipe/portfile.cmake +++ b/ports/tensorpipe/portfile.cmake @@ -1,14 +1,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_download_distfile(INSTALL_PACKAGE_CONFIG_PATCH + URLS "https://patch-diff.githubusercontent.com/raw/pytorch/tensorpipe/pull/435.diff" + FILENAME tensorpipe-pr-435.patch + SHA512 7bcf604a967da36b8af936f8b8ab87b442834024b0b2cb886811c15e80893be842fbee2667bbbc39886814ec9b2f4ed0c2527de51fdb7dc293b25cce515f5e4b +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/tensorpipe - REF c5a21994bc766659f7f85edb75478e13f429f46c - SHA512 05a3989286610edea2f0fcfb9197c563e947f0386f2b52110dd060053d68b62477fcd4778a45a3030b9a53b6ceccead91e4dd96c9f0153023e97414459fbd8dd + REF 52791a2fd214b2a9dc5759d36725909c1daa7f2e + SHA512 1e5faf17a7236c5506c08cb28be16069b11bb929bbca64ed9745ce4277d46739186ab7d6597da7437d90ed2d166d4c37ef2f3bceabe8083ef3adbb0e8e5f227e PATCHES - fix-cmakelists.patch + "${INSTALL_PACKAGE_CONFIG_PATCH}" + use-vcpkg.patch support-test.patch - support-pybind11.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -25,7 +31,7 @@ if("pybind11" IN_LIST FEATURES) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DTP_ENABLE_SHM=${VCPKG_TARGET_IS_LINUX} @@ -33,12 +39,15 @@ vcpkg_cmake_configure( -DTP_ENABLE_CMA=OFF -DTP_BUILD_LIBUV=OFF # will use libuv package -DTP_ENABLE_CUDA_GDR=OFF + MAYBE_UNUSED_VARIABLES + TP_ENABLE_CUDA_GDR + TP_ENABLE_CUDA_IPC ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/Tensorpipe") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) diff --git a/ports/tensorpipe/support-pybind11.patch b/ports/tensorpipe/support-pybind11.patch deleted file mode 100644 index 7a87cd285f4adc..00000000000000 --- a/ports/tensorpipe/support-pybind11.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt -index 41958dd..02562b4 100644 ---- a/tensorpipe/python/CMakeLists.txt -+++ b/tensorpipe/python/CMakeLists.txt -@@ -4,13 +4,17 @@ - # This source code is licensed under the BSD-style license found in the - # LICENSE file in the root directory of this source tree. - --if(NOT (COMMAND pybind11_add_module)) -- add_subdirectory( -- ${PROJECT_SOURCE_DIR}/third_party/pybind11 -- ${PROJECT_BINARY_DIR}/third_party/pybind11 -- EXCLUDE_FROM_ALL) --endif() -+find_package(pybind11 CONFIG REQUIRED) - --set(PYBIND11_CPP_STANDARD -std=c++14) - pybind11_add_module(pytensorpipe tensorpipe.cc) --target_link_libraries(pytensorpipe PRIVATE tensorpipe) -+set_target_properties(pytensorpipe -+PROPERTIES -+ CXX_STANDARD 14 -+) -+target_link_libraries(pytensorpipe PRIVATE tensorpipe pybind11::module) -+ -+install(TARGETS pytensorpipe -+ EXPORT tensorpipeTargets -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/ports/tensorpipe/support-test.patch b/ports/tensorpipe/support-test.patch index 16c54ab37dee05..af128048582cc2 100644 --- a/ports/tensorpipe/support-test.patch +++ b/ports/tensorpipe/support-test.patch @@ -1,39 +1,39 @@ diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt -index c0320aa..1414bdd 100644 +index 53e8643..c49ada6 100644 --- a/tensorpipe/test/CMakeLists.txt +++ b/tensorpipe/test/CMakeLists.txt -@@ -86,11 +86,8 @@ if(TP_USE_CUDA) - endif() - - --add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest -- ${PROJECT_BINARY_DIR}/third_party/googletest) -+find_package(GTest CONFIG REQUIRED) - - target_link_libraries(tensorpipe_test PRIVATE - tensorpipe -- uv::uv -- gmock -- gtest_main) -+ unofficial::libuv::libuv GTest::gmock GTest::gtest_main) - -diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt -index fecc731..031e40d 100644 ---- a/tensorpipe/test/CMakeLists.txt -+++ b/tensorpipe/test/CMakeLists.txt -@@ -80,10 +80,11 @@ if(TP_USE_CUDA) +@@ -93,25 +93,24 @@ if(TP_USE_CUDA) channel/cuda_ipc/cuda_ipc_test.cc ) endif() - -- target_sources(tensorpipe_test PRIVATE +- list(APPEND TP_TEST_SRCS - channel/cuda_gdr/cuda_gdr_test.cc - ) +- + if(TP_ENABLE_CUDA_GDR) -+ target_sources(tensorpipe_test PRIVATE ++ list(APPEND TP_TEST_SRCS + channel/cuda_gdr/cuda_gdr_test.cc + ) + endif() + cuda_add_library(tensorpipe_cuda_kernel channel/kernel.cu) + list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe_cuda_kernel) + + list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe_cuda) endif() +-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest +- ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL) ++find_package(GTest CONFIG REQUIRED) + + list(APPEND TP_TEST_LINK_LIBRARIES + tensorpipe +- uv::uv +- gmock +- gtest_main) ++ unofficial::libuv::libuv ++ GTest::gmock ++ GTest::gtest_main) + + add_executable(tensorpipe_test ${TP_TEST_SRCS}) diff --git a/ports/tensorpipe/use-vcpkg.patch b/ports/tensorpipe/use-vcpkg.patch new file mode 100644 index 00000000000000..b08d2cb107d6ab --- /dev/null +++ b/ports/tensorpipe/use-vcpkg.patch @@ -0,0 +1,48 @@ +diff --git a/tensorpipe/CMakeLists.txt b/tensorpipe/CMakeLists.txt +index efcffc2..e167fae 100644 +--- a/tensorpipe/CMakeLists.txt ++++ b/tensorpipe/CMakeLists.txt +@@ -119,8 +119,8 @@ list(APPEND TP_PUBLIC_HDRS + transport/uv/utility.h) + + # Add uv package +-find_package(uv REQUIRED) +-list(APPEND TP_LINK_LIBRARIES uv::uv) ++find_package(unofficial-libuv CONFIG REQUIRED) ++list(APPEND TP_LINK_LIBRARIES unofficial::libuv::libuv) + + ### shm + +@@ -184,7 +184,8 @@ configure_file(config.h.in config.h) + # We should keep libnop headers private as they should not be exposed to downstream users, + # but they're currently transitively included by tensorpipe/transport/connection.h (which + # is still unclear whether it should be a public or private header). +-list(APPEND TP_INCLUDE_DIRS $) ++find_path(LIBNOP_INCLUDE_DIRS "nop/serializer.h" REQUIRED) ++list(APPEND TP_INCLUDE_DIRS $) + + + ## Target +diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt +index b722381..688886a 100644 +--- a/tensorpipe/python/CMakeLists.txt ++++ b/tensorpipe/python/CMakeLists.txt +@@ -4,16 +4,11 @@ + # This source code is licensed under the BSD-style license found in the + # LICENSE file in the root directory of this source tree. + +-if(NOT (COMMAND pybind11_add_module)) +- add_subdirectory( +- ${PROJECT_SOURCE_DIR}/third_party/pybind11 +- ${PROJECT_BINARY_DIR}/third_party/pybind11 +- EXCLUDE_FROM_ALL) +-endif() ++find_package(pybind11 CONFIG REQUIRED) + + set(PYBIND11_CPP_STANDARD -std=c++14) + pybind11_add_module(pytensorpipe tensorpipe.cc) +-target_link_libraries(pytensorpipe PRIVATE tensorpipe) ++target_link_libraries(pytensorpipe PRIVATE tensorpipe pybind11::module) + + install(TARGETS pytensorpipe + EXPORT TensorpipeTargets diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json index 3ddcb1d5a2b1fa..ac5f0d27122bbd 100644 --- a/ports/tensorpipe/vcpkg.json +++ b/ports/tensorpipe/vcpkg.json @@ -1,9 +1,9 @@ { "name": "tensorpipe", - "version-date": "2021-04-26", - "port-version": 1, + "version-date": "2022-03-16", "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", + "license": "BSD-3-Clause", "supports": "linux | osx", "dependencies": [ "libnop", diff --git a/versions/baseline.json b/versions/baseline.json index c2fc8e8e93656e..0f12a07ff5926f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6921,8 +6921,8 @@ "port-version": 2 }, "tensorpipe": { - "baseline": "2021-04-26", - "port-version": 1 + "baseline": "2022-03-16", + "port-version": 0 }, "termcolor": { "baseline": "2.1.0", diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index 7ecdfe6e700d19..0dd256c6db6587 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f78594bb71084f0ea1b9e0bba9b9804696e4c011", + "version-date": "2022-03-16", + "port-version": 0 + }, { "git-tree": "fc442cfbc144a4fc95ca41d9349ef04564d7ce5a", "version-date": "2021-04-26", From 6dbfaba0393e851fcef2a90ed33fcdac8074d241 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Wed, 18 May 2022 14:58:42 +0800 Subject: [PATCH 280/383] [cpp-ipc] Update to v1.2.0 (#24769) * [teemo] Update to v2.7 * [teemo] Format manifest * [teemo] Update to v2.7 * [akali] Update to v1.43 * [akali] Update to v1.43 * [akali] Update to v1.43 * overwrite version * add license * overwrite version * [akali] Update string replace method. * [akali] run x-add-version command. * [cpp-ipc] Update to v1.2.0 * [cpp-ipc] Update to v1.2.0 Co-authored-by: FrankXie Co-authored-by: admin --- ports/cpp-ipc/portfile.cmake | 4 ++-- ports/cpp-ipc/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/cpp-ipc.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/cpp-ipc/portfile.cmake b/ports/cpp-ipc/portfile.cmake index d48a25f7d58666..6dfacba15a54aa 100644 --- a/ports/cpp-ipc/portfile.cmake +++ b/ports/cpp-ipc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mutouyun/cpp-ipc - REF a5722957b25a2a429e4e893c427ecd278f2eb0fe #v1.0.1 - SHA512 e5eb7dbec8a3932db78f658422dfe32d377edf50ec594810765718896b32f61b4e6c02e29225cb103279e3313650e31e2b4241ac1adb538172af50fc75a6b0bb + REF f2f1af8f8e7877a28deb2eacdc379a22a99e4c82 #v1.2.0 + SHA512 e01fe5e2612141af64a9c44773a49c566b89ecf0a77164c6eb0a6d68bd7ff5830843ce42df5d53a863882b582a8d6a2e9f69026f244d8d1d96e83f0f4c9e8972 HEAD_REF master ) diff --git a/ports/cpp-ipc/vcpkg.json b/ports/cpp-ipc/vcpkg.json index 0be5856372b452..62e2bb49f1e1a9 100644 --- a/ports/cpp-ipc/vcpkg.json +++ b/ports/cpp-ipc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cpp-ipc", - "version": "1.0.1", - "port-version": 1, + "version": "1.2.0", "description": "C++ IPC Library: A high-performance inter-process communication using shared memory on Linux/Windows.", "homepage": "https://github.com/mutouyun/cpp-ipc", "supports": "!osx", diff --git a/versions/baseline.json b/versions/baseline.json index 0f12a07ff5926f..939465838373ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1565,8 +1565,8 @@ "port-version": 0 }, "cpp-ipc": { - "baseline": "1.0.1", - "port-version": 1 + "baseline": "1.2.0", + "port-version": 0 }, "cpp-jwt": { "baseline": "2021-10-18", diff --git a/versions/c-/cpp-ipc.json b/versions/c-/cpp-ipc.json index edac286d38c971..53f75c34f86f97 100644 --- a/versions/c-/cpp-ipc.json +++ b/versions/c-/cpp-ipc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e86c1547d0be3d2acbe7cebdb799f24359c29e85", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "86a57c4fce501c6a9bcde5728ea6787b7425176a", "version": "1.0.1", From c1b768b0d6bc9b05d6272d604496d33a3faedd90 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 18 May 2022 02:26:19 -0700 Subject: [PATCH 281/383] Add vcpkg_from_*** and ${PORT} usage improvements to the `vcpkg create` templates. (#24763) * Add vcpkg_from_*** and ${PORT} usage improvements to the `vcpkg create` templates. * Also add some more quotes. * Back out quotes to vcpkg_cmake_config_fixup as suggested by @JackBoosY --- scripts/templates/portfile.in.cmake | 12 +++++++++--- scripts/templates/vcpkg.json.in | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 3ceac93d11fa7b..a997cd22cc9ce6 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -29,6 +29,12 @@ # # See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md +# Also consider vcpkg_from_* functions if you can; the generated code here is for any web accessable +# source archive. +# vcpkg_from_github +# vcpkg_from_gitlab +# vcpkg_from_bitbucket +# vcpkg_from_sourceforge vcpkg_download_distfile(ARCHIVE URLS "@URL@" FILENAME "@FILENAME@" @@ -37,7 +43,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag). # REF 1.0.0 # (Optional) Read the docs for how to generate patches at: @@ -74,5 +80,5 @@ vcpkg_cmake_install() #} # vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/@PORT@) -# # Handle copyright -# file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/@PORT@" RENAME copyright) +# Uncomment the line below if necessary to install the license file for the port to share/${PORT}/copyright +# file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/scripts/templates/vcpkg.json.in b/scripts/templates/vcpkg.json.in index 15fcaa1677f423..81004e8eeb4302 100644 --- a/scripts/templates/vcpkg.json.in +++ b/scripts/templates/vcpkg.json.in @@ -1,6 +1,6 @@ { "name": "@PORT@", - "version-string": "", + "version": "", "homepage": "", "description": "", "dependencies": [ From f594be6a5b37efde2b25557953dff87050bbc33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 18 May 2022 11:27:58 +0200 Subject: [PATCH 282/383] [catch2] Update to 3.0.1 (#24762) * [catch2] Update to 3.0.1 * [catch2] Update version files * [catch2] Move catch2main.lib to the manual-link folder * [catch2] Update version files * [catch2] Fix catch2main library path on every platform * [catch2] Update version files --- ports/catch2/fix-install-path.patch | 37 ++++++++++++++++++++--------- ports/catch2/portfile.cmake | 30 +++++++---------------- ports/catch2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/catch2.json | 5 ++++ 5 files changed, 43 insertions(+), 36 deletions(-) diff --git a/ports/catch2/fix-install-path.patch b/ports/catch2/fix-install-path.patch index c60e74b93d9937..fc90c57cc656af 100644 --- a/ports/catch2/fix-install-path.patch +++ b/ports/catch2/fix-install-path.patch @@ -1,17 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0370ea3..7cef01a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -146,7 +146,7 @@ if (NOT_SUBPROJECT) - EXPORT - Catch2Targets - DESTINATION -- ${CMAKE_INSTALL_LIBDIR} -+ ${CMAKE_INSTALL_LIBDIR}/manual-link - ) - - -@@ -226,7 +226,7 @@ if (NOT_SUBPROJECT) +@@ -168,7 +168,7 @@ ## Provide some pkg-config integration set(PKGCONFIG_INSTALL_DIR @@ -20,3 +10,28 @@ index 0370ea3..7cef01a 100644 CACHE PATH "Path where catch2.pc is installed" ) configure_file( +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -335,12 +335,20 @@ + install( + TARGETS + Catch2 +- Catch2WithMain + EXPORT + Catch2Targets + DESTINATION + ${CMAKE_INSTALL_LIBDIR} + ) ++ ++ install( ++ TARGETS ++ Catch2WithMain ++ EXPORT ++ Catch2Targets ++ DESTINATION ++ ${CMAKE_INSTALL_LIBDIR}/manual-link ++ ) + + + install( diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 6e32b3877d1895..d1ccc44315c337 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -1,43 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF 62fd660583d3ae7a7886930b413c3c570e89786c # v2.13.9 - SHA512 70805a37183917bc1534899dec828f786bc5e60c5742364b700b02d4965aba6ac7d03d98218275c07854f963bf80bdf3f0f26f3c90d12882520b078638d5c703 + REF v3.0.1 + SHA512 065094c19cdf98b40f96a390e887542f895495562a91cdc28d68ce03690866d846ec87d320405312a2b97eacaa5351d3e55f0012bb9de40073c8d4444d82b0a1 HEAD_REF devel - PATCHES + PATCHES fix-install-path.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_TESTING=OFF - -DCATCH_BUILD_EXAMPLES=OFF -DCATCH_INSTALL_DOCS=OFF - -DCATCH_BUILD_STATIC_LIBRARY=${BUILD_STATIC} + -DCATCH_INSTALL_EXTRAS=OFF ) vcpkg_cmake_install() -if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2_") - file(RENAME "${CURRENT_PACKAGES_DIR}/share/catch2_" "${CURRENT_PACKAGES_DIR}/share/catch2") -endif() -if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2_") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") -endif() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Catch2") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/catch2/catch.hpp") - message(FATAL_ERROR "Main includes have moved. Please update the forwarder.") -endif() +# We remove these folders because they are empty and cause warnings on the library installation +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/catch2/benchmark/internal") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/catch2/generators/internal") -file(WRITE "${CURRENT_PACKAGES_DIR}/include/catch.hpp" "#include ") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/catch.hpp" "#include ") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index cae923ef38bfc1..8a40b424e36acb 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "catch2", - "version-semver": "2.13.9", - "port-version": 1, + "version-semver": "3.0.1", "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 939465838373ea..aa959c4adf8b6a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1273,8 +1273,8 @@ "port-version": 1 }, "catch2": { - "baseline": "2.13.9", - "port-version": 1 + "baseline": "3.0.1", + "port-version": 0 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index a7869358e949ce..5ec8e97a0e6457 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0c872e7175f3ca20a15f5c8cc0d0c23e59e1ad1", + "version-semver": "3.0.1", + "port-version": 0 + }, { "git-tree": "ed81e9ef2d6ef2020605ec6ba1092a2ab631305a", "version-semver": "2.13.9", From bbb668080287c62f1320435405b4e4cb55c35e5c Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 18 May 2022 17:28:28 +0800 Subject: [PATCH 283/383] [ftgl] Update to the latest commit (#24770) * [ftgl] Update to the latest commit * update version --- ports/ftgl/Fix-headersFilePath.patch | 23 ----------------------- ports/ftgl/portfile.cmake | 5 ++--- ports/ftgl/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/f-/ftgl.json | 5 +++++ 5 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 ports/ftgl/Fix-headersFilePath.patch diff --git a/ports/ftgl/Fix-headersFilePath.patch b/ports/ftgl/Fix-headersFilePath.patch deleted file mode 100644 index f3459352a3885f..00000000000000 --- a/ports/ftgl/Fix-headersFilePath.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 693e49f..c47ff3c 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,9 +1,5 @@ -- -- -- - INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cmake) - -- - ADD_DEFINITIONS(-DPACKAGE_VERSION="${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}") - - IF(WIN32) -@@ -26,7 +22,7 @@ SET(libftgl_la_SOURCES - FTGlyphContainer.h - FTInternals.h - FTLibrary.cpp -- FTLibrary.h -+ FTGL/FTLibrary.h - FTList.h - FTPoint.cpp - FTSize.cpp diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake index 0c98215fa242d0..2d410030726b70 100644 --- a/ports/ftgl/portfile.cmake +++ b/ports/ftgl/portfile.cmake @@ -6,11 +6,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO frankheckenbach/ftgl - REF 483639219095ad080538e07ceb5996de901d4e74 - SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f + REF 36e8cd683492456def3b6a54c6dcb56cd6ee4bb4 #commmit-data 2022-05-18 + SHA512 b357cf18890664d437f41d7bf18f39c894743e76e2e0b2296254b27e5675866956473e7b78139d0e6cdd7e8310bf8d2943ba0ddeea494ee67857d6083c490dc2 HEAD_REF master PATCHES - Fix-headersFilePath.patch 01_disable_doxygen.patch 02_enable-cpp11-std.patch ) diff --git a/ports/ftgl/vcpkg.json b/ports/ftgl/vcpkg.json index d1f92b187439c7..326c2a681c410e 100644 --- a/ports/ftgl/vcpkg.json +++ b/ports/ftgl/vcpkg.json @@ -1,13 +1,13 @@ { "name": "ftgl", - "version-string": "2.4.0", - "port-version": 4, + "version-date": "2022-05-18", "description": [ "FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.", "Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.", "FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering." ], "homepage": "https://github.com/frankheckenbach/ftgl", + "license": "MIT", "dependencies": [ "freetype", "opengl", diff --git a/versions/baseline.json b/versions/baseline.json index aa959c4adf8b6a..c782183845dd5e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2369,8 +2369,8 @@ "port-version": 1 }, "ftgl": { - "baseline": "2.4.0", - "port-version": 4 + "baseline": "2022-05-18", + "port-version": 0 }, "ftxui": { "baseline": "2.0.0", diff --git a/versions/f-/ftgl.json b/versions/f-/ftgl.json index 3a4533b9c05a49..2dd4e90f205833 100644 --- a/versions/f-/ftgl.json +++ b/versions/f-/ftgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f8871169a409d3eff23c83391564108912a6a97", + "version-date": "2022-05-18", + "port-version": 0 + }, { "git-tree": "5642730406fc248cae1eaefc9e739b9bf1c13fbf", "version-string": "2.4.0", From 70f8e23bfee8310e819f83948cc396a936f3cf54 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 18 May 2022 02:28:41 -0700 Subject: [PATCH 284/383] [direcxtmath] port updated for May 2022 release (#24771) * [directxmath] port updated for May 2022 release * update baseline --- ports/directxmath/portfile.cmake | 6 +++--- ports/directxmath/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/directxmath.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/directxmath/portfile.cmake b/ports/directxmath/portfile.cmake index f3f336669da183..ac48abe347f1b6 100644 --- a/ports/directxmath/portfile.cmake +++ b/ports/directxmath/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMath - REF jan2022 - SHA512 8defaa693c8b8aed05791c83b99fa73aac2fc18475b0d51337a81f7d9807b53e426fdf530ed6f1d2d0ebd259e87cc42ac881bdb168387d883998f58a5c0a4886 + REF may2022 + SHA512 685e5a0cdd1bc66a5df628f864eae0959d5d5abdcc7e9242ea7af1d5b011cb0705447c366bacd456db96e39dac8cf0e0618a6e055a7db821cdcfa20a1ad08868 HEAD_REF main ) @@ -11,7 +11,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmath/cmake) if(NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile( diff --git a/ports/directxmath/vcpkg.json b/ports/directxmath/vcpkg.json index e41e6c6c20fd1b..af66543c5e328d 100644 --- a/ports/directxmath/vcpkg.json +++ b/ports/directxmath/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmath", - "version-date": "2022-01-18", + "version-date": "2022-05-18", "description": "DirectXMath SIMD C++ math library", "homepage": "https://github.com/Microsoft/DirectXMath", "documentation": "https://docs.microsoft.com/windows/win32/dxmath/directxmath-portal", diff --git a/versions/baseline.json b/versions/baseline.json index c782183845dd5e..1def34fd59b2b4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1865,7 +1865,7 @@ "port-version": 0 }, "directxmath": { - "baseline": "2022-01-18", + "baseline": "2022-05-18", "port-version": 0 }, "directxmesh": { diff --git a/versions/d-/directxmath.json b/versions/d-/directxmath.json index 0bd805c40d8bf5..dff4c619a727e2 100644 --- a/versions/d-/directxmath.json +++ b/versions/d-/directxmath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "383135431007008f6d04e2cfbe55988b06054f15", + "version-date": "2022-05-18", + "port-version": 0 + }, { "git-tree": "ebf69755284c5ea16a26b4dbfa4534af962c96a0", "version-date": "2022-01-18", From ab555695dd9f19613d652d5de04136d41988baa5 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 18 May 2022 17:29:06 +0800 Subject: [PATCH 285/383] [uvw] update to <2.12.1> (#24772) * [uvw] update to <2.12.1> * update version * overwrite version * No absolute path * update version --- ports/uvw/portfile.cmake | 23 +++++++++++------------ ports/uvw/vcpkg.json | 14 +++++++++++--- versions/baseline.json | 4 ++-- versions/u-/uvw.json | 5 +++++ 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ports/uvw/portfile.cmake b/ports/uvw/portfile.cmake index a6eb493e79f073..21145e6f9f1d25 100644 --- a/ports/uvw/portfile.cmake +++ b/ports/uvw/portfile.cmake @@ -2,22 +2,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/uvw - REF 77af4a3fc4d932a52652807506fc50d0e58e875c # v2.7.0_libuv_v1.39 - SHA512 b9ee4a60928fbcea84a9c551ce4d97095db68352546054116ecc8303eaeb46aecaef15ca2e5d3ebd14d8292be798fdea50b353ffdc727faa43c23cfd314ea407 + REF 3db9e8f75a4351325e1ea00e17586af2b00cf1ea # v2.12.1_libuv_v1.44 + SHA512 35e799fe877abc26ae44d20c9b5b292497d1468d9f89c0fc19b96a0b0712e35084480100e2fe7324353e2c3805c2f018e89192357d974bfd009af9b58bfcb7ec ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw/) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/uvw/") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright/readme/package files -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/uvw/vcpkg.json b/ports/uvw/vcpkg.json index bd896d781bd00d..ba7b4673dc3dc0 100644 --- a/ports/uvw/vcpkg.json +++ b/ports/uvw/vcpkg.json @@ -1,10 +1,18 @@ { "name": "uvw", - "version-string": "2.7.0", - "port-version": 1, + "version": "2.12.1", "description": "Header-only, event based, tiny and easy to use libuv wrapper in modern C++.", "homepage": "https://github.com/skypjack/uvw", + "license": "MIT", "dependencies": [ - "libuv" + "libuv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1def34fd59b2b4..3892564fb92836 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7293,8 +7293,8 @@ "port-version": 0 }, "uvw": { - "baseline": "2.7.0", - "port-version": 1 + "baseline": "2.12.1", + "port-version": 0 }, "uwebsockets": { "baseline": "20.11.0", diff --git a/versions/u-/uvw.json b/versions/u-/uvw.json index 95a51f9014739f..4d3cc82eb89a74 100644 --- a/versions/u-/uvw.json +++ b/versions/u-/uvw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eac81a2d74241ded58a1c503d91f226f86ca09c6", + "version": "2.12.1", + "port-version": 0 + }, { "git-tree": "fc9230cd12ff7d556e700053798f20e07283954d", "version-string": "2.7.0", From 261ca0dd4d458f9ea58fc7096b1eb1a68c47cfc8 Mon Sep 17 00:00:00 2001 From: Dimitrij Mijoski Date: Wed, 18 May 2022 11:30:36 +0200 Subject: [PATCH 286/383] Fix builing nuspell[tools] on Mingw (#24715) * Fix builing nuspell[tools] on Mingw * x-add-version * metadata * x-add-version --- ports/getopt-win32/vcpkg.json | 6 +++--- ports/getopt/vcpkg.json | 4 ++-- ports/nuspell/fix-tools.patch | 6 +++--- ports/nuspell/vcpkg.json | 2 +- versions/baseline.json | 6 +++--- versions/g-/getopt-win32.json | 5 +++++ versions/g-/getopt.json | 5 +++++ versions/n-/nuspell.json | 5 +++++ 8 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ports/getopt-win32/vcpkg.json b/ports/getopt-win32/vcpkg.json index a53db8ae79c8df..6586fe6f57c6c3 100644 --- a/ports/getopt-win32/vcpkg.json +++ b/ports/getopt-win32/vcpkg.json @@ -1,9 +1,9 @@ { "name": "getopt-win32", - "version-string": "0.1", - "port-version": 2, + "version": "0.1", + "port-version": 3, "description": "An implementation of getopt.", "homepage": "https://github.com/libimobiledevice-win32", "license": "LGPL-3.0-only", - "supports": "windows" + "supports": "windows & !mingw" } diff --git a/ports/getopt/vcpkg.json b/ports/getopt/vcpkg.json index cd31a24416feb4..4626df7279809f 100644 --- a/ports/getopt/vcpkg.json +++ b/ports/getopt/vcpkg.json @@ -1,13 +1,13 @@ { "name": "getopt", "version-string": "0", - "port-version": 1, + "port-version": 2, "description": "The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options.", "supports": "!uwp", "dependencies": [ { "name": "getopt-win32", - "platform": "windows" + "platform": "windows & !mingw" } ] } diff --git a/ports/nuspell/fix-tools.patch b/ports/nuspell/fix-tools.patch index 1698c2f73f1113..18dc5c5281da89 100644 --- a/ports/nuspell/fix-tools.patch +++ b/ports/nuspell/fix-tools.patch @@ -14,16 +14,16 @@ index 7b54c54..7c6f3a3 100644 if (subproject) # if added as subproject just build Nuspell diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt -index 3e63610..9be98be 100644 +index 3e63610..7597a6d 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -3,6 +3,10 @@ set_target_properties(nuspell-exe PROPERTIES RUNTIME_OUTPUT_NAME nuspell) target_compile_definitions(nuspell-exe PRIVATE PROJECT_VERSION=\"${PROJECT_VERSION}\") target_link_libraries(nuspell-exe Nuspell::nuspell) -+if (WIN32) ++if (WIN32 AND NOT MINGW) + find_library(GETOPT_WIN32_LIBRARY getopt) -+ target_link_libraries(nuspell-exe Nuspell::nuspell ${GETOPT_WIN32_LIBRARY}) ++ target_link_libraries(nuspell-exe ${GETOPT_WIN32_LIBRARY}) +endif() if (BUILD_SHARED_LIBS AND WIN32) # This should be PRE_LINK (or PRE_BUILD), so Vcpkg's POST_BUILD diff --git a/ports/nuspell/vcpkg.json b/ports/nuspell/vcpkg.json index 969006fd41190a..9ae7f8eb62e719 100644 --- a/ports/nuspell/vcpkg.json +++ b/ports/nuspell/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nuspell", "version-semver": "5.1.0", - "port-version": 1, + "port-version": 2, "description": [ "Nuspell is a fast and safe spelling checker software program.", "It is designed for languages with rich morphology and complex word compounding.", diff --git a/versions/baseline.json b/versions/baseline.json index 3892564fb92836..a116bf09ac2ac6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2478,11 +2478,11 @@ }, "getopt": { "baseline": "0", - "port-version": 1 + "port-version": 2 }, "getopt-win32": { "baseline": "0.1", - "port-version": 2 + "port-version": 3 }, "gettext": { "baseline": "0.21", @@ -4934,7 +4934,7 @@ }, "nuspell": { "baseline": "5.1.0", - "port-version": 1 + "port-version": 2 }, "nvtt": { "baseline": "2.1.2", diff --git a/versions/g-/getopt-win32.json b/versions/g-/getopt-win32.json index 3f3316afbfabab..75092abe849b75 100644 --- a/versions/g-/getopt-win32.json +++ b/versions/g-/getopt-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97ccee735c01df1356a70d59bc114512f7ab77cc", + "version": "0.1", + "port-version": 3 + }, { "git-tree": "93d03f637c26f2efa154dfd7c3efb02074cf5eda", "version-string": "0.1", diff --git a/versions/g-/getopt.json b/versions/g-/getopt.json index 24d9652d4446a5..a0183d27f45163 100644 --- a/versions/g-/getopt.json +++ b/versions/g-/getopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be2552adc01c2ba30044325925f7348121de5c3d", + "version-string": "0", + "port-version": 2 + }, { "git-tree": "81815a8f433219e332659e07204f90df381a28a7", "version-string": "0", diff --git a/versions/n-/nuspell.json b/versions/n-/nuspell.json index 24322cbd2b33fb..bc160010fc40aa 100644 --- a/versions/n-/nuspell.json +++ b/versions/n-/nuspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5719acdfd3465a7bb3dfac85ce2821c56d7c652a", + "version-semver": "5.1.0", + "port-version": 2 + }, { "git-tree": "02475776fc8cc0332efe7e0ea8851872c911de32", "version-semver": "5.1.0", From 1e91cd37696e06a527b4899b5df9dba643ebeab6 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 18 May 2022 14:25:13 -0700 Subject: [PATCH 287/383] [docs] Remove out-of-date docs, improve header standardization. (#24456) * Remove out-of-date docs, improve header standardization. * PR scoping & comments --- .../examples/installing-and-using-packages.md | 2 ++ .../modify-baseline-to-pin-old-boost.md | 27 ++++++++++--------- docs/examples/versioning.getting-started.md | 8 +++--- docs/specifications/registries-2.md | 2 ++ docs/specifications/registries.md | 2 ++ docs/users/android.md | 5 +--- docs/users/config-environment.md | 4 +-- docs/users/mingw.md | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/examples/installing-and-using-packages.md b/docs/examples/installing-and-using-packages.md index d9511dbf1ba7a0..612d5bdbe05b29 100644 --- a/docs/examples/installing-and-using-packages.md +++ b/docs/examples/installing-and-using-packages.md @@ -1,5 +1,7 @@ ## Installing and Using Packages Example: SQLite +_Note: this old example uses Classic Mode, but most developers will be happier with Manifest Mode. See [Manifest Mode: CMake Example](manifest-mode-cmake.md) for an example of converting to Manifest Mode._ + - [Step 1: Install](#install) - [Step 2: Use](#use) - [VS/MSBuild Project (User-wide integration)](#msbuild) diff --git a/docs/examples/modify-baseline-to-pin-old-boost.md b/docs/examples/modify-baseline-to-pin-old-boost.md index 679f468a97d578..21d6f1a3ee06e1 100644 --- a/docs/examples/modify-baseline-to-pin-old-boost.md +++ b/docs/examples/modify-baseline-to-pin-old-boost.md @@ -1,12 +1,12 @@ # Pin old Boost versions -This document will teach you how to set versions of meta-packages like `boost` or `qt5`. +This document will teach you how to set versions of meta-packages like `boost` or `qt5`. -**What is a meta-package?** -In vcpkg we call meta-packages to ports that by themselves don't install anything but that instead forward installation to another port or ports. The reasons for these meta-packages to exist are plenty: to install different versions of a library depending on platform (like the old OpenSSL port did), to allow for multiple versions to exist in the vcpkg registry at the same time (OpenCV), or to conveniently install/uninstall a catalog of related packages (Boost and Qt). +**What is a meta-package?** +In vcpkg we call meta-packages to ports that by themselves don't install anything but that instead forward installation to another port or ports. The reasons for these meta-packages to exist are plenty: to install different versions of a library depending on platform or to conveniently install/uninstall a catalog of related packages (Boost and Qt). -In the case of Boost, it is unlikely that a user requires all of the 140+ Boost libraries in their project. For the sake of convenience, vcpkg splits Boost into multiple sub-packages broken down to individual libraries. By doing so, users can limit the subset of Boost libraries that they depend on. +In the case of Boost, it is unlikely that a user requires all of the 140+ Boost libraries in their project. For the sake of convenience, vcpkg splits Boost into multiple sub-packages broken down to individual libraries. By doing so, users can limit the subset of Boost libraries that they depend on. -If a user wants to install all of the Boost libraries available in vcpkg, they can do so by installing the `boost` meta-package. +If a user wants to install all of the Boost libraries available in vcpkg, they can do so by installing the `boost` meta-package. Due to the nature of meta-packages, some unexpected issues arise when trying to use them with versioning. If a user writes the following manifest file: @@ -17,7 +17,7 @@ Due to the nature of meta-packages, some unexpected issues arise when trying to "version": "1.0.0", "builtin-baseline": "787fe1418ea968913cc6daf11855ffd8b0b5e9d4", "dependencies": [ "boost-tuple" ], - "overrides": [ + "overrides": [ { "name": "boost", "version": "1.72.0" } ] } @@ -49,7 +49,7 @@ It is reasonable to expect that overriding `boost` to version 1.72.0 results in Below, we describe two methods to pin down Boost versions effectively. ## Method 1: Pin specific packages -Use `"overrides"` to force specific versions in a package-by-package basis. +Use `"overrides"` to force specific versions in a package-by-package basis. `vcpkg.json` ```json @@ -72,14 +72,15 @@ This method allows you to quickly set the specific versions you want, but you wi The second method makes it easy to pin the entire Boost collection and end up with a very simple manifest file. ## Method 2: Modify baseline -An easy way to set the version for the entirety of boost is to use the `"builtin-baseline"` property. +An easy way to set the version for the entirety of boost is to use the `"builtin-baseline"` property. -As of right now, it is only possible to go back to Boost version `1.75.0` using a baseline. Since that was the contemporary Boost version when the versioning feature was merged. **But, it is possible to modify the baseline to whatever you like and use that instead.** +As of right now, it is only possible to go back to Boost version `1.75.0` using a baseline, since that was the contemporary Boost version when the versioning feature was merged. **But, it is possible to modify the baseline to whatever you like and use that instead.** ### Step 1: Create a new branch -As described in the versioning documentation. The value that goes in `"builtin-baseline"` is a Git commit in the vcpkg repository's history. Then it stands to reason, that if you want to customize the baseline you should be able to create a new commit with said custom baseline. +As described in the versioning documentation. The value that goes in `"builtin-baseline"` is a git commit in the microsoft/vcpkg repository's history. If you want to customize the baseline and have control over the vcpkg instance, you can create a new commit with said custom baseline. + +Let's start by creating a new branch to hold our modified baseline. -Let's start by creating a new branch to hold our modified baseline. In the directory containing your clone of the vcpkg Git repository run: ``` @@ -91,7 +92,7 @@ This will create a new branch named `custom-boost-baseline` and check it out imm ### Step 2: Modify the baseline The next step is to modify the baseline file, open the file in your editor of choice and modify the entries for the Boost libraries. -Change the `"baseline"` version to your desired version. +Change the `"baseline"` version to your desired version. _NOTE: Remember to also set the port versions to 0 (or your desired version)._ `${vcpkg-root}/versions/baseline.json` @@ -126,7 +127,7 @@ _NOTE: Remember to also set the port versions to 0 (or your desired version)._ ... ``` -Some `boost-` packages are helpers used by vcpkg and are not part of Boost. For example, `"boost-uninstall"` is a vcpkg helper to conveniently uninstall all Boost libraries, but it didn't exist for Boost version `1.72.0`, in this case it is fine to leave it at `1.75.0` to avoid baseline errors (since all versions in `baseline.json` must have existed). +Some `boost-` packages are helpers used by vcpkg and are not part of Boost. For example, `"boost-uninstall"` is a vcpkg helper to conveniently uninstall all Boost libraries, but it didn't exist for Boost version `1.72.0`, in this case it is fine to leave it at `1.75.0` to avoid baseline errors (since all versions in `baseline.json` must have existed). ### Step 3: Commit your changes After saving your modified file, run these commands to commit your changes: diff --git a/docs/examples/versioning.getting-started.md b/docs/examples/versioning.getting-started.md index c55cf7c1c76539..3ff87f5b3fe14e 100644 --- a/docs/examples/versioning.getting-started.md +++ b/docs/examples/versioning.getting-started.md @@ -6,8 +6,6 @@ Vcpkg lets you take control of which version of packages to install in your proj ## Using versions with manifests -With the `versions` feature flag enabled you can start adding version constraints to your dependencies. - Let's start with creating a simple CMake project that depends on `fmt` and `zlib`. Create a folder with the following files: @@ -97,7 +95,7 @@ fmt[core]:x86-windows -> 7.1.3#1 -- D:\vcpkg\buildtrees\versioning\versions\fmt\ zlib[core]:x86-windows -> 1.2.11#9 -- D:\vcpkg\buildtrees\versioning\versions\zlib\827111046e37c98153d9d82bb6fa4183b6d728e4 ``` -Instead of using the portfiles in `ports/`, vcpkg is checking out the files for each version in `buildtrees/versioning/versions/`. The files in `ports/` are still used when running vcpkg in classic mode or when the `versions` feature flag is disabled. +Instead of using the portfiles in `ports/`, vcpkg is checking out the files for each version in `buildtrees/versioning/versions/`. The files in `ports/` are still used when running vcpkg in classic mode. _NOTE: Output from vcpkg while configuring CMake is only available when using CMake version `3.18` or newer. If you're using an older CMake you can check the `vcpkg-manifest-install.log` file in your build directory instead._ @@ -234,11 +232,11 @@ Notice how the `fmt` is now at version `6.0.0` just like we wanted. ## Versions and custom ports -The last thing to discuss is how overlay ports interact with versioning resolution. The answer is: they don't. +The last thing to discuss is how overlay ports interact with versioning resolution. The answer is: they don't. Going into more detail, when you provide an overlay for a port, vcpkg will always use the overlay port without caring what version is contained in it. The reasons are two-fold: (1) it is consistent with the existing behavior of overlay ports of completely masking the existing port, and (2) overlay ports do not (and are not expected to) provide enough information to power vcpkg's versioning feature. -If you want to have flexible port customization along with versioning features, you should consider making your own custom registry. See our [registries specification for more details](../specifications/registries.md). +If you want to have flexible port customization along with versioning, you should consider making your own custom registry. See our [registries specification for more details](../specifications/registries.md). ## Further reading diff --git a/docs/specifications/registries-2.md b/docs/specifications/registries-2.md index b44dacfe5fd65c..e2663ca3c74fb4 100644 --- a/docs/specifications/registries-2.md +++ b/docs/specifications/registries-2.md @@ -2,6 +2,8 @@ **Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** +**Up-to-date documentation is available at [Registries](../users/registries.md).** + Originally, the design of registries was decided upon and written up in the [Registries RFC](registries.md). However, as we've gotten further into the design process of git registries and versioning, and discussed the interaction of versioning with registries, diff --git a/docs/specifications/registries.md b/docs/specifications/registries.md index 896188f4c6b6a1..68be1409d08f02 100644 --- a/docs/specifications/registries.md +++ b/docs/specifications/registries.md @@ -2,6 +2,8 @@ **Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** +**Up-to-date documentation is available at [Registries](../users/registries.md).** + As it is now, vcpkg has over 1400 ports in the default registry (the `/ports` directory). For the majority of users, this repository of packages is enough. However, many enterprises need to more closely control their dependencies for one reason or another, and this document diff --git a/docs/users/android.md b/docs/users/android.md index 3f5b03ec0740b8..b25099c1683629 100644 --- a/docs/users/android.md +++ b/docs/users/android.md @@ -2,10 +2,7 @@ **The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/android.md).** -Android is not officially supported, and there are no official android triplets at the moment. - -However, some packages can compile to Android, and the situation is improving: see the list of [PR related to Android](https://github.com/Microsoft/vcpkg/pulls?q=+android+). - +*Android is not tested as part of vcpkg repository's CI process, so regressions can occur as part of library updates. PRs improving support are welcome!* ## Android build requirements diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index 1ba428a031a778..1f872c94663a2e 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -14,9 +14,7 @@ This environment variable can be set to an existing directory to use for storing This environment variable can be set to a comma-separated list of off-by-default features in vcpkg. These features are subject to change without notice and should be considered highly unstable. -Non-exhaustive list of off-by-default features: - -- `manifest` +There are no off-by-default feature flags at this time. #### EDITOR diff --git a/docs/users/mingw.md b/docs/users/mingw.md index 0a6c7ef6770623..d07328b15a76d7 100644 --- a/docs/users/mingw.md +++ b/docs/users/mingw.md @@ -2,7 +2,7 @@ **The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/mingw.md).** -*MinGW is community-supported and not tested as part of vcpkg repository's CI process.* +*MinGW is not tested as part of vcpkg repository's CI process, so regressions can occur as part of library updates. PRs improving support are welcome!* ## Table of Contents From 52955a7ae52bbf821a603e4e3be49ab7e437639b Mon Sep 17 00:00:00 2001 From: "xiaozhuai, Weihang Ding" <798047000@qq.com> Date: Thu, 19 May 2022 05:34:45 +0800 Subject: [PATCH 288/383] Fix angle macos build (#24750) * Fix angle macos build * Fix angle port version * Fix angle port version * Fix angle_common source files for macos * upgrade angle port version to #4 * Fix angle port version, again... * Fix angle port version, again, again... --- ports/angle/CMakeLists.txt | 17 +++++++++++++++++ ports/angle/vcpkg.json | 2 +- versions/a-/angle.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index 70a2e214361748..184f5c951826ba 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -72,7 +72,21 @@ elseif(APPLE) set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|_mac") endif() endif() + +if(APPLE) + set(ANGLE_COMMON_PLATFORM_SOURCES + "src/common/apple/*.h" + "src/common/apple/*.cpp" + "src/common/apple/*.mm" + "src/common/gl/cgl/*.h" + "src/common/gl/cgl/*.cpp" + "src/common/gl/cgl/*.mm") +else() + set(ANGLE_COMMON_PLATFORM_SOURCES ) +endif() + file(GLOB ANGLE_COMMON_SOURCES + ${ANGLE_COMMON_PLATFORM_SOURCES} "src/common/*.h" "src/common/*.inc" "src/common/*.cpp" @@ -341,6 +355,9 @@ if(WINDOWS_DESKTOP OR LINUX OR APPLE) "src/libANGLE/renderer/gl/cgl/*.mm" "src/libANGLE/renderer/gl/cgl/*.cpp" "src/libANGLE/renderer/gl/cgl/*.h" + "src/libANGLE/renderer/gl/apple/*.mm" + "src/libANGLE/renderer/gl/apple/*.cpp" + "src/libANGLE/renderer/gl/apple/*.h" "gpu_info_util/SystemInfo_macos.mm" ) elseif(LINUX) diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index e51cf097890bf8..2c582aeb5f9502 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_4472", - "port-version": 2, + "port-version": 3, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index 054aab9b90fde5..942f5ceca75adb 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3b63c0d8bf584235c057cb40486152ebe3fa0a6", + "version-string": "chromium_4472", + "port-version": 3 + }, { "git-tree": "3c4f08e40691d643044cf9319cef04b4289d4b6f", "version-string": "chromium_4472", diff --git a/versions/baseline.json b/versions/baseline.json index a116bf09ac2ac6..8bb3656fd8b901 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -86,7 +86,7 @@ }, "angle": { "baseline": "chromium_4472", - "port-version": 2 + "port-version": 3 }, "antlr4": { "baseline": "4.9.3", From 2e781b513f486618909d9f78185c0c7ebb54624c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Thu, 19 May 2022 00:39:40 +0200 Subject: [PATCH 289/383] [catch2] Reenable extras files (#24790) * [catch2] Reenable extras files * [catch2] Update version files --- ports/catch2/portfile.cmake | 1 - ports/catch2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index d1ccc44315c337..5984aec7c57494 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCATCH_INSTALL_DOCS=OFF - -DCATCH_INSTALL_EXTRAS=OFF ) vcpkg_cmake_install() diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index 8a40b424e36acb..4d884128de85ee 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "catch2", "version-semver": "3.0.1", + "port-version": 1, "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8bb3656fd8b901..9883fff0ea05e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1274,7 +1274,7 @@ }, "catch2": { "baseline": "3.0.1", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 5ec8e97a0e6457..be202f39ea3628 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8de83e7d7f07a831293d15e747aa7a980a220ff7", + "version-semver": "3.0.1", + "port-version": 1 + }, { "git-tree": "c0c872e7175f3ca20a15f5c8cc0d0c23e59e1ad1", "version-semver": "3.0.1", From 8f1d60f2014729c80d1c7a95947c30cdfd7aa4ea Mon Sep 17 00:00:00 2001 From: "microsoft-github-policy-service[bot]" <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 17:06:39 -0700 Subject: [PATCH 290/383] Microsoft mandatory file (#24791) Co-authored-by: microsoft-github-policy-service[bot] <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com> --- SECURITY.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000000000..869fdfe2b24699 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,41 @@ + + +## Security + +Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/). + +If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below. + +## Reporting Security Issues + +**Please do not report security vulnerabilities through public GitHub issues.** + +Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report). + +If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey). + +You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). + +Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue: + + * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.) + * Full paths of source file(s) related to the manifestation of the issue + * The location of the affected source code (tag/branch/commit or direct URL) + * Any special configuration required to reproduce the issue + * Step-by-step instructions to reproduce the issue + * Proof-of-concept or exploit code (if possible) + * Impact of the issue, including how an attacker might exploit the issue + +This information will help us triage your report more quickly. + +If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs. + +## Preferred Languages + +We prefer all communications to be in English. + +## Policy + +Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd). + + From f27af0410edf2fee0b96dcfad68e0865603c9efa Mon Sep 17 00:00:00 2001 From: tqcq <99722391+tqcq@users.noreply.github.com> Date: Thu, 19 May 2022 15:22:40 +0800 Subject: [PATCH 291/383] [pcre] fix build pcre undeclared identifier strtoq on arm-android (#24757) * [pcre] fix build pcre undeclared identifier strtoq on arm-android * replace CHECK_FUNCTION_EXISTS by CHECK_SYMBOL_EXISTS * Update version database --- ...unction_exists_for_arm-androi_builds.patch | 32 +++++++++++++++++++ ports/pcre/portfile.cmake | 3 +- ports/pcre/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pcre.json | 5 +++ 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch diff --git a/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch b/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch new file mode 100644 index 00000000000000..dd014bf6fd869c --- /dev/null +++ b/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c3a309..cdd480f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ FIND_PACKAGE( Editline ) + + INCLUDE(CheckIncludeFile) + INCLUDE(CheckIncludeFileCXX) +-INCLUDE(CheckFunctionExists) ++INCLUDE(CheckSymbolExists) + INCLUDE(CheckTypeSize) + INCLUDE(GNUInstallDirs) # for CMAKE_INSTALL_LIBDIR + +@@ -109,12 +109,12 @@ CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) + CHECK_INCLUDE_FILE_CXX(type_traits.h HAVE_TYPE_TRAITS_H) + CHECK_INCLUDE_FILE_CXX(bits/type_traits.h HAVE_BITS_TYPE_TRAITS_H) + +-CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY) +-CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) +-CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) +-CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL) +-CHECK_FUNCTION_EXISTS(strtoq HAVE_STRTOQ) +-CHECK_FUNCTION_EXISTS(_strtoi64 HAVE__STRTOI64) ++CHECK_SYMBOL_EXISTS(bcopy strings.h HAVE_BCOPY) ++CHECK_SYMBOL_EXISTS(memmove strings.h HAVE_MEMMOVE) ++CHECK_SYMBOL_EXISTS(strerror strings.h HAVE_STRERROR) ++CHECK_SYMBOL_EXISTS(strtoll stdlib.h HAVE_STRTOLL) ++CHECK_SYMBOL_EXISTS(strtoq stdlib.h HAVE_STRTOQ) ++CHECK_SYMBOL_EXISTS(_strtoi64 stdlib.h HAVE__STRTOI64) + + CHECK_TYPE_SIZE("long long" LONG_LONG) + CHECK_TYPE_SIZE("unsigned long long" UNSIGNED_LONG_LONG) diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index b7a11172b7088b..ca1176fc2ff666 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -7,7 +7,8 @@ set(PATCHES pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch # Modified for 8.45 from https://bugs.exim.org/show_bug.cgi?id=2600 pcre-8.45_fix_postfix_for_debug_Windows_builds.patch - export-cmake-targets.patch) + export-cmake-targets.patch + pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/pcre/vcpkg.json b/ports/pcre/vcpkg.json index 1e006173fc4de1..4c3f8dcb4b862d 100644 --- a/ports/pcre/vcpkg.json +++ b/ports/pcre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcre", "version": "8.45", - "port-version": 2, + "port-version": 3, "description": "Perl Compatible Regular Expressions", "homepage": "https://www.pcre.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9883fff0ea05e8..1a0356ea537c9b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5354,7 +5354,7 @@ }, "pcre": { "baseline": "8.45", - "port-version": 2 + "port-version": 3 }, "pcre2": { "baseline": "10.40", diff --git a/versions/p-/pcre.json b/versions/p-/pcre.json index 64af5b411bc1ab..acbf3b73298ed6 100644 --- a/versions/p-/pcre.json +++ b/versions/p-/pcre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8f61fdc5d1286667a8e14eb9521500b882394ad", + "version": "8.45", + "port-version": 3 + }, { "git-tree": "693b4da6141be8041f8db0caa1b60ce246b47dcb", "version": "8.45", From 63f1d5b4d048928b74759461018ad04455e9af73 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 19 May 2022 07:23:39 +0000 Subject: [PATCH 292/383] [qt5-webengine] fix nonobvious failure (#24528) * [qt5-webengine] Manually add nodejs to the path (microsoft#23574) The build process requires nodejs to be in PATH when webengine is built, and will build only the pdf-plugin if it's not (see #23574) * [qt5-webengine] Workaround MSVC2022 Internal Compiler Error (microsoft#23574) Add a patch based on https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/407582 which was merged into upstream. We can't take the upstream patch directly, because the patch was committed to the chromium (sub)repository which is a subdirectory in the release zip file, i.e. I had to modify the pathnames for the patch to apply * [qt5-webengine] Update diagnostics (microsoft#23574) I've spotted the linker using 16GB singlehandedly on the release (opposed to "debug") packaging, and emory consumption was almost permanently over 32GB while compiling, though peak memory consumption can be reduced by setting up low values for VCPKG_MAX_CONCURRENY Also, reword the build-prefix-too-long message * [qt5-webengine] Attempt enabling windows ci baselines (microsoft#23574) * [qt5-webengine] Regenerate version registries (microsoft#23574) * Also remove out of date comments from ci.baseline.txt referring to deleted lines. * Revert "Also remove out of date comments from ci.baseline.txt referring to deleted lines." This reverts commit 7a4d84643102231bf8e60f2340db970c8775a607. * [qt5-webengine] Re-add webengine blacklisting to ci.baseline (microsoft#23574) Co-authored-by: Billy Robert O'Neal III --- ports/qt5-webengine/portfile.cmake | 11 +- ports/qt5-webengine/vcpkg.json | 4 +- .../workaround-msvc2022-ice.patch | 101 ++++++++++++++++++ versions/baseline.json | 2 +- versions/q-/qt5-webengine.json | 5 + 5 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 ports/qt5-webengine/workaround-msvc2022-ice.patch diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 080b21b3ce3e45..cab44c7e6bcd95 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -2,12 +2,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtrees_path_length) if(buildtrees_path_length GREATER 35 AND CMAKE_HOST_WIN32) vcpkg_buildpath_length_warning(35) - message(FATAL_ERROR "terminating due to source length.") + message(WARNING "The ${PORT} source was will be extracted to ${CURRENT_BUILDTREES_DIR} , which has more then 35 characters in length.") + message(FATAL_ERROR "terminating due to ${CURRENT_BUILDTREES_DIR} being too long.") endif() #set(VCPKG_BUILD_TYPE release) #You probably want to set this to reduce build type and space requirements message(STATUS "${PORT} requires a lot of free disk space (>100GB), ram (>8 GB) and time (>2h per configuration) to be successfully build.\n\ -- As such ${PORT} is currently experimental.\n\ --- If ${PORT} fails post build validation please open up an issue. \n\ +-- If ${PORT} fails post build validation please try manually reducing VCPKG_MAX_CONCURRENY and open up an issue if it still cannot build. \n\ -- If it fails due to post validation the successfully installed files can be found in ${CURRENT_PACKAGES_DIR} \n\ -- and just need to be copied into ${CURRENT_INSTALLED_DIR}") if(NOT VCPKG_TARGET_IS_WINDOWS) @@ -20,11 +21,13 @@ vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(GPERF) vcpkg_find_acquire_program(PYTHON2) vcpkg_find_acquire_program(NINJA) +set(NODEJS "${CURRENT_HOST_INSTALLED_DIR}/tools/node/node${VCPKG_HOST_EXECUTABLE_SUFFIX}") get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY ) get_filename_component(NINJA_DIR "${NINJA}" DIRECTORY ) +get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY ) if(WIN32) # WIN32 HOST probably has win_flex and win_bison! if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") @@ -40,11 +43,13 @@ vcpkg_add_to_path(PREPEND "${BISON_DIR}") vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") vcpkg_add_to_path(PREPEND "${GPERF_DIR}") vcpkg_add_to_path(PREPEND "${NINJA_DIR}") +vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") set(PATCHES common.pri.patch gl.patch build_1.patch - build_2.patch) + build_2.patch + workaround-msvc2022-ice.patch) set(OPTIONS) if("proprietary-codecs" IN_LIST FEATURES) diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index c601cbf0231737..64338b1cbf3951 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-webengine", "version": "5.15.4", + "port-version": 1, "description": "Qt5 webengine Module;", "license": null, "supports": "!static", @@ -23,7 +24,8 @@ "qt5-quickcontrols", "qt5-quickcontrols2", "qt5-tools", - "qt5-webchannel" + "qt5-webchannel", + "vcpkg-tool-nodejs" ], "features": { "proprietary-codecs": { diff --git a/ports/qt5-webengine/workaround-msvc2022-ice.patch b/ports/qt5-webengine/workaround-msvc2022-ice.patch new file mode 100644 index 00000000000000..59cc004b622152 --- /dev/null +++ b/ports/qt5-webengine/workaround-msvc2022-ice.patch @@ -0,0 +1,101 @@ +--- a/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h ++++ b/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h +@@ -281,15 +281,63 @@ struct MD5CE { + return IntermediateDataToMD5Digest(ProcessMessage(data, n)); + } + +- static constexpr uint64_t Hash64(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return (static_cast(SwapEndian(intermediate.a)) << 32) | +- static_cast(SwapEndian(intermediate.b)); ++ static constexpr uint64_t Hash64(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return (static_cast(SwapEndian(intermediate0.a)) << 32) | ++ static_cast(SwapEndian(intermediate0.b)); + } + +- static constexpr uint32_t Hash32(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return SwapEndian(intermediate.a); ++ static constexpr uint32_t Hash32(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return SwapEndian(intermediate0.a); + } + }; + +--- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h ++++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h +@@ -26,6 +26,7 @@ + #include + #include + ++#include "absl/base/macros.h" + #include "net/third_party/quiche/src/quic/core/quic_tag.h" + #include "net/third_party/quiche/src/quic/core/quic_types.h" + #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" +@@ -181,8 +182,14 @@ QUIC_EXPORT_PRIVATE constexpr bool ParsedQuicVersionIsValid( + transport_version == QUIC_VERSION_RESERVED_FOR_NEGOTIATION; + if (!transport_version_is_valid) { + // Iterators are not constexpr in C++14 which Chrome uses. +- constexpr auto supported_transport_versions = SupportedTransportVersions(); +- for (size_t i = 0; i < supported_transport_versions.size(); ++i) { ++ constexpr QuicTransportVersion supported_transport_versions[] = { ++ QUIC_VERSION_IETF_DRAFT_29, ++ QUIC_VERSION_IETF_DRAFT_27, ++ QUIC_VERSION_51, ++ QUIC_VERSION_50, ++ QUIC_VERSION_46, ++ QUIC_VERSION_43}; ++ for (size_t i = 0; i < ABSL_ARRAYSIZE(supported_transport_versions); ++i) { + const QuicTransportVersion& trans_vers = supported_transport_versions[i]; + if (trans_vers == transport_version) { + transport_version_is_valid = true; + diff --git a/versions/baseline.json b/versions/baseline.json index 1a0356ea537c9b..6cec672b99e68f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5834,7 +5834,7 @@ }, "qt5-webengine": { "baseline": "5.15.4", - "port-version": 0 + "port-version": 1 }, "qt5-webglplugin": { "baseline": "5.15.4", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 229b7b9fad75da..b5fbc94b2d6b60 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac21a058fe59c5b0272cdfc2cc1791b9b9901a79", + "version": "5.15.4", + "port-version": 1 + }, { "git-tree": "f210713d4af04f690a79188949467c8ba9b2597e", "version": "5.15.4", From 94870c52dcfc633018662f40980991b3dbe62461 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 19 May 2022 15:23:48 +0800 Subject: [PATCH 293/383] [opencascade] update to 7.6.1 (#24795) * [opencascade] update to 7.6.1 * update version --- ports/opencascade/portfile.cmake | 4 ++-- ports/opencascade/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/opencascade.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index b10642345d8aee..3d5de5f12db06c 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Open-Cascade-SAS/OCCT - REF 80ffc5f84dae96de6ed093d3e5d2466a9e368b27 #V7.6.0 - SHA512 1dfee9c59eb6ea61735f0807d44ccf62019a2649f506a5a8197e04b1533592dc95d6d67ab7a3bb392785755ed60b6fc489bea049f658d4ae7d05dfe0d7d5bdcd + REF bb368e271e24f63078129283148ce83db6b9670a #V7.6.2 + SHA512 500c7ff804eb6b202bef48e1be904fe43a3c0137e9a402affe128b3b75a1adbb20bfe383cee82503b13efc083a95eb97425f1afb1f66bae38543d29f871a91f9 HEAD_REF master PATCHES fix-pdb-find.patch diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index d06977325cc589..0ae0f526089466 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencascade", - "version": "7.6.0", - "port-version": 1, + "version": "7.6.2", "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", "license": "LGPL-2.1", diff --git a/versions/baseline.json b/versions/baseline.json index 6cec672b99e68f..396cdf457c028b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5073,8 +5073,8 @@ "port-version": 0 }, "opencascade": { - "baseline": "7.6.0", - "port-version": 1 + "baseline": "7.6.2", + "port-version": 0 }, "opencc": { "baseline": "2020-04-26", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index c82c8c0f97c4ce..7d0d833bab9366 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dd7a80ecf7e8183ebfd1e25fc64351e47f9eed0", + "version": "7.6.2", + "port-version": 0 + }, { "git-tree": "0b043af5fd55a990d23a36523c82b005422ba75c", "version": "7.6.0", From 73522d2ccc323ad69c2acd8342875e5823cfdc33 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Thu, 19 May 2022 00:24:07 -0700 Subject: [PATCH 294/383] [cppgraphqlgen] Update to v4.4.1 (#24783) * [cppgraphqlgen] Update to v4.4.1 * vcpkg x-add-version --all --- ports/cppgraphqlgen/portfile.cmake | 4 ++-- ports/cppgraphqlgen/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cppgraphqlgen.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index a2d121a4d99870..0800fab2571504 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cppgraphqlgen - REF v4.3.1 - SHA512 22c453d9617ce420c194edc9a73ffb6b1b48722e24186d4b76bc36d9dd64a8720aa3f85905d43b07c3e31781ef30a945f935ca216dc464f16a1c088380dea4e6 + REF v4.4.1 + SHA512 6d22b1b63e2aaed9264bbb88a09c33a3a30d596a2745696b893cb19ae143e9372615913c6b70fcceb09778e645f1a81371fbb2096f522fe395b95df018e9218e HEAD_REF main ) diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json index 5209f9d50a1b05..4becb34130f4a9 100644 --- a/ports/cppgraphqlgen/vcpkg.json +++ b/ports/cppgraphqlgen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppgraphqlgen", - "version": "4.3.1", + "version": "4.4.1", "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 396cdf457c028b..21c5ccc0c20ad7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1613,7 +1613,7 @@ "port-version": 1 }, "cppgraphqlgen": { - "baseline": "4.3.1", + "baseline": "4.4.1", "port-version": 0 }, "cppitertools": { diff --git a/versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json index b4c5accad41538..7a4d7c679fb084 100644 --- a/versions/c-/cppgraphqlgen.json +++ b/versions/c-/cppgraphqlgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52eaf92f61791cfb08e2a8848ccbf1c02748f064", + "version": "4.4.1", + "port-version": 0 + }, { "git-tree": "7c3acfd5254a4ae0680cc3f96eef630bcaab7b36", "version": "4.3.1", From 2f0872b7d592635e8e4919d178650d549c211464 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 19 May 2022 15:25:30 +0800 Subject: [PATCH 295/383] [openssl] Add no-module configure option for static build (#24598) * [openssl] Add no-module configure option * update version * add no-module * version * remove change on windows * x-add-version * update version * x-add-version * fix windows static * x-add-version * x-add-version Co-authored-by: Lily Wang --- ports/openssl/unix/CMakeLists.txt | 2 +- ports/openssl/vcpkg.json | 2 +- ports/openssl/windows/portfile.cmake | 17 +++++++++++------ versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index d47193512f2a25..9cb6a5325dece5 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -127,7 +127,7 @@ if(BUILD_SHARED_LIBS) list(APPEND BIN_EXTS ${BIN_EXT}) list(APPEND LIB_EXTS ${LIB_EXT}) else() - set(SHARED no-shared) + set(SHARED no-shared no-module) set(LIB_EXTS a) endif() set(INSTALL_PKG_CONFIGS "${BUILDDIR}/openssl.pc") diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index a0619265e18d29..507ecf971e565c 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.0.3", - "port-version": 1, + "port-version": 2, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index f4f346e184e6fa..86b6e1957b76ed 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -10,9 +10,10 @@ vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") vcpkg_find_acquire_program(JOM) -set(OPENSSL_SHARED no-shared) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(OPENSSL_SHARED shared) +else() + set(OPENSSL_SHARED no-shared no-module) endif() vcpkg_cmake_get_vars(cmake_vars_file) @@ -148,8 +149,10 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Build ${TARGET_TRIPLET}-dbg done") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb") + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb") + endif() endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/certs") @@ -162,10 +165,12 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-3") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/private") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if(NOT VCPKG_BUILD_TYPE) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll") +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll") + endif() + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/bin/legacy.dll") endif() -file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/bin/legacy.dll") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/ossl-modules") diff --git a/versions/baseline.json b/versions/baseline.json index 21c5ccc0c20ad7..98000cfabe47b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5182,7 +5182,7 @@ }, "openssl": { "baseline": "3.0.3", - "port-version": 1 + "port-version": 2 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 93f7b62b5cdc6e..c312ffc0815879 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdd8b7c5c9ebba05598bc90a58f224f13cf0b611", + "version": "3.0.3", + "port-version": 2 + }, { "git-tree": "1ac5c972c2c6c9af050334b2f7a41de1253c6a5e", "version": "3.0.3", From 63e39757b542af74fdc6d40aa99155b6828e6e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=9C=E5=A7=AC?= Date: Fri, 20 May 2022 05:14:39 +0800 Subject: [PATCH 296/383] [libass] update to 0.16.0 (#24749) * [libass] update to 0.16.0 * [libass] Add to versions file --- ports/libass/CMakeLists.txt | 64 +++++++++++++++++++++++++------------ ports/libass/config.h.in | 2 +- ports/libass/portfile.cmake | 10 +++--- ports/libass/vcpkg.json | 13 ++++---- versions/baseline.json | 2 +- versions/l-/libass.json | 5 +++ 6 files changed, 63 insertions(+), 33 deletions(-) diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index b2331d325752fe..9fb8548cb15a0b 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -1,38 +1,63 @@ cmake_minimum_required(VERSION 3.9) project(libass C CXX) -set(LIBASS_VERSION 0.15.1) +set(LIBASS_VERSION 0.16.0) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -if(WIN32) - add_compile_definitions(CONFIG_DIRECTWRITE) -elseif(APPLE) - add_compile_definitions(CONFIG_CORETEXT) -else() - add_compile_definitions(CONFIG_FONTCONFIG) -endif() - add_compile_definitions(CONFIG_FREETYPE) add_compile_definitions(CONFIG_FRIBIDI) add_compile_definitions(CONFIG_HARFBUZZ) file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) -set(FONTCONFIG_LIBRARY) + +include(CheckCSourceCompiles) +set(PKG_REQUIRES_LIBASS "harfbuzz >= 1.2.3, fribidi >= 0.19.1, freetype2 >= 9.17.3") +set(PKG_LIBS_LIBASS) if(WIN32) + add_compile_definitions(CONFIG_DIRECTWRITE) list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") + + #dependency fribidi does not support uwp builds, link gdi32 directly + set(FONT_LIBRARY gdi32) + set(PKG_LIBS_LIBASS -lgdi32) elseif(APPLE) + add_compile_definitions(CONFIG_CORETEXT) list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") + + check_c_source_compiles( + " + #include + int main(void){ + CTFontDescriptorCopyAttribute(NULL, kCTFontURLAttribute); + return 0; + } + " + CHECK_OLD_OSX + ) + if (CHECK_OLD_OSX) + set(FONT_LIBRARY "-framework ApplicationServices -framework CoreFoundation") + set(PKG_LIBS_LIBASS "-framework ApplicationServices -framework CoreFoundation") + else() + set(FONT_LIBRARY "-framework CoreText -framework CoreFoundation") + set(PKG_LIBS_LIBASS "-framework CoreText -framework CoreFoundation") + endif() else() + add_compile_definitions(CONFIG_FONTCONFIG) list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") find_package(Fontconfig REQUIRED) - set(FONTCONFIG_LIBRARY Fontconfig::Fontconfig) + set(FONT_LIBRARY Fontconfig::Fontconfig) + set(PKG_REQUIRES_LIBASS "fontconfig >= 2.10.92, ${PKG_REQUIRES_LIBASS}") +endif() + +if (NOT WIN32) + set(PKG_LIBS_LIBASS "${PKG_LIBS_LIBASS} -lm") endif() find_package(Freetype REQUIRED) @@ -45,8 +70,8 @@ find_path(HARFBUZZ_INCLUDE_DIR NAMES hb.h PATH_SUFFIXES harfbuzz) -find_path(DIRENT_INCLUDE_DIR - NAMES dirent.h) +# libass use win32 api to open files on windows since https://github.com/libass/libass/commit/f664ced049394e2a5d4300ba526e206df73ec729 +# so remove dependency dirent. find_library(FRIBIDI_LIBRARY NAMES libfribidi fribidi) find_library(HARFBUZZ_LIBRARY NAMES harfbuzz) @@ -64,7 +89,7 @@ target_link_libraries(ass PRIVATE Freetype::Freetype ${FRIBIDI_LIBRARY} ${HARFBUZZ_LIBRARY} - ${FONTCONFIG_LIBRARY}) + ${FONT_LIBRARY}) install(TARGETS ass RUNTIME DESTINATION bin @@ -77,13 +102,12 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) set(PACKAGE_VERSION ${LIBASS_VERSION}) -if(WIN32 OR APPLE) - set(PKG_REQUIRES_PRIVATE "harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3") +if(BUILD_SHARED_LIBS) + set(PKG_REQUIRES_PRIVATE ${PKG_REQUIRES_LIBASS}) + set(PKG_LIBS_PRIVATE ${PKG_LIBS_LIBASS}) else() - set(PKG_REQUIRES_PRIVATE "fontconfig >= 2.10.92, harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3") -endif() -if (NOT WIN32) - set(PKG_LIBS_PRIVATE -lm) + set(PKG_REQUIRES_PUBLIC ${PKG_REQUIRES_LIBASS}) + set(PKG_LIBS_PUBLIC ${PKG_LIBS_LIBASS}) endif() configure_file(libass.pc.in libass.pc @ONLY) install(FILES diff --git a/ports/libass/config.h.in b/ports/libass/config.h.in index b1e5b4b6b9afa6..ffc4c1b4942b7c 100644 --- a/ports/libass/config.h.in +++ b/ports/libass/config.h.in @@ -1 +1 @@ -#define CONFIG_SOURCEVERSION "tarball: 0.15.1" +#define CONFIG_SOURCEVERSION "tarball: 0.16.0" diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake index e1a185a381e0c2..45cf6ad5394dd3 100644 --- a/ports/libass/portfile.cmake +++ b/ports/libass/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libass/libass - REF 0.15.2 - SHA512 ae3ea533e57ab3c386ce457dbaa39a256801b7340649d5ff80a51410481e73ab194724744b97d85cb6d111798e45eee594bb22da2f1f3c547fe8e331e0690127 + REF 0.16.0 + SHA512 fea93b36d05cd69a5920b603951dd63f46b2434e0dcbb12414bf6e1e584bacc2743fbfc03682d0a672bbfe9bcc057452a942f9967d95a30e535bd3694e40fc7d HEAD_REF master ) @@ -15,11 +15,11 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${SOURCE_PATH}/libass/ass.h ${SOURCE_PATH}/libass/ass_types.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ass) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA) +) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json index f4b2821676ba1d..31d51e293b23de 100644 --- a/ports/libass/vcpkg.json +++ b/ports/libass/vcpkg.json @@ -1,19 +1,20 @@ { "name": "libass", - "version": "0.15.2", + "version": "0.16.0", "description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format", "homepage": "https://github.com/libass/libass", + "license": "ISC", "dependencies": [ - { - "name": "dirent", - "platform": "windows" - }, { "name": "fontconfig", "platform": "linux" }, "freetype", "fribidi", - "harfbuzz" + "harfbuzz", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 98000cfabe47b5..f1cca4b7fd2cf2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3409,7 +3409,7 @@ "port-version": 0 }, "libass": { - "baseline": "0.15.2", + "baseline": "0.16.0", "port-version": 0 }, "libassuan": { diff --git a/versions/l-/libass.json b/versions/l-/libass.json index ba862065635b4a..1ab96ad462397e 100644 --- a/versions/l-/libass.json +++ b/versions/l-/libass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5dfc84a884c525317deec9d8e62df51d64a8e3d", + "version": "0.16.0", + "port-version": 0 + }, { "git-tree": "358f5ebe2b07d2c3043f1397a7caa51fcf7ebdce", "version": "0.15.2", From 7ca918af712b1fde7829d4d7661391c445481b44 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 19 May 2022 23:15:47 +0200 Subject: [PATCH 297/383] dont change line endings on download (#24785) --- scripts/cmake/vcpkg_from_git.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index 142cae70eb03fa..7ff27b9bf212ff 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -175,7 +175,7 @@ function(vcpkg_from_git) file(MAKE_DIRECTORY "${DOWNLOADS}/temp") vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND "${GIT}" archive "${rev_parse_ref}" -o "${temp_archive}" + COMMAND "${GIT}" -c core.autocrlf=false archive "${rev_parse_ref}" -o "${temp_archive}" WORKING_DIRECTORY "${git_working_directory}" LOGNAME git-archive ) From 12b018e48fe2c2143e2cc66ec5702443bb9563cd Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 19 May 2022 23:38:14 +0200 Subject: [PATCH 298/383] [libxslt] update to cmake (#24784) * libxslt update and switch to cmake * give logs. * Revert "give logs." This reverts commit fddf7675c90ba44aed019c7d57cdb8abc71c6707. * fine tuning * version stuff * format manifest * ver db * Trailing whitespace and terminal newline. Co-authored-by: Billy Robert O'Neal --- ports/libxslt/0001-Fix-makefile.patch | 49 ----- ports/libxslt/0002-Fix-lzma.patch | 45 ----- ports/libxslt/0003-Fix-configure.patch | 50 ----- ports/libxslt/cmake.patch | 50 +++++ ports/libxslt/only_build_one_lib_type.patch | 56 ------ ports/libxslt/portfile.cmake | 211 +++++--------------- ports/libxslt/require-dependencies.patch | 44 ---- ports/libxslt/vcpkg-cmake-wrapper.cmake | 5 + ports/libxslt/vcpkg.json | 21 +- versions/baseline.json | 4 +- versions/l-/libxslt.json | 5 + 11 files changed, 122 insertions(+), 418 deletions(-) delete mode 100644 ports/libxslt/0001-Fix-makefile.patch delete mode 100644 ports/libxslt/0002-Fix-lzma.patch delete mode 100644 ports/libxslt/0003-Fix-configure.patch create mode 100644 ports/libxslt/cmake.patch delete mode 100644 ports/libxslt/only_build_one_lib_type.patch delete mode 100644 ports/libxslt/require-dependencies.patch create mode 100644 ports/libxslt/vcpkg-cmake-wrapper.cmake diff --git a/ports/libxslt/0001-Fix-makefile.patch b/ports/libxslt/0001-Fix-makefile.patch deleted file mode 100644 index 65433e0d7ac859..00000000000000 --- a/ports/libxslt/0001-Fix-makefile.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git "a/win32/Makefile.msvc" "b/win32/Makefile.msvc" -index 2e4742bb..8bfe7d83 100644 ---- "a/win32/Makefile.msvc" -+++ "b/win32/Makefile.msvc" -@@ -59,7 +59,13 @@ CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE - LD = link.exe - LDFLAGS = /nologo - LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) --LIBS = -+# The libraries are needed for static builds (the makefile builds all tools and dlls) -+LIBS = iconv.lib charset.lib ws2_32.lib lzma.lib -+!if "$(DEBUG)" == "1" -+LIBS = $(LIBS) zlibd.lib -+!else -+LIBS = $(LIBS) zlib.lib -+!endif - - # The archiver and its options. - AR = lib.exe -@@ -71,8 +77,14 @@ CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 - LDFLAGS = $(LDFLAGS) /DEBUG - !else - CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 -+LDFLAGS = $(LDFLAGS) /DEBUG /OPT:REF /OPT:ICF - !endif - -+# append CFLAGS etc. passed on command line -+CPPFLAGS = $(CPPFLAGS) $(EXTRA_CPPFLAGS) -+CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) -+LDFLAGS = $(LDFLAGS) $(EXTRA_LDFLAGS) -+ - # Libxslt object files. - XSLT_OBJS = $(XSLT_INTDIR)\attributes.obj\ - $(XSLT_INTDIR)\documents.obj\ -@@ -309,13 +321,7 @@ $(UTILS_INTDIR) : - # An implicit rule for xsltproc and friends. - APPLIBS = $(LIBS) - !if "$(STATIC)" == "1" --APPLIBS = $(LIBS) libxml2_a.lib --!if "$(WITH_ICONV)" == "1" --APPLIBS = $(APPLIBS) iconv.lib --!endif --!if "$(WITH_ZLIB)" == "1" --APPLIBS = $(APPLIBS) zlib.lib --!endif -+APPLIBS = $(LIBS) libxml2.lib - {$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe: - $(CC) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \ - $(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $< diff --git a/ports/libxslt/0002-Fix-lzma.patch b/ports/libxslt/0002-Fix-lzma.patch deleted file mode 100644 index c1ece503626744..00000000000000 --- a/ports/libxslt/0002-Fix-lzma.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/win32/configure.js b/win32/configure.js -index 12c99f3..0737b06 100644 ---- a/win32/configure.js -+++ b/win32/configure.js -@@ -45,6 +45,7 @@ var withMemDebug = false; - var withDebugger = true; - var withIconv = true; - var withZlib = false; -+var withLzma = true; - var withCrypto = true; - var withModules = false; - var withProfiler = true; -@@ -105,6 +106,7 @@ function usage() - txt += " debugger: Enable external debugger support (" + (withDebugger? "yes" : "no") + ")\n"; - txt += " iconv: Use iconv library (" + (withIconv? "yes" : "no") + ")\n"; - txt += " zlib: Use zlib library (" + (withZlib? "yes" : "no") + ")\n"; -+ txt += " lzma: Use lzma library (" + (withLzma? "yes" : "no") + ")\n"; - txt += " crypto: Enable Crypto support (" + (withCrypto? "yes" : "no") + ")\n"; - txt += " modules: Enable Module support (" + (withModules? "yes" : "no") + ")\n"; - txt += " profiler: Enable Profiler support (" + (withProfiler? "yes" : "no") + ")\n"; -@@ -192,6 +194,7 @@ function discoverVersion() - vf.WriteLine("WITH_DEBUGGER=" + (withDebugger? "1" : "0")); - vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0")); - vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0")); -+ vf.WriteLine("WITH_LZMA=" + (withLzma? "1" : "0")); - vf.WriteLine("WITH_CRYPTO=" + (withCrypto? "1" : "0")); - vf.WriteLine("WITH_MODULES=" + (withModules? "1" : "0")); - vf.WriteLine("WITH_PROFILER=" + (withProfiler? "1" : "0")); -@@ -344,6 +347,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { - withIconv = strToBool(arg.substring(opt.length + 1, arg.length)); - else if (opt == "zlib") - withZlib = strToBool(arg.substring(opt.length + 1, arg.length)); -+ else if (opt == "lzma") -+ withLzma = strToBool(arg.substring(opt.length + 1, arg.length)); - else if (opt == "crypto") - withCrypto = strToBool(arg.substring(opt.length + 1, arg.length)); - else if (opt == "modules") -@@ -482,6 +487,7 @@ txtOut += " Memory debugging: " + boolToStr(withMemDebug) + "\n"; - txtOut += " Debugger support: " + boolToStr(withDebugger) + "\n"; - txtOut += " Use iconv: " + boolToStr(withIconv) + "\n"; - txtOut += " With zlib: " + boolToStr(withZlib) + "\n"; -+txtOut += " Lzma: " + boolToStr(withLzma) + "\n"; - txtOut += " Crypto: " + boolToStr(withCrypto) + "\n"; - txtOut += " Modules: " + boolToStr(withModules) + "\n"; - txtOut += " Profiler: " + boolToStr(withProfiler) + "\n"; diff --git a/ports/libxslt/0003-Fix-configure.patch b/ports/libxslt/0003-Fix-configure.patch deleted file mode 100644 index 43cc239036e3a9..00000000000000 --- a/ports/libxslt/0003-Fix-configure.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/win32/configure.js b/win32/configure.js -index 0737b06..11815e4 100644 ---- a/win32/configure.js -+++ b/win32/configure.js -@@ -138,7 +138,7 @@ function usage() - file included by our makefile. */ - function discoverVersion() - { -- var fso, cf, vf, ln, s; -+ var fso, cf, vf, ln, s, m; - fso = new ActiveXObject("Scripting.FileSystemObject"); - verCvs = ""; - if (useCvsVer && fso.FileExists("..\\CVS\\Entries")) { -@@ -147,8 +147,8 @@ function discoverVersion() - ln = cf.ReadLine(); - s = new String(ln); - if (s.search(/^\/ChangeLog\//) != -1) { -- iDot = s.indexOf("."); -- iSlash = s.indexOf("/", iDot); -+ var iDot = s.indexOf("."); -+ var iSlash = s.indexOf("/", iDot); - verCvs = "CVS" + s.substring(iDot + 1, iSlash); - break; - } -@@ -178,13 +178,13 @@ function discoverVersion() - verMicroXslt = m[1]; - } else if (s.search(/^LIBEXSLT_MAJOR_VERSION=/) != -1) { - vf.WriteLine(s); -- verMajorExslt = s.substring(s.indexOf("=") + 1, s.length) -+ verMajorExslt = s.substring(s.indexOf("=") + 1, s.length); - } else if(s.search(/^LIBEXSLT_MINOR_VERSION=/) != -1) { - vf.WriteLine(s); -- verMinorExslt = s.substring(s.indexOf("=") + 1, s.length) -+ verMinorExslt = s.substring(s.indexOf("=") + 1, s.length); - } else if(s.search(/^LIBEXSLT_MICRO_VERSION=/) != -1) { - vf.WriteLine(s); -- verMicroExslt = s.substring(s.indexOf("=") + 1, s.length) -+ verMicroExslt = s.substring(s.indexOf("=") + 1, s.length); - } - } - cf.Close(); -@@ -365,8 +365,6 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { - buildStatic = strToBool(arg.substring(opt.length + 1, arg.length)); - else if (opt == "prefix") - buildPrefix = arg.substring(opt.length + 1, arg.length); -- else if (opt == "incdir") -- buildIncPrefix = arg.substring(opt.length + 1, arg.length); - else if (opt == "bindir") - buildBinPrefix = arg.substring(opt.length + 1, arg.length); - else if (opt == "libdir") diff --git a/ports/libxslt/cmake.patch b/ports/libxslt/cmake.patch new file mode 100644 index 00000000000000..71655e166b8166 --- /dev/null +++ b/ports/libxslt/cmake.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d8679fb7f..ca21a7a3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,10 +36,10 @@ if(LIBXSLT_WITH_PYTHON) + if(HAVE_UNISTD_H AND HAVE_F_GETFL) + find_package(Python COMPONENTS Interpreter Development REQUIRED) + else() +- find_package(Python2 COMPONENTS Interpreter Development REQUIRED) +- add_library(Python::Python ALIAS Python2::Python) +- set(Python_EXECUTABLE ${Python2_EXECUTABLE}) +- set(Python_SITEARCH ${Python2_SITEARCH}) ++ find_package(Python3 COMPONENTS Interpreter Development REQUIRED) ++ add_library(Python::Python ALIAS Python3::Python) ++ set(Python_EXECUTABLE ${Python3_EXECUTABLE}) ++ set(Python_SITEARCH ${Python3_SITEARCH}) + endif() + set(LIBXSLT_PYTHON_INSTALL_DIR ${Python_SITEARCH} CACHE PATH "Python bindings install directory") + endif() +@@ -244,7 +244,7 @@ set_target_properties( + VERSION ${PROJECT_VERSION} + ) + +-if(MSVC) ++if(0) # Never add suffixes which are not added by the autotools build or the nmake makefiles + if(BUILD_SHARED_LIBS) + set_target_properties( + LibXslt +@@ -327,7 +327,7 @@ set_target_properties( + VERSION ${LIBEXSLT_VERSION} + ) + +-if(MSVC) ++if(0) # same reason as above + if(BUILD_SHARED_LIBS) + set_target_properties( + LibExslt +diff --git a/libexslt.pc.in b/libexslt.pc.in +index 1d605639a..c3a1edb00 100644 +--- a/libexslt.pc.in ++++ b/libexslt.pc.in +@@ -7,7 +7,7 @@ includedir=@includedir@ + Name: libexslt + Version: @LIBEXSLT_VERSION@ + Description: EXSLT Extension library +-Requires: libxml-2.0, libxslt ++Requires: libxml-2.0 libxslt + Cflags: @EXSLT_INCLUDEDIR@ + Libs: @EXSLT_LIBDIR@ -lexslt + Libs.private: @EXSLT_PRIVATE_LIBS@ diff --git a/ports/libxslt/only_build_one_lib_type.patch b/ports/libxslt/only_build_one_lib_type.patch deleted file mode 100644 index ae1ef8a421b289..00000000000000 --- a/ports/libxslt/only_build_one_lib_type.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc -index f803a747c..f43a54f51 100644 ---- a/win32/Makefile.msvc -+++ b/win32/Makefile.msvc -@@ -163,7 +163,11 @@ _VC_MANIFEST_EMBED_EXE= - _VC_MANIFEST_EMBED_DLL= - !endif - --all : libxslt libxslta libexslt libexslta utils -+!if "$(STATIC)" == "1" -+all : libxslta libexslta utils -+!else -+all : libxslt libexslt utils -+!endif - - libxslt : $(BINDIR)\$(XSLT_SO) - -@@ -196,12 +200,15 @@ install-libs : all - if not exist $(LIBPREFIX) mkdir $(LIBPREFIX) - copy $(XSLT_SRCDIR)\*.h $(INCPREFIX)\$(XSLT_BASENAME) - copy $(EXSLT_SRCDIR)\*.h $(INCPREFIX)\$(EXSLT_BASENAME) -+!if "$(STATIC)" != "1" - copy $(BINDIR)\$(XSLT_SO) $(SOPREFIX) -- copy $(BINDIR)\$(XSLT_A) $(LIBPREFIX) - copy $(BINDIR)\$(XSLT_IMP) $(LIBPREFIX) - copy $(BINDIR)\$(EXSLT_SO) $(SOPREFIX) -- copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX) - copy $(BINDIR)\$(EXSLT_IMP) $(LIBPREFIX) -+!else -+ copy $(BINDIR)\$(XSLT_A) $(LIBPREFIX) -+ copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX) -+!endif - - install : install-libs - copy $(BINDIR)\*.exe $(BINPREFIX) -@@ -313,7 +320,6 @@ $(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) $(EXSLT_INTDIR)\$(EXSLT_DEF) lib - $(BINDIR)\$(EXSLT_A) : $(BINDIR) $(EXSLT_OBJS_A) libxslta - $(AR) $(ARFLAGS) /OUT:$(BINDIR)\$(EXSLT_A) $(EXSLT_OBJS_A) - -- - # Creates the utils intermediate directory. - $(UTILS_INTDIR) : - if not exist $(UTILS_INTDIR) mkdir $(UTILS_INTDIR) -@@ -336,7 +342,11 @@ APPLIBS = $(LIBS) libxml2.lib - !endif - - # Builds xsltproc and friends. Uses the implicit rule for commands. --$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslt libxslta libexslt libexslta -+!if "$(STATIC)" == "1" -+$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslta libexslta -+!else -+$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslt libexslt -+!endif - - # plugins only work with non-static builds currently. - !if "$(STATIC)" == "0" diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 3e8917227a65c4..7b94c792b35d65 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -1,185 +1,63 @@ -vcpkg_download_distfile( - PATCH_e2584eed1c84c18f16e42188c30d2c3d8e3e8853 - URLS "https://github.com/GNOME/libxslt/commit/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch" - FILENAME e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch - SHA512 d08a06616d732993f2131826ca06fafc2e9f561cb1edb17eaf2adaf78e276bb03cba92a773143eb939da04781f5b5e0a09b351d8e4622a941de3cb3d11da731c -) - # Get this value from configure.ac:21 set(LIBEXSLT_VERSION 0.8.20) -set(VERSION 1.1.34) +set(VERSION 1.1.35) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxslt REF v${VERSION} - SHA512 fc57affb236e5f7602ee53c8090a854c6b950d1e6526ae3488bca41d8d421ec70433d88eb227c71c2a61213bc364517bdad907125e36486da1754fe9e460601f + SHA512 1ab264a8d3996d74a89a22e4062950ef968b9252736e0b5f975e6f45d63a6484993fe383b85831cef0e4b9c9c90f9b2b3d5432c15ee9381dbaeb2fa681ab9b46 HEAD_REF master PATCHES - "${PATCH_e2584eed1c84c18f16e42188c30d2c3d8e3e8853}" - 0001-Fix-makefile.patch - 0002-Fix-lzma.patch - 0003-Fix-configure.patch - only_build_one_lib_type.patch - require-dependencies.patch + cmake.patch ) -if (VCPKG_TARGET_IS_WINDOWS) - # Create some directories ourselves, because the makefile doesn't - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() - set(CONFIGURE_COMMAND_TEMPLATE - cruntime=@CRUNTIME@ - static=@BUILDSTATIC@ - debug=@DEBUGMODE@ - prefix=@INSTALL_DIR@ - include=@INCLUDE_DIR@ - lib=@LIB_DIR@ - bindir=$(PREFIX)\\bin - sodir=$(PREFIX)\\bin - zlib=yes - lzma=yes - ) - - # Common - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILDSTATIC yes) - else() - set(BUILDSTATIC no) - endif() - - # Release params - if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(CRUNTIME /MD) - else() - set(CRUNTIME /MT) - endif() - set(DEBUGMODE no) - set(LIB_DIR "${CURRENT_INSTALLED_DIR}/lib") - set(INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") - set(INSTALL_DIR "${CURRENT_PACKAGES_DIR}") - file(TO_NATIVE_PATH "${LIB_DIR}" LIB_DIR) - file(TO_NATIVE_PATH "${INCLUDE_DIR}" INCLUDE_DIR) - file(TO_NATIVE_PATH "${INSTALL_DIR}" INSTALL_DIR) - string(CONFIGURE "${CONFIGURE_COMMAND_TEMPLATE}" CONFIGURE_COMMAND_REL) - - # Debug params - if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(CRUNTIME /MDd) - else() - set(CRUNTIME /MTd) - endif() - set(DEBUGMODE yes) - set(LIB_DIR "${CURRENT_INSTALLED_DIR}/debug/lib") - set(INSTALL_DIR "${CURRENT_PACKAGES_DIR}/debug") - file(TO_NATIVE_PATH "${LIB_DIR}" LIB_DIR) - file(TO_NATIVE_PATH "${INSTALL_DIR}" INSTALL_DIR) - string(CONFIGURE "${CONFIGURE_COMMAND_TEMPLATE}" CONFIGURE_COMMAND_DBG) - - vcpkg_install_nmake( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH win32 - PROJECT_NAME Makefile.msvc - PRERUN_SHELL_DEBUG cscript configure.js ${CONFIGURE_COMMAND_DBG} - PRERUN_SHELL_RELEASE cscript configure.js ${CONFIGURE_COMMAND_REL} - OPTIONS rebuild - ) - - vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) - - # The makefile builds both static and dynamic libraries, so remove the ones we don't want - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - else() - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - # Rename the libs to match the dynamic lib names - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - if(NOT VCPKG_BUILD_TYPE) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - endif() - endif() - - set(prefix "") - set(exec_prefix "") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/include") - set(XSLT_INCLUDEDIR "-I\${includedir}") - set(XSLT_LIBDIR "-L\${libdir}") - set(XSLT_LIBS "-lxslt") - set(XSLT_PRIVATE_LIBS "") - set(EXSLT_INCLUDEDIR "-I\${includedir}") - set(EXSLT_LIBDIR "-L\${libdir}") - set(EXSLT_LIBS "-lexslt") - set(EXSLT_PRIVATE_LIBS "") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") - configure_file("${SOURCE_PATH}/libxslt.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" "\nRequires: " "\nRequires: liblzma ") - configure_file("${SOURCE_PATH}/libexslt.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" "\nRequires: " "\nRequires: libxslt ") - if(NOT VCPKG_BUILD_TYPE) - file(COPY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - endif() -else() - if("python" IN_LIST FEATURES) - vcpkg_find_acquire_program(PYTHON3) - set(OPTION_PYTHON "--with-python=${PYTHON3}") - else() - set(OPTION_PYTHON "--without-python") - endif() - if ("plugins" IN_LIST FEATURES) - set(OPTION_PLUGINS "--with-plugins") - else() - set(OPTION_PLUGINS "--without-plugins") - endif() - if("crypto" IN_LIST FEATURES) - vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/tools/libgcrypt/bin") - set(OPTION_CRYPTO "--with-crypto") - else() - set(OPTION_CRYPTO "--without-crypto") - endif() - - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - OPTIONS - ${OPTION_PYTHON} - ${OPTION_PLUGINS} - ${OPTION_CRYPTO} - OPTIONS_DEBUG - --with-mem-debug - --with-debug - --with-debugger +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "python" LIBXSLT_WITH_PYTHON + "crypto" LIBXSLT_WITH_CRYPTO +) +if("python" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND FEATURE_OPTIONS "-DPYTHON_EXECUTABLE=${PYTHON3}") + list(APPEND FEATURE_OPTIONS_RELEASE "-DLIBXSLT_PYTHON_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/site-packages") + list(APPEND FEATURE_OPTIONS_DEBUG "-DLIBXSLT_PYTHON_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/site-packages") +endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBXSLT_WITH_TESTS:BOOL=OFF + -DLIBXSLT_WITH_THREADS:BOOL=ON + OPTIONS_RELEASE + ${FEATURE_OPTIONS_RELEASE} + -DLIBXSLT_WITH_XSLT_DEBUG:BOOL=OFF + -DLIBXSLT_WITH_MEM_DEBUG:BOOL=OFF + -DLIBXSLT_WITH_DEBUGGER:BOOL=OFF + OPTIONS_DEBUG + ${FEATURE_OPTIONS_DEBUG} + -DLIBXSLT_WITH_XSLT_DEBUG:BOOL=ON + -DLIBXSLT_WITH_MEM_DEBUG:BOOL=ON + -DLIBXSLT_WITH_DEBUGGER:BOOL=ON ) - - vcpkg_install_make() - - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/xsltConf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xsltConf.sh") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libxslt-plugins" "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt-plugins") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/aclocal") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/doc") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/man1") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/man3") - - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") - if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../../") - endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}-${VERSION}") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/xsltConf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xsltConf.sh") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt/bin") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../../") endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "") +vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# -# Cleanup -# - # You have to define LIB(E)XSLT_STATIC or not, depending on how you link file(READ "${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" XSLTEXPORTS_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -202,3 +80,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libxslt") diff --git a/ports/libxslt/require-dependencies.patch b/ports/libxslt/require-dependencies.patch deleted file mode 100644 index 8bf85366576382..00000000000000 --- a/ports/libxslt/require-dependencies.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -240,12 +240,13 @@ - else - if test -x "$with_python" - then - echo Found python in $with_python - PYTHON="$with_python" - else -+ AC_MSG_ERROR([Python not found; --with-python should be set to the python path]) - if test -x "$PYTHON" - then - echo Found python in environment PYTHON=$PYTHON - with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` - else - AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) -@@ -333,25 +334,25 @@ - if test "$LIBGCRYPT_CONFIG" != "no" ; then - LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version` - if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42") - then - LIBGCRYPT_CFLAGS="" - LIBGCRYPT_LIBS="" -- echo 'gcrypt library version < 1.1.42 - Crypto extensions will not be available.' -+ AC_MSG_ERROR([gcrypt library version < 1.1.42 - this is an error]) - else - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags` - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs` - AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.]) - echo 'Crypto extensions will be available.' - WITH_CRYPTO=1 - CRYPTO_TESTDIR=crypto - fi - else - LIBGCRYPT_CFLAGS="" - LIBGCRYPT_LIBS="" -- echo 'Crypto extensions will not be available. Install libgcrypt and reconfigure to make available.' -+ AC_MSG_ERROR([libgcrypt not found - this is a bug in the vcpkg port]) - fi - esac - fi - AC_SUBST(WITH_CRYPTO) - AC_SUBST(CRYPTO_TESTDIR) - AC_SUBST(LIBGCRYPT_CFLAGS) diff --git a/ports/libxslt/vcpkg-cmake-wrapper.cmake b/ports/libxslt/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..b7e5ecdfa786de --- /dev/null +++ b/ports/libxslt/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,5 @@ +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +_find_package(${ARGS} CONFIG) diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index 1912a492fd814c..d40c6928208859 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,21 +1,28 @@ { "name": "libxslt", - "version": "1.1.34", - "port-version": 5, + "version": "1.1.35", "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "license": null, "supports": "!uwp", "dependencies": [ "liblzma", - "libxml2" + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "default-features" ], "features": { "crypto": { - "description": "Build with crypto support (--with-crypto)", + "description": "Build with crypto support", "supports": "mingw | !windows", "dependencies": [ { @@ -38,10 +45,12 @@ ] }, "plugins": { - "description": "Build with plugins (--with-plugins)" + "description": "(deprecated)", + "supports": "!static" }, "python": { - "description": "Builds with python support (--with-python)" + "description": "Builds with python support", + "supports": "mingw | !windows" } } } diff --git a/versions/baseline.json b/versions/baseline.json index f1cca4b7fd2cf2..40876d5d941add 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4209,8 +4209,8 @@ "port-version": 8 }, "libxslt": { - "baseline": "1.1.34", - "port-version": 5 + "baseline": "1.1.35", + "port-version": 0 }, "libyaml": { "baseline": "0.2.5", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index f1d753a3ea288a..76b41132300106 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6fe77f9ea62ee9e22769ffd1ae0f28229df2a50", + "version": "1.1.35", + "port-version": 0 + }, { "git-tree": "063e2e6a6b9ef700f0c2587d2def57eb0e2285e6", "version": "1.1.34", From 8da5d2b4503b3100b6b7bb26ffeeefd0e8a25799 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 19 May 2022 23:43:34 +0200 Subject: [PATCH 299/383] [OpenJPEG] Update to 2.5.0 (#24734) * update openjpeg * update openjpeg * add arm patch and license * reduce to version * update db * fix fastcgi to always use make * remove from baseline * openjpeg add tools feature * vdb * add supports statement. fastcgi uses stuff which only is allowed in desktop apps. * format manfiest * ver db Co-authored-by: Billy Robert O'Neal III --- ports/fastcgi/dll.patch | 109 ++++++++++++++++++ ports/fastcgi/portfile.cmake | 84 +++++--------- ports/fastcgi/vcpkg.json | 5 +- .../Enable-tools-of-each-features.patch | 13 --- ports/openjpeg/arm.patch | 13 +++ ports/openjpeg/dll.location.patch | 32 ----- ports/openjpeg/fix-lrintf-to-opj_lrintf.patch | 13 --- ports/openjpeg/fix-static.patch | 59 ++++++++++ ports/openjpeg/no-wx.patch | 10 ++ ports/openjpeg/portfile.cmake | 37 +++--- ports/openjpeg/vcpkg.json | 25 +++- scripts/ci.baseline.txt | 1 - versions/baseline.json | 4 +- versions/f-/fastcgi.json | 5 + versions/o-/openjpeg.json | 5 + 15 files changed, 274 insertions(+), 141 deletions(-) create mode 100644 ports/fastcgi/dll.patch delete mode 100644 ports/openjpeg/Enable-tools-of-each-features.patch create mode 100644 ports/openjpeg/arm.patch delete mode 100644 ports/openjpeg/dll.location.patch delete mode 100644 ports/openjpeg/fix-lrintf-to-opj_lrintf.patch create mode 100644 ports/openjpeg/fix-static.patch create mode 100644 ports/openjpeg/no-wx.patch diff --git a/ports/fastcgi/dll.patch b/ports/fastcgi/dll.patch new file mode 100644 index 00000000000000..14e94faeff6e31 --- /dev/null +++ b/ports/fastcgi/dll.patch @@ -0,0 +1,109 @@ +diff --git a/include/fcgi_stdio.h b/include/fcgi_stdio.h +index 6d242f36f..ec57131ce 100644 +--- a/include/fcgi_stdio.h ++++ b/include/fcgi_stdio.h +@@ -23,14 +23,6 @@ + extern "C" { + #endif + +-#ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif +-#endif +- + /* + * Wrapper type for FILE + */ +diff --git a/include/fcgiapp.h b/include/fcgiapp.h +index 8cadde16d..9b034def3 100644 +--- a/include/fcgiapp.h ++++ b/include/fcgiapp.h +@@ -23,11 +23,19 @@ + #endif + + #ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif ++# if defined (_WIN32) && defined (_MSC_VER) ++# if defined(DLL_EXPORT) && defined(LIBFCGI_BUILD) ++# define DLLAPI __declspec(dllexport) ++# else ++# ifdef LIBFCGI_DLL_IMPORT ++# define DLLAPI extern __declspec(dllimport) ++# else ++# define DLLAPI ++# endif ++# endif ++# else ++# define DLLAPI ++# endif + #endif + + #if defined (c_plusplus) || defined (__cplusplus) +diff --git a/include/fcgio.h b/include/fcgio.h +index ce8b930a8..81981974a 100644 +--- a/include/fcgio.h ++++ b/include/fcgio.h +@@ -34,14 +34,6 @@ + + #include "fcgiapp.h" + +-#ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif +-#endif +- + #if ! HAVE_STREAMBUF_CHAR_TYPE + typedef char char_type; + #endif +diff --git a/include/fcgios.h b/include/fcgios.h +index 206973137..7a2f5333a 100644 +--- a/include/fcgios.h ++++ b/include/fcgios.h +@@ -50,11 +50,19 @@ extern "C" { + #endif /* !_WIN32 */ + + #ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif ++# if defined (_WIN32) && defined (_MSC_VER) ++# if defined(DLL_EXPORT) && defined(LIBFCGI_BUILD) ++# define DLLAPI __declspec(dllexport) ++# else ++# ifdef LIBFCGI_DLL_IMPORT ++# define DLLAPI extern __declspec(dllimport) ++# else ++# define DLLAPI ++# endif ++# endif ++# else ++# define DLLAPI ++# endif + #endif + + +diff --git a/libfcgi/Makefile.am b/libfcgi/Makefile.am +index 42d507253..26f06f550 100644 +--- a/libfcgi/Makefile.am ++++ b/libfcgi/Makefile.am +@@ -1,7 +1,7 @@ + # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $ + + INCLUDEDIR = ../include +-AM_CPPFLAGS = -I$(top_srcdir)/include -W -Wall -pedantic -Wno-unused-parameter ++AM_CPPFLAGS = -I$(top_srcdir)/include -DLIBFCGI_BUILD + + INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ + $(INCLUDEDIR)/fcgiapp.h \ diff --git a/ports/fastcgi/portfile.cmake b/ports/fastcgi/portfile.cmake index 27b8c85cc04b3d..56fa6f8630f30e 100644 --- a/ports/fastcgi/portfile.cmake +++ b/ports/fastcgi/portfile.cmake @@ -4,70 +4,44 @@ vcpkg_from_github( REF fc8c6547ae38faf9926205a23075c47fbd4370c8 SHA512 7f27b1060fbeaf0de9b8a43aa4ff954a004c49e99f7d6ea11119a438fcffe575fb469ba06262e71ac8132f92e74189e2097fd049595a6a61d4d5a5bac2733f7a HEAD_REF master + PATCHES + dll.patch ) -if (VCPKG_TARGET_IS_WINDOWS) - # Check build system first - find_program(NMAKE nmake REQUIRED) - - list(APPEND NMAKE_OPTIONS_REL - CFG=release - ) - - list(APPEND NMAKE_OPTIONS_DBG - CFG=debug - ) +# Check build system first +if(VCPKG_TARGET_IS_OSX) + message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n\nIt can be installed with brew install gettext automake libtool") +elseif(NOT VCPKG_TARGET_IS_WINDOWS) + message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n libtool-bin\n\nIt can be installed with apt-get install gettext automake libtool libtool-bin") +endif() - file(RENAME "${SOURCE_PATH}/include/fcgi_config_x86.h" "${SOURCE_PATH}/include/fcgi_config.h") - vcpkg_build_nmake( +vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH libfcgi - PROJECT_NAME libfcgi.mak - OPTIONS_RELEASE - "${NMAKE_OPTIONS_REL}" - OPTIONS_DEBUG - "${NMAKE_OPTIONS_DBG}" - ) - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME ${PORT}) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - if (NOT VCPKG_CRT_LINKAGE STREQUAL static) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - endif() - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - if (NOT VCPKG_CRT_LINKAGE STREQUAL static) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() - endif() -elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX - # Check build system first - if(VCPKG_TARGET_IS_OSX) - message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n\nIt can be installed with brew install gettext automake libtool") - else() - message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n libtool-bin\n\nIt can be installed with apt-get install gettext automake libtool libtool-bin") - endif() + AUTOCONFIG + COPY_SOURCE + OPTIONS + --disable-examples +) - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - COPY_SOURCE - ) +vcpkg_install_make() - vcpkg_install_make() +# switch ${PORT} into /${PORT} +file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/${PORT}") - # switch ${PORT} into /${PORT} - file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") - file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/fcgi.pc" "Version: 2.4.2\n" "Version: 2.4.2\nCflags: -I\"\${prefix}/include/fastcgi\"\n") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fcgi.pc" "Version: 2.4.2\n" "Version: 2.4.2\nCflags: -I\"\${prefix}/../include/fastcgi\"\n") +endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - vcpkg_fixup_pkgconfig() -else() # Other build system - message(FATAL_ERROR "fastcgi only supports Windows, Linux, and MacOS.") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/fcgiapp.h" "ifdef LIBFCGI_DLL_IMPORT" "if 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/fcgios.h" "ifdef LIBFCGI_DLL_IMPORT" "if 1") endif() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.TERMS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fastcgi/vcpkg.json b/ports/fastcgi/vcpkg.json index 035242158dbfe3..a85856361b4f75 100644 --- a/ports/fastcgi/vcpkg.json +++ b/ports/fastcgi/vcpkg.json @@ -1,8 +1,9 @@ { "name": "fastcgi", "version-date": "2020-09-11", - "port-version": 4, + "port-version": 5, "description": "The FastCGI interface combines the best aspects of CGI and vendor APIs. Like CGI, FastCGI applications run in separate, isolated processes.", "homepage": "https://fastcgi-archives.github.io/", - "license": "OML" + "license": "OML", + "supports": "!uwp" } diff --git a/ports/openjpeg/Enable-tools-of-each-features.patch b/ports/openjpeg/Enable-tools-of-each-features.patch deleted file mode 100644 index cce376596cc3c0..00000000000000 --- a/ports/openjpeg/Enable-tools-of-each-features.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a41078..747c61c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -277,7 +277,7 @@ mark_as_advanced(BUILD_VIEWER) - mark_as_advanced(BUILD_JAVA) - mark_as_advanced(BUILD_JP3D) - --if(BUILD_CODEC OR BUILD_MJ2) -+if(BUILD_CODEC OR BUILD_JPWL OR BUILD_MJ2 OR BUILD_JPIP OR BUILD_JP3D) - # OFF: It will only build 3rd party libs if they are not found on the system - # ON: 3rd party libs will ALWAYS be build, and used - option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF) diff --git a/ports/openjpeg/arm.patch b/ports/openjpeg/arm.patch new file mode 100644 index 00000000000000..357d33e0feca1e --- /dev/null +++ b/ports/openjpeg/arm.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/openjp2/ht_dec.c b/src/lib/openjp2/ht_dec.c +index 1eb4d525f..e2f3afd6a 100644 +--- a/src/lib/openjp2/ht_dec.c ++++ b/src/lib/openjp2/ht_dec.c +@@ -69,7 +69,7 @@ static OPJ_BOOL only_cleanup_pass_is_decoded = OPJ_FALSE; + static INLINE + OPJ_UINT32 population_count(OPJ_UINT32 val) + { +-#ifdef OPJ_COMPILER_MSVC ++#if defined(OPJ_COMPILER_MSVC) && (defined(_M_IX86) || defined(_M_AMD64)) + return (OPJ_UINT32)__popcnt(val); + #elif (defined OPJ_COMPILER_GNUC) + return (OPJ_UINT32)__builtin_popcount(val); diff --git a/ports/openjpeg/dll.location.patch b/ports/openjpeg/dll.location.patch deleted file mode 100644 index bdc77a5427c31d..00000000000000 --- a/ports/openjpeg/dll.location.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt -index b0469af1f..75048ef13 100644 ---- a/src/lib/openjp3d/CMakeLists.txt -+++ b/src/lib/openjp3d/CMakeLists.txt -@@ -34,8 +34,9 @@ endif() - # Install library - install(TARGETS ${OPENJP3D_LIBRARY_NAME} - EXPORT OpenJP3DTargets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} -- COMPONENT Libraries -+ RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries - ) - - # Install includes files -diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt -index 25294b20e..e3acfe8e7 100644 ---- a/src/lib/openmj2/CMakeLists.txt -+++ b/src/lib/openmj2/CMakeLists.txt -@@ -53,8 +53,9 @@ endif() - # Install library - install(TARGETS ${OPENMJ2_LIBRARY_NAME} - EXPORT OpenMJ2Targets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} -- COMPONENT Libraries -+ RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries - ) - - # Install includes files diff --git a/ports/openjpeg/fix-lrintf-to-opj_lrintf.patch b/ports/openjpeg/fix-lrintf-to-opj_lrintf.patch deleted file mode 100644 index 1d79d6332e2fc4..00000000000000 --- a/ports/openjpeg/fix-lrintf-to-opj_lrintf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib/openmj2/opj_includes.h b/src/lib/openmj2/opj_includes.h -index 340e8a9..11bb0e4 100644 ---- a/src/lib/openmj2/opj_includes.h -+++ b/src/lib/openmj2/opj_includes.h -@@ -93,7 +93,7 @@ Most compilers implement their own version of this keyword ... - - /* MSVC and Borland C do not have lrintf */ - #if defined(_MSC_VER) || defined(__BORLANDC__) --static INLINE long lrintf(float f) -+static INLINE long opj_lrintf(float f) - { - #ifdef _M_X64 - return (long)((f > 0.0f) ? (f + 0.5f) : (f - 0.5f)); diff --git a/ports/openjpeg/fix-static.patch b/ports/openjpeg/fix-static.patch new file mode 100644 index 00000000000000..1101e2d9530d43 --- /dev/null +++ b/ports/openjpeg/fix-static.patch @@ -0,0 +1,59 @@ +diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt +index 4d4bd952f..e14b5a692 100644 +--- a/src/bin/jp2/CMakeLists.txt ++++ b/src/bin/jp2/CMakeLists.txt +@@ -33,14 +33,6 @@ include_directories( + ${TIFF_INCLUDE_DIRNAME} + ) + +-if(WIN32) +- if(BUILD_SHARED_LIBS) +- add_definitions(-DOPJ_EXPORTS) +- else() +- add_definitions(-DOPJ_STATIC) +- endif() +-endif() +- + # Loop over all executables: + foreach(exe opj_decompress opj_compress opj_dump) + add_executable(${exe} ${exe}.c ${common_SRCS}) +diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt +index ea4131a3e..dc63f49dd 100644 +--- a/src/lib/openjp2/CMakeLists.txt ++++ b/src/lib/openjp2/CMakeLists.txt +@@ -84,12 +84,12 @@ endif() + + # Build the library + if(WIN32) ++ add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) + if(BUILD_SHARED_LIBS) + add_definitions(-DOPJ_EXPORTS) + else() +- add_definitions(-DOPJ_STATIC) ++ target_compile_definitions(${OPENJPEG_LIBRARY_NAME} PUBLIC OPJ_STATIC) + endif() +- add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) + set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) + else() + if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) +diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt +index b3cb8ce88..fc6a9dde3 100644 +--- a/src/lib/openjpip/CMakeLists.txt ++++ b/src/lib/openjpip/CMakeLists.txt +@@ -52,14 +52,14 @@ set(LOCAL_SRCS + ) + + # Build the library ++add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) + if(WIN32) + if(BUILD_SHARED_LIBS) + add_definitions(-DOPJ_EXPORTS) + else() +- add_definitions(-DOPJ_STATIC) ++ target_compile_definitions(openjpip PUBLIC OPJ_STATIC) + endif() + endif() +-add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) + set_target_properties(openjpip + PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) + if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12") diff --git a/ports/openjpeg/no-wx.patch b/ports/openjpeg/no-wx.patch new file mode 100644 index 00000000000000..d01844492f520f --- /dev/null +++ b/ports/openjpeg/no-wx.patch @@ -0,0 +1,10 @@ +diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt +index 292fe5a71..bcbe94160 100644 +--- a/src/bin/CMakeLists.txt ++++ b/src/bin/CMakeLists.txt +@@ -9,4 +9,4 @@ if(BUILD_JPIP) + endif() + + # wx apps: +-add_subdirectory(wx) ++# add_subdirectory(wx) diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake index 195ff13a76d531..a23bd58bb9332d 100644 --- a/ports/openjpeg/portfile.cmake +++ b/ports/openjpeg/portfile.cmake @@ -1,23 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uclouvain/openjpeg - REF 37ac30ceff6640bbab502388c5e0fa0bff23f505 #v2.4.0 - SHA512 7554d64701f1b51501a977bc165e61e4696d97f1f40e4c784c729824878a716c13ac378c6b2dd0d23a11d9e3fa316ff6fc817ca5a614ef4d6530db06a8f83971 + REF a5891555eb49ed7cc26b2901ea680acda136d811 #v2.5.0 + SHA512 f388d5770445152cd5ed18c61d2a56a6d2b88c2b56db0d460d09be36f3e6e40cf5be505aa63ac5975e07688be3dfe752080f4939bd792d42c61f4f8ddcaa1f0d HEAD_REF master - PATCHES - dll.location.patch - fix-lrintf-to-opj_lrintf.patch - Enable-tools-of-each-features.patch + PATCHES + arm.patch + no-wx.patch + fix-static.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(feature_tools "tools" BUILD_JPIP_SERVER) # Requires pthread + if("tools" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DFCGI_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/fastcgi") + endif() +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "jpwl" BUILD_JPWL - "mj2" BUILD_MJ2 "jpip" BUILD_JPIP - "jp3d" BUILD_JP3D + ${feature_tools} + "tools" BUILD_VIEWER + "tools" BUILD_CODEC + "tools" BUILD_LUTS_GENERATOR ) vcpkg_cmake_configure( @@ -53,18 +61,9 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") set(TOOL_NAMES) -if("jpwl" IN_LIST FEATURES) - list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_jpwl_compress opj_jpwl_decompress) -endif() -if("mj2" IN_LIST FEATURES) - list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_mj2_compress opj_mj2_decompress opj_mj2_extract opj_mj2_wrap) -endif() -if("jpip" IN_LIST FEATURES) +if("tools" IN_LIST FEATURES) list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_dec_server opj_jpip_addxml opj_jpip_test opj_jpip_transcode) endif() -if("jp3d" IN_LIST FEATURES) - list(APPEND TOOL_NAMES opj_jp3d_compress opj_jp3d_decompress) -endif() if(TOOL_NAMES) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) endif() diff --git a/ports/openjpeg/vcpkg.json b/ports/openjpeg/vcpkg.json index 031f12a4462e0f..be472aca99f8db 100644 --- a/ports/openjpeg/vcpkg.json +++ b/ports/openjpeg/vcpkg.json @@ -1,8 +1,9 @@ { "name": "openjpeg", - "version-semver": "2.4.0", + "version": "2.5.0", "description": "OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, a still-image compression standard from the Joint Photographic Experts Group (JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a JPEG 2000 Reference Software.", "homepage": "https://github.com/uclouvain/openjpeg", + "license": "BSD-2-Clause", "dependencies": [ { "name": "vcpkg-cmake", @@ -15,16 +16,32 @@ ], "features": { "jp3d": { - "description": "Build optional component jp3d" + "description": "(deprecated)" }, "jpip": { "description": "Build optional component jpip" }, "jpwl": { - "description": "Build optional component jpwl" + "description": "(deprecated)" }, "mj2": { - "description": "Build optional component mj2" + "description": "(deprecated)" + }, + "tools": { + "description": "(deprecated)", + "dependencies": [ + { + "name": "curl", + "platform": "!windows" + }, + { + "name": "fastcgi", + "platform": "!windows" + }, + "lcms", + "tiff", + "zlib" + ] } } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5130762e498a53..badbf8f376d987 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1262,7 +1262,6 @@ lapack-reference:x64-uwp=skip # failures for x64-windows-static-md ace:x64-windows-static-md=fail -fastcgi:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail libmicrohttpd:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index 40876d5d941add..87bf58967498bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2166,7 +2166,7 @@ }, "fastcgi": { "baseline": "2020-09-11", - "port-version": 4 + "port-version": 5 }, "fastfeat": { "baseline": "391d5e9", @@ -5149,7 +5149,7 @@ "port-version": 4 }, "openjpeg": { - "baseline": "2.4.0", + "baseline": "2.5.0", "port-version": 0 }, "openmama": { diff --git a/versions/f-/fastcgi.json b/versions/f-/fastcgi.json index 3f2460989a7982..bd95595477aaa8 100644 --- a/versions/f-/fastcgi.json +++ b/versions/f-/fastcgi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7aebdd65d1551d946470d43413d5265d409df3e7", + "version-date": "2020-09-11", + "port-version": 5 + }, { "git-tree": "8a8f47edb8fc80608665c48ace9195e2334c3b6e", "version-date": "2020-09-11", diff --git a/versions/o-/openjpeg.json b/versions/o-/openjpeg.json index d85518d381dfcc..e49ff61f40fb27 100644 --- a/versions/o-/openjpeg.json +++ b/versions/o-/openjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3451436f9bb5f5ad8946b45868929488fe2c39dd", + "version": "2.5.0", + "port-version": 0 + }, { "git-tree": "ffb3c981c0026662feded28db73c177a739773d2", "version-semver": "2.4.0", From 7e3dcf74e37034eea358934a90a11d618520e139 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 20 May 2022 04:47:05 +0200 Subject: [PATCH 300/383] Fix `vcpkg_host_path` and its unit test (#24808) * Fix vcpkg_host_path unit test * Fix unit test variable control * Enable all test features by default * Fix recognition of PREPEND * CMake doesn't set env vars to empty value * Remove pointless STATUS message --- scripts/cmake/vcpkg_host_path_list.cmake | 2 +- .../test_ports/unit-test-cmake/portfile.cmake | 5 +- .../test-vcpkg_host_path_list.cmake | 66 ++++++++++++------- scripts/test_ports/unit-test-cmake/vcpkg.json | 8 ++- 4 files changed, 50 insertions(+), 31 deletions(-) diff --git a/scripts/cmake/vcpkg_host_path_list.cmake b/scripts/cmake/vcpkg_host_path_list.cmake index 3495e803f877e7..316793143b58fc 100644 --- a/scripts/cmake/vcpkg_host_path_list.cmake +++ b/scripts/cmake/vcpkg_host_path_list.cmake @@ -78,7 +78,7 @@ function(vcpkg_host_path_list) # do nothing elseif("${list}" STREQUAL "") set(list "${arguments}") - elseif(arg_PREPEND) + elseif("${operation}" STREQUAL "PREPEND") set(list "${arguments}${VCPKG_HOST_PATH_SEPARATOR}${list}") else() set(list "${list}${VCPKG_HOST_PATH_SEPARATOR}${arguments}") diff --git a/scripts/test_ports/unit-test-cmake/portfile.cmake b/scripts/test_ports/unit-test-cmake/portfile.cmake index d506ebaf66374a..96cc06f63c6b2e 100644 --- a/scripts/test_ports/unit-test-cmake/portfile.cmake +++ b/scripts/test_ports/unit-test-cmake/portfile.cmake @@ -84,7 +84,7 @@ function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) return() endif() - if(NOT DEFINED "${utcve_variable}") + if(NOT DEFINED "${utcve_variable}" AND NOT "${utcve_variable}" MATCHES "^ENV\\{") message(STATUS "${utcve_test} failed to set ${utcve_variable}; expected: \"${utcve_value}\"") set_has_error() @@ -93,7 +93,6 @@ function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) unit_test_match(utcve "${utcve_variable}" [[^(ENV|CACHE)\{(.*)\}$]]) if(utcve_MATCHED) - message(STATUS "utcve_variable: ${utcve_CMAKE_MATCH_2}") if("${utcve_CMAKE_MATCH_1}" STREQUAL "ENV") set(utcve_actual_value "$ENV{${utcve_CMAKE_MATCH_2}}") elseif("${utcve_CMAKE_MATCH_1}" STREQUAL "CACHE") @@ -139,7 +138,7 @@ endif() if("list" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_list.cmake") endif() -if("add-to-path" IN_LIST FEATURES) +if("host-path-list" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_host_path_list.cmake") endif() if("function-arguments" IN_LIST FEATURES) diff --git a/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake b/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake index a6322d37556747..01d34da8232d26 100644 --- a/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake +++ b/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake @@ -15,14 +15,17 @@ unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var d e)]] var "a;b;d;e" ) +set(var "a;b") unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var)]] var "a;b" ) +set(var "a;b") unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var d e)]] var "d;e;a;b" ) +set(var "a;b") unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var)]] var "a;b" @@ -33,14 +36,17 @@ unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var d e)]] var "d;e" ) +set(var "") unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var)]] var "" ) +set(var "") unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var d e)]] var "d;e" ) +set(var "") unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var)]] var "" @@ -51,14 +57,17 @@ unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var d e)]] var "d;e" ) +unset(var) unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var)]] var "" ) +unset(var) unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var d e)]] var "d;e" ) +unset(var) unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var)]] var "" @@ -71,55 +80,64 @@ unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND var "a:b")]]) unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND var "a:b")]]) set(ENV{var} "a:b") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var} d e)]] ENV{var} "a:b:d:e" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "a:b") +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var})]] ENV{var} "a:b" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "a:b") +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] ENV{var} "d:e:a:b" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "a:b") +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var})]] ENV{var} "a:b" ) set(ENV{var} "") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var} d e)]] ENV{var} "d:e" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "") +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var})]] ENV{var} "" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "") +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] ENV{var} "d:e" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "") +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var})]] ENV{var} "" ) unset(ENV{var}) -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var} d e)]] ENV{var} "d:e" ) -unit_test_check_ENV{var}iable_equal( +unset(ENV{var}) +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var})]] ENV{var} "" ) -unit_test_check_ENV{var}iable_equal( +unset(ENV{var}) +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] ENV{var} "d:e" ) -unit_test_check_ENV{var}iable_equal( +unset(ENV{var}) +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var})]] ENV{var} "" ) @@ -131,64 +149,64 @@ unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND ENV{ENV{var}} "a;b")] unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND ENV{ENV{var}} "a;b")]]) set(ENV{ENV{var}} "a;b") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "a;b;d;e" ) set(ENV{ENV{var}} "a;b") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] ENV{ENV{var}} "a;b" ) set(ENV{ENV{var}} "a;b") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "d;e;a;b" ) set(ENV{ENV{var}} "a;b") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{ENV{var}})]] ENV{ENV{var}} "a;b" ) set(ENV{ENV{var}} "") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "d;e" ) set(ENV{ENV{var}} "") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] ENV{ENV{var}} "" ) set(ENV{ENV{var}} "") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "d;e" ) set(ENV{ENV{var}} "") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var})]] ENV{ENV{var}} "" ) unset(ENV{ENV{var}}) -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "d;e" ) unset(ENV{ENV{var}}) -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] ENV{ENV{var}} "" ) unset(ENV{ENV{var}}) -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "d;e" ) unset(ENV{ENV{var}}) -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{ENV{var}})]] ENV{ENV{var}} "" ) diff --git a/scripts/test_ports/unit-test-cmake/vcpkg.json b/scripts/test_ports/unit-test-cmake/vcpkg.json index 28cacbc8f34cf8..32696b4402e602 100644 --- a/scripts/test_ports/unit-test-cmake/vcpkg.json +++ b/scripts/test_ports/unit-test-cmake/vcpkg.json @@ -5,16 +5,18 @@ "supports": "x64", "default-features": [ "function-arguments", + "host-path-list", "list", + "merge-libs", "minimum-required" ], "features": { - "host-path-list": { - "description": "Test the vcpkg_host_path_list function" - }, "function-arguments": { "description": "Test the z_vcpkg_function_arguments function" }, + "host-path-list": { + "description": "Test the vcpkg_host_path_list function" + }, "list": { "description": "Test the vcpkg_list function" }, From 338c94d3420461b4671651c0068b2ce336d4b5af Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 20 May 2022 13:42:58 -0700 Subject: [PATCH 301/383] Move Azure Compute to eastasia (#24821) * Move to eastasia, and use smaller machine to mint images. * Update pools. * Switch storage accounts to eastasia --- scripts/azure-pipelines/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/linux/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/linux/create-image.ps1 | 8 ++++---- scripts/azure-pipelines/linux/create-vmss.ps1 | 2 +- scripts/azure-pipelines/osx/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/windows/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/windows/create-image.ps1 | 8 ++++---- scripts/azure-pipelines/windows/create-vmss.ps1 | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 5c0e9350a1cd1e..55407f184a69be 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2022-05-16' - linux-pool: 'PrLin-2022-05-16' + windows-pool: 'PrWin-2022-05-19' + linux-pool: 'PrLin-2022-05-19' osx-pool: 'PrOsx-2022-02-04' jobs: diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 5c50454b448686..92da1eea400821 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -16,10 +16,10 @@ jobs: value: /mnt/vcpkg-ci/downloads - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES - value: "x-azurl,$(root-url),$(sas),readwrite" + value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite" - group: vcpkg-binary-caching-credentials - name: X_VCPKG_BINARY_SOURCE_STUB - value: "x-azblob,$(root-bin-url),$(sas-bin)" + value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)" steps: - bash: df -h diff --git a/scripts/azure-pipelines/linux/create-image.ps1 b/scripts/azure-pipelines/linux/create-image.ps1 index d19bb673fa09bf..932d25aecde22b 100644 --- a/scripts/azure-pipelines/linux/create-image.ps1 +++ b/scripts/azure-pipelines/linux/create-image.ps1 @@ -15,10 +15,10 @@ or are running from Azure Cloud Shell. This script assumes you have installed the OpenSSH Client optional Windows component. #> -$Location = 'westus2' +$Location = 'eastasia' $Prefix = 'Lin-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D32as_v4' +$VMSize = 'Standard_D8a_v4' $ProtoVMName = 'PROTOTYPE' $ErrorActionPreference = 'Stop' @@ -89,7 +89,7 @@ $VM = Set-AzVMSourceImage ` -VM $VM ` -PublisherName 'Canonical' ` -Offer '0001-com-ubuntu-server-focal' ` - -Skus '20_04-lts-gen2' ` + -Skus '20_04-lts' ` -Version latest $VM = Set-AzVMBootDiagnostic -VM $VM -Disable @@ -159,7 +159,7 @@ Set-AzVM ` -Generalized $VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName -$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -HyperVGeneration 'V2' +$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID $ImageName = Find-ImageName -ResourceGroupName 'vcpkg-image-minting' -Prefix $Prefix New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName 'vcpkg-image-minting' diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index 08210cc0d18765..cbbb9b5af8937d 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -28,7 +28,7 @@ Param( [string]$ImageName ) -$Location = 'westus2' +$Location = 'eastasia' $Prefix = 'PrLin-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') $VMSize = 'Standard_D32a_v4' diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index ce5c095d2fa5cb..2feadc42c12d0a 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -20,10 +20,10 @@ jobs: value: /Users/vagrant/Data/downloads - group: vcpkg-binary-caching-credentials - name: X_VCPKG_BINARY_SOURCE_STUB - value: "x-azblob,$(root-bin-url),$(sas-bin)" + value: "x-azblob,$(root-bin-url),$(sas-bin)" # not in eastasia due to physical location - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES - value: "x-azurl,$(root-url),$(sas),readwrite" + value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite" steps: - bash: df -h diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 8435a2c967b360..540d5af008a010 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -20,10 +20,10 @@ jobs: value: x86-windows - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES - value: "x-azurl,$(root-url),$(sas),readwrite" + value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite" - group: vcpkg-binary-caching-credentials - name: X_VCPKG_BINARY_SOURCE_STUB - value: "x-azblob,$(root-bin-url),$(sas-bin)" + value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)" steps: - task: PowerShell@2 diff --git a/scripts/azure-pipelines/windows/create-image.ps1 b/scripts/azure-pipelines/windows/create-image.ps1 index 5d07c599454bc0..c358aa6bd6154b 100644 --- a/scripts/azure-pipelines/windows/create-image.ps1 +++ b/scripts/azure-pipelines/windows/create-image.ps1 @@ -14,12 +14,12 @@ at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6 or are running from Azure Cloud Shell. #> -$Location = 'westus2' +$Location = 'eastasia' $Prefix = 'Win-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D32as_v4' +$VMSize = 'Standard_D8a_v4' $ProtoVMName = 'PROTOTYPE' -$WindowsServerSku = '2022-datacenter-g2' +$WindowsServerSku = '2022-datacenter' $ErrorActionPreference = 'Stop' $CudnnBaseUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive.zip' @@ -253,7 +253,7 @@ Set-AzVM ` -Generalized $VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName -$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -HyperVGeneration 'V2' +$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID $ImageName = Find-ImageName -ResourceGroupName 'vcpkg-image-minting' -Prefix $Prefix New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName 'vcpkg-image-minting' diff --git a/scripts/azure-pipelines/windows/create-vmss.ps1 b/scripts/azure-pipelines/windows/create-vmss.ps1 index 96135831f1f36b..bf3586c84aabc1 100644 --- a/scripts/azure-pipelines/windows/create-vmss.ps1 +++ b/scripts/azure-pipelines/windows/create-vmss.ps1 @@ -25,7 +25,7 @@ Param( [string]$ImageName ) -$Location = 'westus2' +$Location = 'eastasia' $Prefix = 'PrWin-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') $VMSize = 'Standard_D32a_v4' From b90ab31ff6dc116da7d5d93bbdad0ba19473b5ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 20 May 2022 23:34:33 +0200 Subject: [PATCH 302/383] [quill] Update to 2.0.0 (#24802) * [quill] Update to 2.0.0 * [quill] Update version files --- ports/quill/portfile.cmake | 6 ++++-- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 350238e9f535cd..045df2c14fe7e0 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill - REF v1.7.2 - SHA512 ea9671cab8a4cf641c413933bd7fb4f3b1f823ca1b17260b3217b13aff22513b4939ff722d74beada1730d47dca70858835733418593ed2df8abf5c1dea0b202 + REF v2.0.0 + SHA512 fed4362fcf32b20beeb44d1421fb58505f5fd0880518abc7c19e645beff9a1e2f83d79273404cd2c297a51c27555ce5fbd3bf96cc657268c7645b68e062e8c59 HEAD_REF master ) @@ -17,6 +17,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/quill/bundled") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index cd09019590cf91..eed1937b17df47 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "1.7.2", + "version": "2.0.0", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 87bf58967498bb..61b95c0eb761ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6049,7 +6049,7 @@ "port-version": 7 }, "quill": { - "baseline": "1.7.2", + "baseline": "2.0.0", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 1952d82010d96f..923936392e0f2a 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb911c05f1ad501f9b87ea3918d4badef41d16e4", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "d663be1266a5e973411f7bf422d3b901609098e8", "version": "1.7.2", From 9eff776b7dbc2e9ccce9f711d40e3c2b3c50cb2f Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 20 May 2022 23:35:06 +0200 Subject: [PATCH 303/383] [libproxy, nspr] Fix cmake warnings (#24809) * [libproxy] * [nspr] * version * [libproxy] Fix unused variables * version --- ports/libproxy/portfile.cmake | 11 ++++++++--- ports/libproxy/vcpkg.json | 3 ++- ports/nspr/portfile.cmake | 4 ++-- ports/nspr/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/l-/libproxy.json | 5 +++++ versions/n-/nspr.json | 5 +++++ 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake index 594e4d09fd6bb3..6df28f418fb6f4 100644 --- a/ports/libproxy/portfile.cmake +++ b/ports/libproxy/portfile.cmake @@ -33,17 +33,22 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DWITH_WEBKIT3=OFF + MAYBE_UNUSED_VARIABLES + WITH_DOTNET + WITH_PERL + WITH_PYTHON2 + WITH_PYTHON3 + WITH_VALA ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Modules) vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE_RECURSE "${LIBPROXY_TOOLS}" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index f993e04dcb1712..8979bbdbfae60d 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libproxy", "version": "0.4.17", - "port-version": 2, + "port-version": 3, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", + "license": "LGPL-2.1-only", "supports": "!uwp", "dependencies": [ "libmodman", diff --git a/ports/nspr/portfile.cmake b/ports/nspr/portfile.cmake index c22bb9984598bd..80eaa0341d609f 100644 --- a/ports/nspr/portfile.cmake +++ b/ports/nspr/portfile.cmake @@ -52,7 +52,7 @@ vcpkg_configure_make( OPTIONS ${OPTIONS} OPTIONS_DEBUG ${OPTIONS_DEBUG} OPTIONS_RELEASE ${OPTIONS_RELEASE} - DISABLE_VERBOSE_FLAGS true + DISABLE_VERBOSE_FLAGS ) vcpkg_install_make() vcpkg_copy_pdbs() @@ -97,4 +97,4 @@ if(NOT VCPKG_BUILD_TYPE) endif() # Copy license -file(INSTALL "${SOURCE_PATH}/nspr/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nspr" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/nspr/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nspr/vcpkg.json b/ports/nspr/vcpkg.json index 59024271252ba3..f1420b447ed6be 100644 --- a/ports/nspr/vcpkg.json +++ b/ports/nspr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nspr", "version": "4.33", - "port-version": 1, + "port-version": 2, "description": "Netscape portable runtime", "homepage": "https://releases.mozilla.org/pub/nspr/", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 61b95c0eb761ef..9486bc70f34e4e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3918,7 +3918,7 @@ }, "libproxy": { "baseline": "0.4.17", - "port-version": 2 + "port-version": 3 }, "libqcow": { "baseline": "20210419", @@ -4902,7 +4902,7 @@ }, "nspr": { "baseline": "4.33", - "port-version": 1 + "port-version": 2 }, "nss": { "baseline": "3.77", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index 1a5479e0192376..c05418e94282f0 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff241fdc3665ad4d1dce051fcdd8ee8dc8617c86", + "version": "0.4.17", + "port-version": 3 + }, { "git-tree": "a44c6a0f0d04d6ea82c7a29c879dfd13cadb38ca", "version": "0.4.17", diff --git a/versions/n-/nspr.json b/versions/n-/nspr.json index 966cf7e2d612c2..342fccc54dd6b3 100644 --- a/versions/n-/nspr.json +++ b/versions/n-/nspr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a07f5ffc6f4bd4a9154a599898fbac38115c8124", + "version": "4.33", + "port-version": 2 + }, { "git-tree": "efd7b94673495b09ee48d1c2a4453f70c5e0bb7c", "version": "4.33", From 083e55eb96baa5425a185a03fc3ce9d2ebd6a78a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 20 May 2022 23:35:37 +0200 Subject: [PATCH 304/383] [thrift] Update to 0.16 (#24810) * update thrift * remove version-string * v db --- ports/thrift/pc-suffix.patch | 44 ++++++++++++++++++++ ports/thrift/portfile.cmake | 81 ++++++++++++++++++++++-------------- ports/thrift/vcpkg.json | 12 +++++- versions/baseline.json | 4 +- versions/t-/thrift.json | 5 +++ 5 files changed, 111 insertions(+), 35 deletions(-) create mode 100644 ports/thrift/pc-suffix.patch diff --git a/ports/thrift/pc-suffix.patch b/ports/thrift/pc-suffix.patch new file mode 100644 index 00000000000000..8fb0dc6daf0eeb --- /dev/null +++ b/ports/thrift/pc-suffix.patch @@ -0,0 +1,44 @@ +diff --git a/lib/cpp/thrift-nb.pc.in b/lib/cpp/thrift-nb.pc.in +index 2c6a96973..e99eff2bc 100644 +--- a/lib/cpp/thrift-nb.pc.in ++++ b/lib/cpp/thrift-nb.pc.in +@@ -26,5 +26,5 @@ Name: Thrift + Description: Thrift Nonblocking API + Version: @VERSION@ + Requires: thrift = @VERSION@ +-Libs: -L${libdir} -lthriftnb ++Libs: -L${libdir} -lthriftnb@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} +diff --git a/lib/cpp/thrift-qt5.pc.in b/lib/cpp/thrift-qt5.pc.in +index a8b16663e..2720bea79 100644 +--- a/lib/cpp/thrift-qt5.pc.in ++++ b/lib/cpp/thrift-qt5.pc.in +@@ -26,5 +26,5 @@ Name: Thrift + Description: Thrift Qt5 API + Version: @VERSION@ + Requires: thrift = @VERSION@ +-Libs: -L${libdir} -lthriftqt5 ++Libs: -L${libdir} -lthriftqt5@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} +diff --git a/lib/cpp/thrift-z.pc.in b/lib/cpp/thrift-z.pc.in +index 467d2e11c..cde44158a 100644 +--- a/lib/cpp/thrift-z.pc.in ++++ b/lib/cpp/thrift-z.pc.in +@@ -26,5 +26,5 @@ Name: Thrift + Description: Thrift Zlib API + Version: @VERSION@ + Requires: thrift = @VERSION@ +-Libs: -L${libdir} -lthriftz ++Libs: -L${libdir} -lthriftz@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} +diff --git a/lib/cpp/thrift.pc.in b/lib/cpp/thrift.pc.in +index d11e6db29..77da61c3e 100644 +--- a/lib/cpp/thrift.pc.in ++++ b/lib/cpp/thrift.pc.in +@@ -25,5 +25,5 @@ includedir=@includedir@ + Name: Thrift + Description: Thrift C++ API + Version: @VERSION@ +-Libs: -L${libdir} -lthrift ++Libs: -L${libdir} -lthrift@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index f2b42b5301e15f..f9f2b70f06c347 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -2,7 +2,9 @@ # - Thrift doesn't yet support building as a DLL on Windows, # - x64-linux only builds static anyway. # From https://github.com/apache/thrift/blob/master/CHANGES.md -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) @@ -10,11 +12,12 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF cecee50308fc7e6f77f55b3fd906c1c6c471fa2f #0.13.0 - SHA512 4097fd7951a4d47f2fadc520a54fd1b91b10769d65e899c6bab490dd7ac459e12bb2aa335df8fdfc61a32095033bfac928a54660abb1ee54ca14a144216c3339 + REF 2a93df80f27739ccabb5b885cb12a8dc7595ecdf #0.16.0 + SHA512 aed4f60b8a4eca5b4bce26f6f29d1178684d2b4e6de290ab1e696ac78a9f85d941afe5dca99d1d22d640371ad538b930cf445f9f899a2e322f39b0cceec307a3 HEAD_REF master PATCHES "correct-paths.patch" + "pc-suffix.patch" ) if (VCPKG_TARGET_IS_OSX) @@ -22,53 +25,69 @@ if (VCPKG_TARGET_IS_OSX) please use command \`brew install bison\` to install bison") endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" shared_lib) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" static_lib) + # note we specify values for WITH_STATIC_LIB and WITH_SHARED_LIB because even though # they're marked as deprecated, Thrift incorrectly hard-codes a value for BUILD_SHARED_LIBS. -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" NO_CHARSET_FLAG OPTIONS - -DWITH_SHARED_LIB=off - -DWITH_STATIC_LIB=on - -DWITH_STDTHREADS=ON - -DBUILD_TESTING=off - -DBUILD_JAVA=off - -DBUILD_C_GLIB=off - -DBUILD_PYTHON=off - -DBUILD_CPP=on - -DBUILD_HASKELL=off - -DBUILD_TUTORIALS=off + --trace-expand + -DLIB_INSTALL_DIR:PATH=lib + -DWITH_SHARED_LIB=${shared_lib} + -DWITH_STATIC_LIB=${static_lib} + -DBUILD_TESTING=OFF + -DBUILD_JAVA=OFF + -DWITH_C_GLIB=OFF + -DBUILD_C_GLIB=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=TRUE + -DBUILD_PYTHON=OFF + -DBUILD_CPP=ON + -DWITH_CPP=ON + -DWITH_ZLIB=ON + -DCMAKE_FIND_PACKAGE_REQUIRE_ZLIB=TRUE + -DWITH_LIBEVENT=ON + -DCMAKE_FIND_PACKAGE_REQUIRE_Libevent=TRUE + -DWITH_OPENSSL=ON + -DCMAKE_FIND_PACKAGE_REQUIRE_OpenSSL=TRUE + -DBUILD_TUTORIALS=OFF -DFLEX_EXECUTABLE=${FLEX} + -DWITH_QT5=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Gradle=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Java=TRUE + -DBUILD_JAVASCRIPT=OFF + -DBUILD_NODEJS=OFF -DBISON_EXECUTABLE=${BISON} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_GLIB + CMAKE_DISABLE_FIND_PACKAGE_Gradle + CMAKE_FIND_PACKAGE_REQUIRE_Libevent + CMAKE_FIND_PACKAGE_REQUIRE_OpenSSL + CMAKE_FIND_PACKAGE_REQUIRE_ZLIB + ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Move CMake config files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/thrift) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() file(GLOB COMPILER "${CURRENT_PACKAGES_DIR}/bin/thrift" "${CURRENT_PACKAGES_DIR}/bin/thrift.exe") if(COMPILER) - file(COPY ${COMPILER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/thrift) - file(REMOVE ${COMPILER}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/thrift) + vcpkg_copy_tools(TOOL_NAMES thrift AUTO_CLEAN) endif() -file(GLOB COMPILERD "${CURRENT_PACKAGES_DIR}/debug/bin/thrift" "${CURRENT_PACKAGES_DIR}/debug/bin/thrift.exe") -if(COMPILERD) - file(REMOVE ${COMPILERD}) -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/thrift/vcpkg.json b/ports/thrift/vcpkg.json index df0a2a109e8f82..5b556459ad2491 100644 --- a/ports/thrift/vcpkg.json +++ b/ports/thrift/vcpkg.json @@ -1,9 +1,9 @@ { "name": "thrift", - "version-string": "0.13.0", - "port-version": 2, + "version": "0.16.0", "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.", "homepage": "https://github.com/apache/thrift", + "license": "Apache-2.0", "dependencies": [ "boost-date-time", "boost-locale", @@ -12,6 +12,14 @@ "boost-smart-ptr", "libevent", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 9486bc70f34e4e..4bb98185735c7c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6965,8 +6965,8 @@ "port-version": 2 }, "thrift": { - "baseline": "0.13.0", - "port-version": 2 + "baseline": "0.16.0", + "port-version": 0 }, "tidy-html5": { "baseline": "5.7.28", diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json index 2461b1285e6b6e..1f9daf0e2863c1 100644 --- a/versions/t-/thrift.json +++ b/versions/t-/thrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "075afb4c9f18e75caa0eb4b07609324fa35b5ca5", + "version": "0.16.0", + "port-version": 0 + }, { "git-tree": "5db8f1e2a1a482177c2ff99e74d34e25b60fb7f4", "version-string": "0.13.0", From 43f2dc7e1a67fbcf71bd83f583f8b366a40148ea Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 20 May 2022 23:36:05 +0200 Subject: [PATCH 305/383] [botan] update to 2.19.1 (#24811) * update botan * v db --- ports/botan/portfile.cmake | 10 +++++----- ports/botan/vcpkg.json | 3 +-- versions/b-/botan.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 1852eb55e21f65..dc8173601cf80e 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan - REF d4bd416702a65eddcc14ee06b9c1b674631e6ae3 # 2.18.1 - SHA512 6c8a8a772ff926402aa77ea1156e8a6b8fcaa18514107c94e9d2c7c76daaf9a02ef8c5c249d1ddf56655bab0ecd0d91490d907fc2239259689662533089b09ad + REF fe62c1f5ce6c4379a52bd018c2ff68bed3024c4d # 2.19.1 + SHA512 09c5fdb3a05978373fb1512a7a9b5c3d89e6e103d7fe86a0e126c417117950c2a63559dc06e8a9c895c892e9fc3888d7ed97686e15d8c2fd941ddb629af0e5a0 HEAD_REF master PATCHES fix-generate-build-path.patch @@ -70,10 +70,10 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) message(STATUS "Configure ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") - if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") endif() - make_directory(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) + make_directory("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") set(configure_arguments --cpu=${BOTAN_FLAG_CPU} ${BOTAN_FLAG_SHARED} diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 1bb8d4cb4c30fa..f75b557be47e3e 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,6 @@ { "name": "botan", - "version": "2.18.1", - "port-version": 10, + "version": "2.19.1", "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 70633dbd694c49..7812086c6c9cd8 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fb61b05e32ed52193542dd9d5b86b7e2021dd99", + "version": "2.19.1", + "port-version": 0 + }, { "git-tree": "2d7fe86d0a8a13ebddda0ac759f824fb9066b644", "version": "2.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index 4bb98185735c7c..fb5e2a2f5c3e00 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1129,8 +1129,8 @@ "port-version": 1 }, "botan": { - "baseline": "2.18.1", - "port-version": 10 + "baseline": "2.19.1", + "port-version": 0 }, "box2d": { "baseline": "2.4.1", From 5c3a388a4c1d4030976c4e52b9f5b8dcd5520d82 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 20 May 2022 23:36:33 +0200 Subject: [PATCH 306/383] [ftgl] no absolute paths (#24812) --- ports/ftgl/portfile.cmake | 2 ++ ports/ftgl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/ftgl.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake index 2d410030726b70..56553a8f62b7bb 100644 --- a/ports/ftgl/portfile.cmake +++ b/ports/ftgl/portfile.cmake @@ -27,4 +27,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ftgl/vcpkg.json b/ports/ftgl/vcpkg.json index 326c2a681c410e..aa1c67265f92cf 100644 --- a/ports/ftgl/vcpkg.json +++ b/ports/ftgl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ftgl", "version-date": "2022-05-18", + "port-version": 1, "description": [ "FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.", "Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.", diff --git a/versions/baseline.json b/versions/baseline.json index fb5e2a2f5c3e00..c2870e0e340fdb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2370,7 +2370,7 @@ }, "ftgl": { "baseline": "2022-05-18", - "port-version": 0 + "port-version": 1 }, "ftxui": { "baseline": "2.0.0", diff --git a/versions/f-/ftgl.json b/versions/f-/ftgl.json index 2dd4e90f205833..54fd244bb23b73 100644 --- a/versions/f-/ftgl.json +++ b/versions/f-/ftgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42f6d4d37641856fc516bd9df7775c448434e94a", + "version-date": "2022-05-18", + "port-version": 1 + }, { "git-tree": "5f8871169a409d3eff23c83391564108912a6a97", "version-date": "2022-05-18", From ea82c328aab65cc684848e932f48f5b51f1163bd Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 20 May 2022 23:36:50 +0200 Subject: [PATCH 307/383] [cpp-peglib] update to 1.3.10 (#24813) * peglib update to 1.3.10 * v db --- ports/cpp-peglib/portfile.cmake | 24 ++++++++++++------------ ports/cpp-peglib/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/c-/cpp-peglib.json | 5 +++++ 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/ports/cpp-peglib/portfile.cmake b/ports/cpp-peglib/portfile.cmake index 75bf34fd9d9fc5..c365ad7812b032 100644 --- a/ports/cpp-peglib/portfile.cmake +++ b/ports/cpp-peglib/portfile.cmake @@ -1,16 +1,16 @@ #header-only library vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO yhirose/cpp-peglib - REF v0.1.0 - SHA512 7efe9da8fe75d766a50d6508c81369b71981aa1e36c0d9981d57b75822fde81074b8803753bfa599ab4ce2a7047be731c22476d0938728ebb9a9dbf63aaeb9e6 - HEAD_REF master - ) + OUT_SOURCE_PATH SOURCE_PATH + REPO yhirose/cpp-peglib + REF adfd2d6014f6cce9510ac2374b277ac8fb931c49 + SHA512 8a930286a20098efc053988bd5b7e0d3117ce3851a79acf3c9991b75ff85a6340d106522f66ee322f8e7809143f9f74fa1fb051da277db02532dface5cb6f5c3 + HEAD_REF master +) - file(COPY ${SOURCE_PATH}/peglib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(COPY "${SOURCE_PATH}/peglib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cpp-peglib" RENAME copyright) - # Handle copyright - file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpp-peglib) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/cpp-peglib/LICENSE ${CURRENT_PACKAGES_DIR}/share/cpp-peglib/copyright) diff --git a/ports/cpp-peglib/vcpkg.json b/ports/cpp-peglib/vcpkg.json index b7e97849632314..01021728c658c1 100644 --- a/ports/cpp-peglib/vcpkg.json +++ b/ports/cpp-peglib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-peglib", - "version-string": "0.1.0", - "port-version": 1, - "description": "C++11 header-only PEG (Parsing Expression Grammars) library." + "version": "1.3.10", + "description": "C++11 header-only PEG (Parsing Expression Grammars) library.", + "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index c2870e0e340fdb..e658d6dc1d39c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1577,8 +1577,8 @@ "port-version": 6 }, "cpp-peglib": { - "baseline": "0.1.0", - "port-version": 1 + "baseline": "1.3.10", + "port-version": 0 }, "cpp-redis": { "baseline": "4.3.1", diff --git a/versions/c-/cpp-peglib.json b/versions/c-/cpp-peglib.json index a88f89b8a89dc5..9d631ff4260d34 100644 --- a/versions/c-/cpp-peglib.json +++ b/versions/c-/cpp-peglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "883e76f3473565fdd800411dfa980eae2e19a131", + "version": "1.3.10", + "port-version": 0 + }, { "git-tree": "4c276ee41b27be78ffa392f24e371e9893b43c93", "version-string": "0.1.0", From 4bc8be1330c9504ce083d6f0130655c3baede7c4 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 20 May 2022 23:37:23 +0200 Subject: [PATCH 308/383] [unixodbc] no absolute paths (#24815) --- ports/unixodbc/portfile.cmake | 18 ++++++++++-------- ports/unixodbc/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/u-/unixodbc.json | 5 +++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/unixodbc/portfile.cmake b/ports/unixodbc/portfile.cmake index 46d59a1b9cae8e..c2d5f9776372c4 100644 --- a/ports/unixodbc/portfile.cmake +++ b/ports/unixodbc/portfile.cmake @@ -39,14 +39,16 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man7" ) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") +foreach(FILE config.h unixodbc_conf.h) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") +endforeach() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unixodbcConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/unixodbc/vcpkg.json b/ports/unixodbc/vcpkg.json index 3602c057d753eb..4f3457179b6258 100644 --- a/ports/unixodbc/vcpkg.json +++ b/ports/unixodbc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "unixodbc", "version": "2.3.11", + "port-version": 1, "description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX", "homepage": "https://github.com/lurcher/unixODBC", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index e658d6dc1d39c8..1604f44d82ade4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7218,7 +7218,7 @@ }, "unixodbc": { "baseline": "2.3.11", - "port-version": 0 + "port-version": 1 }, "unqlite": { "baseline": "1.1.9", diff --git a/versions/u-/unixodbc.json b/versions/u-/unixodbc.json index 0c8f6a98b59611..394daa07c112fe 100644 --- a/versions/u-/unixodbc.json +++ b/versions/u-/unixodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5bf2c65c912060aaebaba66eb6ce1544d6dd7e6", + "version": "2.3.11", + "port-version": 1 + }, { "git-tree": "3042b55f1c0ecd0d27336b24754a6f5f3a746c03", "version": "2.3.11", From 7e2313f65bc518c524cbd2f175585b8b58ec0474 Mon Sep 17 00:00:00 2001 From: Aleksandr Buyanov Date: Sat, 21 May 2022 00:37:43 +0300 Subject: [PATCH 309/383] [nss] Version bump to 3.78 (#24824) * [nss] Update version to 3.78 * [nss] Update version to 3.78 * Add version Co-authored-by: Aleksandr Buianov --- ports/nss/portfile.cmake | 4 ++-- ports/nss/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nss.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nss/portfile.cmake b/ports/nss/portfile.cmake index 3e60e20dc6b350..523a3d7ca0c1db 100644 --- a/ports/nss/portfile.cmake +++ b/ports/nss/portfile.cmake @@ -1,10 +1,10 @@ -set(NSS_VERSION "3.77") +set(NSS_VERSION "3.78") string(REPLACE "." "_" V_URL ${NSS_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.mozilla.org/pub/security/nss/releases/NSS_${V_URL}_RTM/src/nss-${NSS_VERSION}.tar.gz" FILENAME "nss-${NSS_VERSION}.tar.gz" - SHA512 bd62eeb8f90ecd2d3999fd78fea6652736c02a6530f29e98d0cad0707f3b901b30409132eb6a6d53b9f5c05c6b464615a946a2a3e255553c793e44d0ed93179e + SHA512 ab54d838f41f963fdd4b87477b1e769186ae1f138f7c5d764cd6873be4791146d14dcc85697a2ca92e08f3bfcbeb61d64e26e7b5398095272c18a8196d43ac6c ) vcpkg_extract_source_archive_ex( diff --git a/ports/nss/vcpkg.json b/ports/nss/vcpkg.json index 83143405c36be8..f885c9482860d4 100644 --- a/ports/nss/vcpkg.json +++ b/ports/nss/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nss", - "version": "3.77", + "version": "3.78", "description": "Network Security Services from Mozilla", "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1604f44d82ade4..083852ca081565 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4905,7 +4905,7 @@ "port-version": 2 }, "nss": { - "baseline": "3.77", + "baseline": "3.78", "port-version": 0 }, "nsync": { diff --git a/versions/n-/nss.json b/versions/n-/nss.json index f715e04fbd61d6..072371591ca134 100644 --- a/versions/n-/nss.json +++ b/versions/n-/nss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6256143502011312dc467a9c57f0955617fee6d3", + "version": "3.78", + "port-version": 0 + }, { "git-tree": "06e7680df336bb6be816c75e42c6304d11566a3d", "version": "3.77", From f20c7bf05be2ca837c79514a4b5c3ed54988e118 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 20 May 2022 23:41:10 +0200 Subject: [PATCH 310/383] [vcpkg-configure-make] Fix include path prepending (#24823) * Fix include path prepending * Update DISABLE_VERBOSE_FLAGS documentation Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- docs/maintainers/vcpkg_configure_make.md | 5 +++-- scripts/cmake/vcpkg_configure_make.cmake | 24 ++++++------------------ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/docs/maintainers/vcpkg_configure_make.md b/docs/maintainers/vcpkg_configure_make.md index ebf80521af7718..af0213bd5a141b 100644 --- a/docs/maintainers/vcpkg_configure_make.md +++ b/docs/maintainers/vcpkg_configure_make.md @@ -16,6 +16,7 @@ vcpkg_configure_make( [CONFIG_DEPENDENT_ENVIRONMENT ...] [CONFIGURE_ENVIRONMENT_VARIABLES ...] [ADD_BIN_TO_PATH] + [DISABLE_VERBOSE_FLAGS] [NO_DEBUG] [SKIP_CONFIGURE] [PROJECT_SUBPATH <${PROJ_SUBPATH}>] @@ -59,8 +60,8 @@ Script that needs to be called before configuration (do not use for batch files ### ADD_BIN_TO_PATH Adds the appropriate Release and Debug `bin\` directories to the path during configure such that executables can run against the in-tree DLLs. -## DISABLE_VERBOSE_FLAGS -do not pass '--disable-silent-rules --verbose' to configure +### DISABLE_VERBOSE_FLAGS +Do not pass '--disable-silent-rules --verbose' to configure. ### OPTIONS Additional options passed to configure during the configuration. diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 535941379187a6..f0413a0abe34c3 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -15,6 +15,7 @@ vcpkg_configure_make( [CONFIG_DEPENDENT_ENVIRONMENT ...] [CONFIGURE_ENVIRONMENT_VARIABLES ...] [ADD_BIN_TO_PATH] + [DISABLE_VERBOSE_FLAGS] [NO_DEBUG] [SKIP_CONFIGURE] [PROJECT_SUBPATH <${PROJ_SUBPATH}>] @@ -58,8 +59,8 @@ Script that needs to be called before configuration (do not use for batch files ### ADD_BIN_TO_PATH Adds the appropriate Release and Debug `bin\` directories to the path during configure such that executables can run against the in-tree DLLs. -## DISABLE_VERBOSE_FLAGS -do not pass '--disable-silent-rules --verbose' to configure +### DISABLE_VERBOSE_FLAGS +Do not pass '--disable-silent-rules --verbose' to configure. ### OPTIONS Additional options passed to configure during the configuration. @@ -208,19 +209,6 @@ macro(z_vcpkg_append_to_configure_environment inoutstring var defaultval) endif() endmacro() -# Setup include environment (since these are buildtype independent restoring them is unnecessary) -macro(z_prepend_include_path var) - unset(ENV{${var}}) - if(NOT DEFINED z_vcpkg_env_backup_${var} OR "${z_vcpkg_env_backup_${var}}" STREQUAL "") - vcpkg_host_path_list(APPEND ENV{${var}} "${CURRENT_INSTALLED_DIR}/include") - else() - foreach (one_bk IN ITEMS ${z_vcpkg_env_backup_${var}}) - vcpkg_host_path_list(PREPEND ENV{${var}} "${one_bk}") - endforeach() - vcpkg_host_path_list(PREPEND ENV{${var}} "${CURRENT_INSTALLED_DIR}/include") - endif() -endmacro() - macro(z_convert_to_list input output) string(REGEX MATCHALL "(( +|^ *)[^ ]+)" ${output} "${${input}}") endmacro() @@ -544,10 +532,10 @@ function(vcpkg_configure_make) endif() # Used by CL - z_prepend_include_path(INCLUDE) + vcpkg_host_path_list(PREPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") # Used by GCC - z_prepend_include_path(C_INCLUDE_PATH) - z_prepend_include_path(CPLUS_INCLUDE_PATH) + vcpkg_host_path_list(PREPEND ENV{C_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include") + vcpkg_host_path_list(PREPEND ENV{CPLUS_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include") # Flags should be set in the toolchain instead (Setting this up correctly requires a function named vcpkg_determined_cmake_compiler_flags which can also be used to setup CC and CXX etc.) if(VCPKG_TARGET_IS_WINDOWS) From 292067a61dccd6a7aa322dfc5a88b52997faaaf2 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 20 May 2022 14:42:35 -0700 Subject: [PATCH 311/383] [docs] Fix broken links and generate documentation for `vcpkg-gn` (#24764) * [docs] Fix broken links. Add docs validation pipeline. * [docs][regenerate.ps1] Do not require a README.md in helper ports * [docs] Update validateDocs.yml to point to current main --- .github/workflows/validateDocs.yml | 54 +++++++++++++++++++ docs/README.md | 5 -- docs/about/faq.md | 4 +- docs/maintainers/portfile-functions.md | 5 ++ docs/maintainers/ports/vcpkg-gn.md | 12 +++++ .../ports/vcpkg-gn/vcpkg_gn_configure.md | 32 +++++++++++ .../ports/vcpkg-gn/vcpkg_gn_install.md | 29 ++++++++++ docs/maintainers/pr-review-checklist.md | 4 +- docs/regenerate.ps1 | 5 +- docs/users/buildsystems/integration.md | 4 +- .../users/buildsystems/msbuild-integration.md | 3 +- docs/users/config-environment.md | 8 +-- docs/users/manifests.md | 1 + docs/users/mingw.md | 10 ++-- docs/users/triplets.md | 3 +- docs/users/versioning.md | 1 - 16 files changed, 156 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/validateDocs.yml create mode 100644 docs/maintainers/ports/vcpkg-gn.md create mode 100644 docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md create mode 100644 docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md diff --git a/.github/workflows/validateDocs.yml b/.github/workflows/validateDocs.yml new file mode 100644 index 00000000000000..aabdb97b08ae48 --- /dev/null +++ b/.github/workflows/validateDocs.yml @@ -0,0 +1,54 @@ +name: Doc Validation + +on: + pull_request: + paths: + - 'docs/**' + +jobs: + validate: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + path: vcpkg + + - name: Checkout Website + uses: actions/checkout@v3 + with: + repository: vcpkg/vcpkg.github.io + ref: '8ee5cacc91b6e017b5e4236940d9f385c1563598' + path: vcpkg.github.io + + - uses: actions/cache@v3 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + + - run: npm ci + working-directory: vcpkg.github.io + + - name: Purge existing html files + run: rm -rf en + working-directory: vcpkg.github.io + + # The current navbar embeds a link to integration.md which no longer exists + - name: Ignore navbar + run: echo "" > templates/navbar.html + working-directory: vcpkg.github.io + + - name: Generate Core Pages + run: node scripts/generatePages.js + working-directory: vcpkg.github.io + + - name: Generate Docs Pages + run: node scripts/generateDocs.js ../vcpkg/docs + working-directory: vcpkg.github.io + + - name: Check Links + run: VCPKG_VALIDATE_LINKS_ONLY_DOCS=1 node scripts/validateLinks.js + working-directory: vcpkg.github.io diff --git a/docs/README.md b/docs/README.md index eb3b90cd9a27f7..f0114efa4ec19f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -50,11 +50,6 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [vcpkgx](https://vcpkgx.com/) - Package index + search - [vcpkg index](https://vcpkg.dev/) - Package index + search -### Specifications - -- [Export](specifications/export-command.md) -- [Feature Packages](specifications/feature-packages.md) - ### Blog posts - [Vcpkg Host Dependencies for Cross-Compilation](https://devblogs.microsoft.com/cppblog/vcpkg-host-dependencies/) diff --git a/docs/about/faq.md b/docs/about/faq.md index bc9d0cf29f49af..d2ff600b22805c 100644 --- a/docs/about/faq.md +++ b/docs/about/faq.md @@ -6,7 +6,7 @@ If you want to contribute but don't have a particular library in mind then take of [new port requests](https://github.com/Microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+label%3Acategory%3Anew-port). ## Can Vcpkg create pre-built binary packages? What is the binary format used by Vcpkg? -Yes! See [the `export` command](../users/buildsystems/integration.md#export-command). +Yes! See the [`export` command](../users/buildsystems/export-command.md). ## How do I update libraries? The `vcpkg update` command lists all packages which are out-of-sync with your current portfiles. To update a package, follow the instructions in the command. @@ -88,7 +88,7 @@ Vcpkg uses CMake internally as a build scripting language. This is because CMake ## Will Vcpkg support downloading compiled binaries from a public or private server? We would like to eventually support downloading precompiled binaries, similar to other system package managers. -In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See the [`export`](../users/buildsystems/integration.md#export) command. +In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See the [`export` command](../users/buildsystems/export-command.md). ## What Visual C++ toolsets are supported? We support Visual Studio 2015 Update 3 and above. diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index b2b8a49ba6bb21..515c8b511af853 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -74,6 +74,11 @@ - [vcpkg\_cmake\_configure](ports/vcpkg-cmake/vcpkg_cmake_configure.md) - [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md) +### [vcpkg-gn](ports/vcpkg-gn.md) + +- [vcpkg\_gn\_configure](ports/vcpkg-gn/vcpkg_gn_configure.md) +- [vcpkg\_gn\_install](ports/vcpkg-gn/vcpkg_gn_install.md) + ### [vcpkg-cmake-config](ports/vcpkg-cmake-config.md) - [vcpkg\_cmake\_config\_fixup](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md) diff --git a/docs/maintainers/ports/vcpkg-gn.md b/docs/maintainers/ports/vcpkg-gn.md new file mode 100644 index 00000000000000..c7ac13a05fe8f1 --- /dev/null +++ b/docs/maintainers/ports/vcpkg-gn.md @@ -0,0 +1,12 @@ +# vcpkg-cmake + +This port contains cmake functions for dealing with a GN buildsystem. + +## Example + +```cmake +vcpkg_gn_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_gn_install() +``` diff --git a/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md b/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md new file mode 100644 index 00000000000000..da9326a810375e --- /dev/null +++ b/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md @@ -0,0 +1,32 @@ +# vcpkg_gn_configure + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md). + +Generate Ninja (GN) targets + +## Usage: +```cmake +vcpkg_gn_configure( + SOURCE_PATH + [OPTIONS ] + [OPTIONS_DEBUG ] + [OPTIONS_RELEASE ] +) +``` + +## Parameters: +### SOURCE_PATH (required) +The path to the GN project. + +### OPTIONS +Options to be passed to both the debug and release targets. +Note: Must be provided as a space-separated string. + +### OPTIONS_DEBUG (space-separated string) +Options to be passed to the debug target. + +### OPTIONS_RELEASE (space-separated string) +Options to be passed to the release target. + +## Source +[ports/vcpkg-gn/vcpkg\_gn\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-gn/vcpkg_gn_configure.cmake) diff --git a/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md b/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md new file mode 100644 index 00000000000000..e520fcc96aba56 --- /dev/null +++ b/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md @@ -0,0 +1,29 @@ +# vcpkg_gn_install + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md). + +Installs a GN project. + +In order to build a GN project without installing, use [`vcpkg_build_ninja()`]. + +## Usage: +```cmake +vcpkg_gn_install( + SOURCE_PATH + [TARGETS ...] +) +``` + +## Parameters: +### SOURCE_PATH +The path to the source directory + +### TARGETS +Only install the specified targets. + +Note: includes must be handled separately + +[`vcpkg_build_ninja()`]: vcpkg_build_ninja.md + +## Source +[ports/vcpkg-gn/vcpkg\_gn\_install.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-gn/vcpkg_gn_install.cmake) diff --git a/docs/maintainers/pr-review-checklist.md b/docs/maintainers/pr-review-checklist.md index ce8d1c3a9998c0..05baaa58edd682 100644 --- a/docs/maintainers/pr-review-checklist.md +++ b/docs/maintainers/pr-review-checklist.md @@ -13,7 +13,7 @@ You can link any of these checklist items in a GitHub comment by copying the lin
c000001: No deprecated helper functions are used -See our [Maintainer Guidelines and Policies](maintainer-guide.md#Avoid-deprecated-helper-functions) for more information. +See our [Maintainer Guidelines and Policies](maintainer-guide.md#avoid-deprecated-helper-functions) for more information.
@@ -36,7 +36,7 @@ See our [manifest file documentation](manifest-files.md#description) for more in
c000004: No unnecessary comments are present in the changeset -See our [Maintainer Guidelines and Policies](maintainer-guide.md#Avoid-excessive-comments-in-portfiles) for more information. +See our [Maintainer Guidelines and Policies](maintainer-guide.md#avoid-excessive-comments-in-portfiles) for more information.
diff --git a/docs/regenerate.ps1 b/docs/regenerate.ps1 index d3c9e241245934..a319e19b147a22 100755 --- a/docs/regenerate.ps1 +++ b/docs/regenerate.ps1 @@ -27,6 +27,7 @@ class CMakeDocumentation { [String[]]$cmakeScriptsPorts = @( 'vcpkg-cmake' + 'vcpkg-gn' 'vcpkg-cmake-config' 'vcpkg-cmake-get-vars' 'vcpkg-pkgconfig-get-modules' @@ -265,7 +266,9 @@ Get-ChildItem "$VcpkgRoot/scripts/cmake" -Filter '*.cmake' | ForEach-Object { $cmakeScriptsPorts | ForEach-Object { $portName = $_ - Copy-Item "$VcpkgRoot/ports/$portName/README.md" "$PSScriptRoot/maintainers/ports/$portName.md" + if (Test-Path "$VcpkgRoot/ports/$portName/README.md") { + Copy-Item "$VcpkgRoot/ports/$portName/README.md" "$PSScriptRoot/maintainers/ports/$portName.md" + } New-Item -Path "$PSScriptRoot/maintainers/ports/$portName" -Force -ItemType 'Directory' | Out-Null $portTableOfContents[$portName] = @() diff --git a/docs/users/buildsystems/integration.md b/docs/users/buildsystems/integration.md index 4c2ace80b4a5af..67706600f1e65a 100644 --- a/docs/users/buildsystems/integration.md +++ b/docs/users/buildsystems/integration.md @@ -6,5 +6,5 @@ vcpkg supports use from any buildsystem and has specific native integration into - [MSBuild Integration (Visual Studio)](msbuild-integration.md) - [CMake Integration](cmake-integration.md) -- [Manual Integration](#manual-integration) -- [`export` Command](#export-command) +- [Manual Integration](manual-integration.md) +- [`export` Command](export-command.md) diff --git a/docs/users/buildsystems/msbuild-integration.md b/docs/users/buildsystems/msbuild-integration.md index e9dbf12275c84e..3cd698c7667d15 100644 --- a/docs/users/buildsystems/msbuild-integration.md +++ b/docs/users/buildsystems/msbuild-integration.md @@ -10,7 +10,6 @@ - [Linked NuGet Package](#linked-nuget-package) - [Common Configuration](#common-configuration) - [Manifest Mode Configuration](#manifest-mode-configuration) -- [Classic Mode Configuration](#classic-mode-configuration) ## Integration Methods @@ -60,7 +59,7 @@ More information about `Directory.Build.targets` and `Directory.Build.props` can ### Linked NuGet Package -**Note: This approach is not recommended for new projects, since it makes them difficult to share with others. For a portable, self-contained NuGet package, see the [`export command`](#export-command)** +**Note: This approach is not recommended for new projects, since it makes them difficult to share with others. For a portable, self-contained NuGet package, see the [`export command`](export-command.md)** VS projects can also be integrated through a NuGet package. This will modify the project file, so we do not recommend this approach for open source projects. diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index 1f872c94663a2e..3fca13efe1c801 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -75,19 +75,19 @@ This environment variables limits the amount of concurrency requested by underly #### VCPKG_DEFAULT_BINARY_CACHE -This environment variable redirects the default location to store binary packages. See [Binary Caching](binarycaching.md#Configuration) for more details. +This environment variable redirects the default location to store binary packages. See [Binary Caching](binarycaching.md#configuration) for more details. #### VCPKG_BINARY_SOURCES -This environment variable adds or removes binary sources. See [Binary Caching](binarycaching.md#Configuration) for more details. +This environment variable adds or removes binary sources. See [Binary Caching](binarycaching.md#configuration) for more details. #### VCPKG_NUGET_REPOSITORY -This environment variable changes the metadata of produced NuGet packages. See [Binary Caching](binarycaching.md#Configuration) for more details. +This environment variable changes the metadata of produced NuGet packages. See [Binary Caching](binarycaching.md#configuration) for more details. #### VCPKG_USE_NUGET_CACHE -This environment variable allows using NuGet's cache for every nuget-based binary source. See [Binary Caching](binarycaching.md#NuGets-cache) for more details. +This environment variable allows using NuGet's cache for every nuget-based binary source. See [Binary Caching](binarycaching.md#nuget-provider-configuration) for more details. #### X_VCPKG_ASSET_SOURCES diff --git a/docs/users/manifests.md b/docs/users/manifests.md index bb0e28025368d7..001c73cc658898 100644 --- a/docs/users/manifests.md +++ b/docs/users/manifests.md @@ -159,6 +159,7 @@ Then, you might just ask for: } ``` + #### `"platform"` Field The `"platform"` field defines the platforms where the dependency should be installed - for example, diff --git a/docs/users/mingw.md b/docs/users/mingw.md index d07328b15a76d7..2a0408f76b8716 100644 --- a/docs/users/mingw.md +++ b/docs/users/mingw.md @@ -6,10 +6,10 @@ ## Table of Contents - - [Mingw-w64 community triplets](#Mingw-w64-community-triplets) - - [Using Mingw-w64 natively on Windows](#Using-Mingw-w64-natively-on-Windows) - - [How to avoid mixing different installations](#How-to-avoid-mixing-different-installations) - - [Using Mingw-w64 to build Windows programs on other systems](#Using-Mingw-w64-to-build-Windows-programs-on-other-systems) + - [Mingw-w64 community triplets](#mingw-w64-community-triplets) + - [Using Mingw-w64 natively on Windows](#mingw-native) + - [How to avoid mixing different installations](#how-to-avoid-mixing-different-installations) + - [Using Mingw-w64 to build Windows programs on other systems](#mingw-cross) ## Mingw-w64 community triplets @@ -36,6 +36,7 @@ Because of this, community involvement is paramount! - [Open issues](https://github.com/microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+mingw) - [Open pull requests](https://github.com/microsoft/vcpkg/pulls?q=is%3Apr+is%3Aopen+mingw) + ## Using Mingw-w64 natively on Windows With [MSYS2](https://www.msys2.org/), it is possible to easily create @@ -123,6 +124,7 @@ which create a mix of MSYS2 programs from different installations. You may want to set the desired `PATH` manually, or remove directories which contain `sh.exe`, `bash.exe`, `msys-2.0.dll` or `cygwin1.dll`. + ## Using Mingw-w64 to build Windows programs on other systems You can use the vcpkg mingw community triplets with toolchains on diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 909fcce76c8814..9f9cca4d1ef90a 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -8,7 +8,7 @@ In Vcpkg, we use triplets to describe an imaginary "target configuration set" fo We currently provide many triplets by default (run `vcpkg help triplet`). However, you can easily customize or add your own by copying a built-in triplet from the `triplets\` directory into a project local location. Then, use `--overlay-triplets=` (or equivalent such as [`$VCPKG_OVERLAY_TRIPLETS`](config-environment.md#vcpkg_overlay_triplets), [CMake `VCPKG_OVERLAY_TRIPLETS`](buildsystems/cmake-integration.md#vcpkg_overlay_triplets), or [MSBuild Additional Options](buildsystems/msbuild-integration.md#vcpkg-additional-install-options)) to add that directory to vcpkg. See our [overlay triplets example](../examples/overlay-triplets-linux-dynamic.md) for a more detailed walkthrough. -To change the triplet used by your project away from the default, see our [Integration Document](buildsystems/integration.md#triplet-selection). +To change the triplet used by your project, you can pass `--triplet=` on the command line or see our [Buildsystem-Specific Documentation](buildsystems/integration.md). ## Community triplets @@ -65,6 +65,7 @@ This field is optional and, if present, will be passed into the build as `CMAKE_ See also the CMake documentation for `CMAKE_SYSTEM_VERSION`: https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_VERSION.html. + ### VCPKG_CHAINLOAD_TOOLCHAIN_FILE Specifies an alternate CMake Toolchain file to use. diff --git a/docs/users/versioning.md b/docs/users/versioning.md index 7b091a8a8f62b1..e4befb2eb05861 100644 --- a/docs/users/versioning.md +++ b/docs/users/versioning.md @@ -15,7 +15,6 @@ See our guide to [getting started with versioning](../examples/versioning.gettin * [`version-date`](#version-date) * [`version-string`](#version-string) * [Version constraints](#version-constraints) -* [Version files](#version-files) ## Version schemes Ports in vcpkg should attempt to follow the versioning conventions used by the package's authors. For that reason, when declaring a package's version the appropriate scheme should be used. From 314018fef43c7e3a52a3e46599313b70ace3977a Mon Sep 17 00:00:00 2001 From: Zac Walker Date: Fri, 20 May 2022 23:44:29 +0200 Subject: [PATCH 312/383] [libjpeg-turbo] Enable NEON intrinsics for ARM builds (#24775) * [libjpeg-turbo] Enable NEON intrinsics for ARM builds * ran x-add-version --- ports/libjpeg-turbo/portfile.cmake | 2 +- ports/libjpeg-turbo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libjpeg-turbo.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 091af45bc744ea..6a3bd056b5ec56 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_from_github( ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")) - set(LIBJPEGTURBO_SIMD -DWITH_SIMD=OFF) + set(LIBJPEGTURBO_SIMD -DWITH_SIMD=ON -DNEON_INTRINSICS=ON) else() set(LIBJPEGTURBO_SIMD -DWITH_SIMD=ON) vcpkg_find_acquire_program(NASM) diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 5365b84212c84c..564f93079c1d0e 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libjpeg-turbo", "version": "2.1.3", - "port-version": 2, + "port-version": 3, "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 083852ca081565..cb04d73b13774e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3694,7 +3694,7 @@ }, "libjpeg-turbo": { "baseline": "2.1.3", - "port-version": 2 + "port-version": 3 }, "libjuice": { "baseline": "1.0.0", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 857413fbe9d08e..6860f26b233171 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3ab7c40b47aa03953467e7697d3eea7b60d624e", + "version": "2.1.3", + "port-version": 3 + }, { "git-tree": "dd9bb6eb0d4e28d2b3ef0d83b6b9ef736555621d", "version": "2.1.3", From 0406852bee08e2feab26cc9e9a58477f8de88364 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 23 May 2022 19:01:32 +0200 Subject: [PATCH 313/383] [docs] Fix copy paste error (#24840) --- docs/maintainers/ports/vcpkg-gn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/maintainers/ports/vcpkg-gn.md b/docs/maintainers/ports/vcpkg-gn.md index c7ac13a05fe8f1..21c440dd89a08b 100644 --- a/docs/maintainers/ports/vcpkg-gn.md +++ b/docs/maintainers/ports/vcpkg-gn.md @@ -1,4 +1,4 @@ -# vcpkg-cmake +# vcpkg-gn This port contains cmake functions for dealing with a GN buildsystem. From 413c11d3c5b5bd4e238756af141cdcc588e506eb Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 23 May 2022 21:31:54 +0200 Subject: [PATCH 314/383] [gazebo] no absolute paths (#24844) --- ports/gazebo/portfile.cmake | 9 +++++++++ ports/gazebo/vcpkg.json | 1 + ports/ignition-transport8/portfile.cmake | 4 +--- ports/ignition-transport8/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/g-/gazebo.json | 5 +++++ versions/i-/ignition-transport8.json | 5 +++++ 7 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake index 603eab88a00ef7..5be5d42d0420a1 100644 --- a/ports/gazebo/portfile.cmake +++ b/ports/gazebo/portfile.cmake @@ -30,12 +30,20 @@ vcpkg_cmake_configure( -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe ${FEATURE_OPTIONS} + -DBUILD_TESTING=OFF # Not enabled by default, but to be sure ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/gazebo") vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gazebo-11/gazebo/test") + +foreach(postfix "" "-11") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${postfix}/setup.sh" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${postfix}/setup.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") +endforeach() + vcpkg_copy_tools( TOOL_NAMES gazebo gz gzclient gzserver AUTO_CLEAN @@ -48,5 +56,6 @@ endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_pkgconfig() # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json index 8f4bd528696193..0d88306bc7dff1 100644 --- a/ports/gazebo/vcpkg.json +++ b/ports/gazebo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gazebo", "version-date": "2022-01-20", + "port-version": 1, "description": "Open source robotics simulator.", "homepage": "http://gazebosim.org", "license": "Apache-2.0", diff --git a/ports/ignition-transport8/portfile.cmake b/ports/ignition-transport8/portfile.cmake index a01b24ee2f71f8..7ca8513e7cb022 100644 --- a/ports/ignition-transport8/portfile.cmake +++ b/ports/ignition-transport8/portfile.cmake @@ -1,5 +1,3 @@ ignition_modular_library(NAME transport VERSION "8.1.0" - SHA512 04b4cd954453505398da35b284e7db4b4691d9a705924c41e0082fd20e94176a3eaeae7329fd9992aaa50f90b2d8973c71daf763ccff58aa30d06be1da15189a - # This can be removed when the pc file of sqlite3 is available ( https://github.com/microsoft/vcpkg/issues/14327 ) - DISABLE_PKGCONFIG_INSTALL) + SHA512 04b4cd954453505398da35b284e7db4b4691d9a705924c41e0082fd20e94176a3eaeae7329fd9992aaa50f90b2d8973c71daf763ccff58aa30d06be1da15189a) diff --git a/ports/ignition-transport8/vcpkg.json b/ports/ignition-transport8/vcpkg.json index 0c088bc709cbbf..52bcedab152044 100644 --- a/ports/ignition-transport8/vcpkg.json +++ b/ports/ignition-transport8/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-transport8", "version": "8.1.0", - "port-version": 3, + "port-version": 4, "description": "Transport middleware for robotics", "license": null, "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index cb04d73b13774e..4d0ae6f40fc647 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2426,7 +2426,7 @@ }, "gazebo": { "baseline": "2022-01-20", - "port-version": 0 + "port-version": 1 }, "gcem": { "baseline": "1.14.1", @@ -2898,7 +2898,7 @@ }, "ignition-transport8": { "baseline": "8.1.0", - "port-version": 3 + "port-version": 4 }, "ignition-transport9": { "baseline": "9.0.0", diff --git a/versions/g-/gazebo.json b/versions/g-/gazebo.json index 78d9fcac424a3d..57626811bb680d 100644 --- a/versions/g-/gazebo.json +++ b/versions/g-/gazebo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "702a7de5c38ff156813a73a32eac6c7ca73248e4", + "version-date": "2022-01-20", + "port-version": 1 + }, { "git-tree": "983e90284c8c0073e0193750a412eb4df01accdc", "version-date": "2022-01-20", diff --git a/versions/i-/ignition-transport8.json b/versions/i-/ignition-transport8.json index fbfbbafb4be47f..06f92d704bcfb1 100644 --- a/versions/i-/ignition-transport8.json +++ b/versions/i-/ignition-transport8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "967c8839fce7bd85b58ed1d4a5506a2be278a8ef", + "version": "8.1.0", + "port-version": 4 + }, { "git-tree": "df4d904c15b18ca24200a42fdfc4e5930c91618a", "version": "8.1.0", From 4c82b77b4531d6bb43384e5130bf3f8c5c922727 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 23 May 2022 13:33:58 -0700 Subject: [PATCH 315/383] Add the ability to do full rebuilds with updated copies of vcpkg-tool. (#24611) * Add the ability to do full rebuilds with updated copies of vcpkg-tool. Resurrection of https://github.com/microsoft/vcpkg/pull/23753/ * Extract all scripts out of inline blocks. * Replicate all changes to the "unstable" testing. * Fix bootstrap :) * Fix version files validation path. * Malformed. * Paths and permissions. * Fixed file name typo * Update scripts/azure-pipelines/bootstrap-from-source.sh Co-authored-by: Robert Schumacher Co-authored-by: Robert Schumacher --- scripts/azure-pipelines/azure-pipelines.yml | 15 +++++ .../azure-pipelines/bootstrap-from-source.sh | 9 +++ .../azure-pipelines/linux/azure-pipelines.yml | 32 +++++----- .../azure-pipelines/osx/azure-pipelines.yml | 30 ++++----- .../vagrant-box-configuration.json | 4 +- .../azure-pipelines/windows-unstable/job.yml | 20 ++---- .../windows/azure-pipelines.yml | 64 ++++++------------- .../windows/bootstrap-from-source.cmd | 7 ++ .../windows/validate-version-files.ps1 | 29 +++++++++ 9 files changed, 118 insertions(+), 92 deletions(-) create mode 100755 scripts/azure-pipelines/bootstrap-from-source.sh create mode 100644 scripts/azure-pipelines/windows/bootstrap-from-source.cmd create mode 100644 scripts/azure-pipelines/windows/validate-version-files.ps1 diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 55407f184a69be..02dc9ede08b5f9 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -6,53 +6,68 @@ variables: linux-pool: 'PrLin-2022-05-19' osx-pool: 'PrOsx-2022-02-04' +parameters: + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + jobs: - template: windows/azure-pipelines.yml parameters: triplet: x86-windows jobName: x86_windows poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: x64-windows jobName: x64_windows poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: x64-windows-static jobName: x64_windows_static poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: x64-windows-static-md jobName: x64_windows_static_md poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: x64-uwp jobName: x64_uwp poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: arm64-windows jobName: arm64_windows poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: arm-uwp jobName: arm_uwp poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: osx/azure-pipelines.yml parameters: poolName: $(osx-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: linux/azure-pipelines.yml parameters: poolName: $(linux-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} diff --git a/scripts/azure-pipelines/bootstrap-from-source.sh b/scripts/azure-pipelines/bootstrap-from-source.sh new file mode 100755 index 00000000000000..b998568eb8b23e --- /dev/null +++ b/scripts/azure-pipelines/bootstrap-from-source.sh @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +git clone https://github.com/microsoft/vcpkg-tool vcpkg-tool +git -C vcpkg-tool switch -d $1 +rm -rf build.x64.release +cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=OFF -DVCPKG_BUILD_FUZZING=OFF -DVCPKG_BUILD_TLS12_DOWNLOADER=OFF -B build.x64.release -S vcpkg-tool +ninja -C build.x64.release +mv build.x64.release/vcpkg vcpkg diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 92da1eea400821..ad50322393813b 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -2,6 +2,14 @@ # SPDX-License-Identifier: MIT # +parameters: + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + - name: poolName + type: string + jobs: - job: x64_linux pool: @@ -22,35 +30,27 @@ jobs: value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)" steps: - - bash: df -h - displayName: 'Report on Disk Space' + # Note: /mnt is the Azure machines' temporary disk. - bash: | sudo mkdir /home/agent -m=777 sudo chown `id -u` /home/agent - exit 0 - displayName: 'Create /home/agent' - # Note: /mnt is the Azure machines' temporary disk. - - bash: | - sudo rm -rf ${{ variables.VCPKG_DOWNLOADS }} sudo mkdir ${{ variables.WORKING_ROOT }} -m=777 sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} -m=777 exit 0 - displayName: 'Create ${{ variables.WORKING_ROOT }} and ${{ variables.VCPKG_DOWNLOADS }}' - - task: Bash@3 + displayName: 'Create working directories' + - bash: ./bootstrap-vcpkg.sh displayName: 'Bootstrap vcpkg' - inputs: - filePath: bootstrap-vcpkg.sh + condition: eq('use default', '${{ parameters.vcpkgToolSha }}') + - bash: ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }} + displayName: "Build vcpkg with CMake" + condition: ne('use default', '${{ parameters.vcpkgToolSha }}') - task: PowerShell@2 - displayName: '*** Test Modified Ports for x64-linux' + displayName: '*** Test Modified Ports' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true - - bash: | - df -h - displayName: 'Report on Disk Space After Build' - condition: always() - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: failure logs for x64-linux' inputs: diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 2feadc42c12d0a..a735d66df4656a 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -3,8 +3,12 @@ # parameters: -- name: poolName - type: string + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + - name: poolName + type: string jobs: - job: x64_osx @@ -26,20 +30,21 @@ jobs: value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite" steps: - - bash: df -h - displayName: 'Report on Disk Space' - bash: | - sudo rm -rf ${{ variables.VCPKG_DOWNLOADS }} || 0 sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} || 0 sudo chmod 777 ${{ variables.VCPKG_DOWNLOADS }} || 0 exit 0 displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}' - - task: Bash@3 + - bash: ./bootstrap-vcpkg.sh displayName: 'Bootstrap vcpkg' - inputs: - filePath: bootstrap-vcpkg.sh + condition: eq('use default', '${{ parameters.vcpkgToolSha }}') + - bash: | + brew install cmake + ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }} + displayName: "Build vcpkg with CMake" + condition: ne('use default', '${{ parameters.vcpkgToolSha }}') - task: PowerShell@2 - displayName: '*** Test Modified Ports for x64-osx' + displayName: '*** Test Modified Ports' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' @@ -50,18 +55,13 @@ jobs: -WorkingRoot "${{ variables.WORKING_ROOT }}" -ArtifactStagingDirectory "$(Build.ArtifactStagingDirectory)" pwsh: true - - bash: | - df -h - displayName: 'Report on Disk Space After Build' - condition: always() - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: failure logs for x64-osx' inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs' ArtifactName: 'failure logs for x64-osx${{ variables.Postfix }}' condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') - - bash: | - python3 scripts/file_script.py /Users/vagrant/Data/installed/vcpkg/info/ + - bash: python3 scripts/file_script.py /Users/vagrant/Data/installed/vcpkg/info/ displayName: 'Build a file list for all packages' condition: always() - task: PublishBuildArtifacts@1 diff --git a/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json b/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json index 45917784a517bc..75cb83719ee843 100644 --- a/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json +++ b/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json @@ -1,10 +1,11 @@ { "$schema": "./vagrant-box-configuration.schema.json", "brew": [ - "autoconf", "autoconf-archive", + "autoconf", "automake", "bison", + "cmake", "gettext", "gfortran", "gperf", @@ -13,6 +14,7 @@ "meson", "mono", "nasm", + "ninja", "pkg-config", "texinfo", "yasm" diff --git a/scripts/azure-pipelines/windows-unstable/job.yml b/scripts/azure-pipelines/windows-unstable/job.yml index bac59834b25d30..325da69e1fd269 100644 --- a/scripts/azure-pipelines/windows-unstable/job.yml +++ b/scripts/azure-pipelines/windows-unstable/job.yml @@ -8,7 +8,7 @@ jobs: name: $(unstable-pool) workspace: clean: resources - timeoutInMinutes: 1440 # 1 day + timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT value: D:\ @@ -59,30 +59,18 @@ jobs: filePath: 'scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1' arguments: '-DropRoot "D:\msvc-drops\$(DropBuildNumber)" -BuildType ret' pwsh: true - - task: PowerShell@2 - displayName: 'Report on Disk Space' - condition: always() - inputs: - filePath: 'scripts/azure-pipelines/windows/disk-space.ps1' - pwsh: true - script: .\bootstrap-vcpkg.bat - displayName: 'Build vcpkg' + displayName: 'Bootstrap vcpkg' - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -PassingIsPassing' pwsh: true - - task: PowerShell@2 - displayName: 'Report on Disk Space After Build' - condition: always() - inputs: - filePath: 'scripts/azure-pipelines/windows/disk-space.ps1' - pwsh: true - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: failure logs for ${{ parameters.triplet }}' inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)\failure-logs' ArtifactName: 'failure logs for ${{ parameters.triplet }}' - condition: always() + condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 540d5af008a010..6f9220b0c91e5c 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -2,6 +2,20 @@ # SPDX-License-Identifier: MIT # +parameters: + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + - name: triplet + type: string + default: 'x86-windows' + - name: jobName + type: string + default: 'x86_windows' + - name: poolName + type: string + jobs: - job: ${{ parameters.jobName }} pool: @@ -26,14 +40,12 @@ jobs: value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)" steps: - - task: PowerShell@2 - displayName: 'Report on Disk Space' - condition: always() - inputs: - filePath: 'scripts/azure-pipelines/windows/disk-space.ps1' - pwsh: true - script: .\bootstrap-vcpkg.bat displayName: 'Bootstrap vcpkg' + condition: eq('use default', '${{ parameters.vcpkgToolSha }}') + - script: .\scripts\azure-pipelines\windows\bootstrap-from-source.cmd ${{ parameters.vcpkgToolSha }} + displayName: "Build vcpkg with CMake" + condition: ne('use default', '${{ parameters.vcpkgToolSha }}') # Note that we run docs checks before PR checks because they are likely to invalidate a whole run anyway - task: Powershell@2 displayName: 'Generate Documentation' @@ -59,7 +71,7 @@ jobs: PathtoPublish: '$(DiffFile)' ArtifactName: 'format.diff' - task: PowerShell@2 - displayName: '*** Test Modified Ports for ${{ parameters.triplet }}' + displayName: '*** Test Modified Ports' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' @@ -69,43 +81,7 @@ jobs: displayName: 'Validate version files' condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') inputs: - targetType: inline - script: | - ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose | - ForEach-Object -Begin { - $long_error = '' - } -Process { - if ($long_error -ne '' -and $_ -match '^$|^ ') { - # Extend multi-line message - $long_error = -join($long_error, "%0D%0A", $_ -replace '^ ','' ` - -replace '(git add) [^ ]*\\ports\\([^ ]*)', '$1 ports/$2' ) - } else { - if ($long_error -ne '') { - # Flush multi-line message - $long_error - $long_error = '' - } - if ($_ -match '^Error: ') { - # Start multi-line message - $long_error = $_ -replace '^Error: ', '##vso[task.logissue type=error]' ` - -replace '(^##vso[^\]]*)](.*) [^ ]*\\versions\\(.-)\\(.*.json)(.*)', '$1;sourcepath=versions/$3/$4;linenumber=2]$2 version/$3/$4$5' - } else { - # Normal line - $_ - } - } - } -End { - if ($long_error -ne '') { - # Flush multi-line message - $long_error - } - } - pwsh: true - - task: PowerShell@2 - displayName: 'Report on Disk Space After Build' - condition: always() - inputs: - filePath: 'scripts/azure-pipelines/windows/disk-space.ps1' + filePath: 'scripts/azure-pipelines/windows/validate-version-files.ps1' pwsh: true - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: failure logs for ${{ parameters.triplet }}' diff --git a/scripts/azure-pipelines/windows/bootstrap-from-source.cmd b/scripts/azure-pipelines/windows/bootstrap-from-source.cmd new file mode 100644 index 00000000000000..8f8aae33748094 --- /dev/null +++ b/scripts/azure-pipelines/windows/bootstrap-from-source.cmd @@ -0,0 +1,7 @@ +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x86 +git clone https://github.com/microsoft/vcpkg-tool vcpkg-tool +git -C vcpkg-tool switch -d %1 +rmdir /s /q build.x86.release > nul 2> nul +cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=OFF -DVCPKG_BUILD_FUZZING=OFF -DVCPKG_BUILD_TLS12_DOWNLOADER=OFF -B build.x86.release -S vcpkg-tool +ninja.exe -C build.x86.release +move build.x86.release\vcpkg.exe vcpkg.exe diff --git a/scripts/azure-pipelines/windows/validate-version-files.ps1 b/scripts/azure-pipelines/windows/validate-version-files.ps1 new file mode 100644 index 00000000000000..1bcb05a7bd81a8 --- /dev/null +++ b/scripts/azure-pipelines/windows/validate-version-files.ps1 @@ -0,0 +1,29 @@ +./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose | +ForEach-Object -Begin { + $long_error = '' +} -Process { + if ($long_error -ne '' -and $_ -match '^$|^ ') { + # Extend multi-line message + $long_error = -join($long_error, "%0D%0A", $_ -replace '^ ','' ` + -replace '(git add) [^ ]*\\ports\\([^ ]*)', '$1 ports/$2' ) + } else { + if ($long_error -ne '') { + # Flush multi-line message + $long_error + $long_error = '' + } + if ($_ -match '^Error: ') { + # Start multi-line message + $long_error = $_ -replace '^Error: ', '##vso[task.logissue type=error]' ` + -replace '(^##vso[^\]]*)](.*) [^ ]*\\versions\\(.-)\\(.*.json)(.*)', '$1;sourcepath=versions/$3/$4;linenumber=2]$2 version/$3/$4$5' + } else { + # Normal line + $_ + } + } +} -End { + if ($long_error -ne '') { + # Flush multi-line message + $long_error + } +} From c43d8d2079da1d9169a5934e73982e63511139a6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 23 May 2022 22:42:19 +0200 Subject: [PATCH 316/383] [lapack-reference] update to 3.10.1 (#24865) * lapack update to 3.10.1 * v db --- ports/lapack-reference/lapacke.patch | 16 ++++++++++++++++ ports/lapack-reference/portfile.cmake | 6 ++++-- ports/lapack-reference/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/lapack-reference.json | 5 +++++ 5 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 ports/lapack-reference/lapacke.patch diff --git a/ports/lapack-reference/lapacke.patch b/ports/lapack-reference/lapacke.patch new file mode 100644 index 00000000000000..964f0e31927fce --- /dev/null +++ b/ports/lapack-reference/lapacke.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ee66f1..7cec7ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -392,8 +392,9 @@ endif() + set(LAPACK_INSTALL_EXPORT_NAME ${LAPACK_INSTALL_EXPORT_NAME_CACHE}) + unset(LAPACK_INSTALL_EXPORT_NAME_CACHE) + +-add_subdirectory(LAPACKE) +- ++if(LAPACKE) ++ add_subdirectory(LAPACKE) ++endif() + + #------------------------------------- + # BLAS++ / LAPACK++ diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 8e7490c8f47b31..c536f3a6b515d3 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -11,14 +11,16 @@ endif() include(vcpkg_find_fortran) SET(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -set(lapack_ver 3.10.0) +set(lapack_ver 3.10.1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "Reference-LAPACK/lapack" REF "v${lapack_ver}" - SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf + SHA512 0500bbbb48483208c0a35b74972ff0059c389da6032824a2079637266a99fa980882eedf7f1fc490219ee4ff27812ac8c6afe118e25f40a9c2387e7b997762fb HEAD_REF master + PATCHES + lapacke.patch ) if(NOT VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index e52b1ef84d7d33..b2fe5d6998fa18 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lapack-reference", - "version": "3.10.0", + "version": "3.10.1", "description": "LAPACK - Linear Algebra PACKage", "homepage": "http://www.netlib.org/lapack/", "license": "BSD-3-Clause-Open-MPI", diff --git a/versions/baseline.json b/versions/baseline.json index 4d0ae6f40fc647..3e9818f2ff32fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3333,7 +3333,7 @@ "port-version": 0 }, "lapack-reference": { - "baseline": "3.10.0", + "baseline": "3.10.1", "port-version": 0 }, "lastools": { diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 999e4f135ff049..c5f07c06b3d8d2 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44ad48321efe7014cd1dc7ab7b46516309e6c395", + "version": "3.10.1", + "port-version": 0 + }, { "git-tree": "14b5e3ab7315ce36951f759c6254712ed41cc0af", "version": "3.10.0", From f8b80969125bf5d0a7ecfa64638fdf79e704d475 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Mon, 23 May 2022 22:42:39 +0200 Subject: [PATCH 317/383] [prometheus-cpp] Update to version 1.0.1 (#24862) --- ports/prometheus-cpp/portfile.cmake | 4 ++-- ports/prometheus-cpp/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/prometheus-cpp.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/prometheus-cpp/portfile.cmake b/ports/prometheus-cpp/portfile.cmake index 256f69c8ddc3cc..de74f9ba844132 100644 --- a/ports/prometheus-cpp/portfile.cmake +++ b/ports/prometheus-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jupp0r/prometheus-cpp - REF 4ea303fa66e4c26dc4df67045fa0edf09c2f3077 # v1.0.0 - SHA512 f97f380182cb7d8576f444e263159d5cc4572d71020b14a2d599041a6a4e5e2cb677a80c637b5a2bca55d4f0e570e87c2863d5dd48e317e9a912cca5a192e81a + REF 76470b3ec024c8214e1f4253fb1f4c0b28d3df94 # v1.0.1 + SHA512 bf5e68d99b5b0251154337bac11703ad4e84e0dc1292ecb3b9cbe0573bf2c0acbb5e3e96a417b0712b85665ea7a54514837a04be762fba954014f600148fd35f HEAD_REF master ) diff --git a/ports/prometheus-cpp/vcpkg.json b/ports/prometheus-cpp/vcpkg.json index 1f5ae41ba9c897..69217cea6c1406 100644 --- a/ports/prometheus-cpp/vcpkg.json +++ b/ports/prometheus-cpp/vcpkg.json @@ -1,7 +1,8 @@ { "name": "prometheus-cpp", - "version-semver": "1.0.0", + "version-semver": "1.0.1", "description": "Prometheus Client Library for Modern C++", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 3e9818f2ff32fd..781db7fadda3fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5581,7 +5581,7 @@ "port-version": 1 }, "prometheus-cpp": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "promise-cpp": { diff --git a/versions/p-/prometheus-cpp.json b/versions/p-/prometheus-cpp.json index 9ca74e847480d1..142866b1a392c0 100644 --- a/versions/p-/prometheus-cpp.json +++ b/versions/p-/prometheus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99e611dca8f7a6f529e867a6c6f6f88bae8705a6", + "version-semver": "1.0.1", + "port-version": 0 + }, { "git-tree": "8f679ed963f525e155342a6be082d02e03c96856", "version-semver": "1.0.0", From 399b0dd6d9584c42c6b1b63fb89697bdd716bfc9 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 23 May 2022 22:47:54 +0200 Subject: [PATCH 318/383] [vtk-m] Supports arm (#24853) --- ports/vtk-m/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/v-/vtk-m.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/vtk-m/vcpkg.json b/ports/vtk-m/vcpkg.json index e3b25e2702d604..08ad663c173e37 100644 --- a/ports/vtk-m/vcpkg.json +++ b/ports/vtk-m/vcpkg.json @@ -1,10 +1,10 @@ { "name": "vtk-m", "version-semver": "1.6.0", - "port-version": 1, + "port-version": 2, "description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.", "homepage": "https://gitlab.kitware.com/vtk/vtk-m/", - "supports": "x64 & !uwp", + "supports": "!x86 & !uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 781db7fadda3fc..7c022b202a7425 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7434,7 +7434,7 @@ }, "vtk-m": { "baseline": "1.6.0", - "port-version": 1 + "port-version": 2 }, "vulkan": { "baseline": "1.1.82.1", diff --git a/versions/v-/vtk-m.json b/versions/v-/vtk-m.json index a08928b0e67f2d..d96689fa0b82c8 100644 --- a/versions/v-/vtk-m.json +++ b/versions/v-/vtk-m.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfd540dbdb5d0684ea4e5363e3b32cfceadcb542", + "version-semver": "1.6.0", + "port-version": 2 + }, { "git-tree": "4732af1d6b93dd170e8340039ed4c111e32ff224", "version-semver": "1.6.0", From 52f2a3792e7225cfbf43640a2a2a5970301a8750 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 23 May 2022 22:56:08 +0200 Subject: [PATCH 319/383] [luajit] no absolute paths (#24847) --- ports/luajit/portfile.cmake | 2 ++ ports/luajit/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/luajit.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index 7eaf65aa136621..c96c311fcbeff3 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -102,4 +102,6 @@ file(INSTALL "${SOURCE_PATH}/src/lualib.h" DESTINATION "${CURRENT_PACKAGES_DIR file(INSTALL "${SOURCE_PATH}/src/lauxlib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") file(INSTALL "${SOURCE_PATH}/src/lua.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index c6acb5e1ad92d1..126729a0802ab6 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "luajit", "version": "2.0.5", - "port-version": 7, + "port-version": 8, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7c022b202a7425..98563a1e3bfce3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4314,7 +4314,7 @@ }, "luajit": { "baseline": "2.0.5", - "port-version": 7 + "port-version": 8 }, "luasec": { "baseline": "1.1.0", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index 17b0a64301bcfa..ee166d696b0d9c 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b560fe2d3810733d0b0f69b2a91093b02ac49b6", + "version": "2.0.5", + "port-version": 8 + }, { "git-tree": "daf2e19a72e3bf1d8a6c47a38489c9d1bd016d33", "version": "2.0.5", From f5ec9f3d6532d16fde1dad423c82391cbc4084aa Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 23 May 2022 22:59:11 +0200 Subject: [PATCH 320/383] [elfutils] no absolute paths (#24846) --- ports/elfutils/portfile.cmake | 6 ++++++ ports/elfutils/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/elfutils.json | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake index 58480ef4195984..450e3799b92def 100644 --- a/ports/elfutils/portfile.cmake +++ b/ports/elfutils/portfile.cmake @@ -45,6 +45,12 @@ else() endif() file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}.*" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}.*") file(REMOVE ${TO_REMOVE}) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/etc/profile.d/debuginfod.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/etc/profile.d/debuginfod.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/elfutils/bin/eu-make-debug-archive" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/elfutils/debug/bin/eu-make-debug-archive" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/elfutils/vcpkg.json b/ports/elfutils/vcpkg.json index 1e8588f325761f..e7b479013e9492 100644 --- a/ports/elfutils/vcpkg.json +++ b/ports/elfutils/vcpkg.json @@ -1,7 +1,7 @@ { "name": "elfutils", "version": "0.186", - "port-version": 2, + "port-version": 3, "description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.", "homepage": "https://sourceware.org/elfutils/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 98563a1e3bfce3..d36f9fdb2e0d9b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2062,7 +2062,7 @@ }, "elfutils": { "baseline": "0.186", - "port-version": 2 + "port-version": 3 }, "embree2": { "baseline": "2.17.7", diff --git a/versions/e-/elfutils.json b/versions/e-/elfutils.json index 2bd68e50f658c7..9d6c48f7c49c54 100644 --- a/versions/e-/elfutils.json +++ b/versions/e-/elfutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f78ad2c6d0fe406f09a163e5fb74a9b000c815c", + "version": "0.186", + "port-version": 3 + }, { "git-tree": "03e8299432623718bf6b58a61d19d408b6c8828c", "version": "0.186", From b2afb50afe9afb5fdd1417d27f10159f7a9aa7ec Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 24 May 2022 05:01:00 +0800 Subject: [PATCH 321/383] [simdjson] Update to 1.1.0 (#24842) * [simdjson] Update to 1.1.0 * [simdjson] Bump version --- ports/simdjson/portfile.cmake | 4 ++-- ports/simdjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simdjson.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 1a2fd4a87ab458..4d110769472f03 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF v1.0.2 + REF v1.1.0 HEAD_REF master - SHA512 04a3bee2d847680aa1f55115007ceec01652bebb8d5187cfbca0af81bedff355cbac949862a82e3060071da1a58b62d5b028bcd91562b962756aa5cab614f073 + SHA512 f8718bd039e1a25f0b95880b957c43e6eba6eada6bb7f58cedde37669a46b15b3ff9f4c4ea775e1cf949657642ef0472fa8bac5bdc98882df63e7f292fb5a723 ) vcpkg_check_features( diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 3a3ee28ada8f6c..f31850d16957a6 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version-semver": "1.0.2", + "version-semver": "1.1.0", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index d36f9fdb2e0d9b..6c44335e21b6ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6525,7 +6525,7 @@ "port-version": 0 }, "simdjson": { - "baseline": "1.0.2", + "baseline": "1.1.0", "port-version": 0 }, "simdutf": { diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index afbd92edaceb1b..85ee12e87c9955 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18a23d4f86c9f4d0db8feb5bb7eeb32ebcc3a3f2", + "version-semver": "1.1.0", + "port-version": 0 + }, { "git-tree": "0e7df8e0a4eb94c9825ee054fa91c7222568749f", "version-semver": "1.0.2", From 840f701d83d5019aa5033c9d9d08a4cc0d0ebdce Mon Sep 17 00:00:00 2001 From: Dale Phurrough Date: Mon, 23 May 2022 23:17:10 +0200 Subject: [PATCH 322/383] [spdlog] Improve macro baking (#24830) - correct vcpkg feature `wchar` - add support for integrations other than cmake - update port-version + vcpkg x-add-version spdlog --- ports/spdlog/portfile.cmake | 19 ++++++++++++++++--- ports/spdlog/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/spdlog.json | 5 +++++ 4 files changed, 23 insertions(+), 4 deletions(-) mode change 100644 => 100755 versions/baseline.json mode change 100644 => 100755 versions/s-/spdlog.json diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 264772c85e1a2d..e460dc0a738c2b 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -12,14 +12,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS wchar SPDLOG_WCHAR_SUPPORT ) -# configured in triplet file +# SPDLOG_WCHAR_FILENAMES can only be configured in triplet file since it is an alternative (not additive) if(NOT DEFINED SPDLOG_WCHAR_FILENAMES) set(SPDLOG_WCHAR_FILENAMES OFF) endif() if(NOT VCPKG_TARGET_IS_WINDOWS) if("wchar" IN_LIST FEATURES) message(WARNING "Feature 'wchar' is only supported for Windows and has no effect on other platforms.") - elseif(SPDLOG_WCHAR_FILENAMES) + elseif(SPDLOG_WCHAR_FILENAMES) message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.") endif() endif() @@ -45,10 +45,23 @@ vcpkg_copy_pdbs() # use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled) +# add support for integration other than cmake vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h "// #define SPDLOG_FMT_EXTERNAL" - "#define SPDLOG_FMT_EXTERNAL" + "#ifndef SPDLOG_FMT_EXTERNAL\n#define SPDLOG_FMT_EXTERNAL\n#endif" ) +if(SPDLOG_WCHAR_SUPPORT) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h + "// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT" + "#ifndef SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#define SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#endif" + ) +endif() +if(SPDLOG_WCHAR_FILENAMES) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h + "// #define SPDLOG_WCHAR_FILENAMES" + "#ifndef SPDLOG_WCHAR_FILENAMES\n#define SPDLOG_WCHAR_FILENAMES\n#endif" + ) +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index b643f8bf15090e..88c8341670efaa 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,6 +1,7 @@ { "name": "spdlog", "version-semver": "1.10.0", + "port-version": 1, "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json old mode 100644 new mode 100755 index 6c44335e21b6ec..ec4cbe922641d3 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6690,7 +6690,7 @@ }, "spdlog": { "baseline": "1.10.0", - "port-version": 0 + "port-version": 1 }, "spectra": { "baseline": "1.0.1", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json old mode 100644 new mode 100755 index 7f9464fa02d354..4c363c1fb8f900 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3256ea88cc375fda2f977a2eb18435e23d498572", + "version-semver": "1.10.0", + "port-version": 1 + }, { "git-tree": "1ac795913d88241171b45d796d3fe5dd38519d5a", "version-semver": "1.10.0", From 19379755554de68df13c2109606d7c995bae6cd4 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 23 May 2022 22:26:33 -0700 Subject: [PATCH 323/383] [ctp] Update supports expression to exclude static crt (#24884) --- ports/ctp/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/c-/ctp.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) mode change 100755 => 100644 versions/baseline.json diff --git a/ports/ctp/vcpkg.json b/ports/ctp/vcpkg.json index e568df5f701fd2..4893cae5f3122e 100644 --- a/ports/ctp/vcpkg.json +++ b/ports/ctp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "ctp", "version-string": "6.6.1_P1_20210406_se", - "port-version": 2, + "port-version": 3, "description": "The Comprehensive Transaction Platform (CTP) is a future brokerage management system developed specially for futures companies. CTP API client library allows users to connect to CTP gateway for algorithmic trading.", "homepage": "http://www.sfit.com.cn/index.htm", - "supports": "!osx & !uwp & !arm", + "supports": "!osx & !uwp & !arm & !(static & staticcrt)", "features": { "datacollect": { "description": "Data collect support of CTP" diff --git a/versions/baseline.json b/versions/baseline.json old mode 100755 new mode 100644 index ec4cbe922641d3..0f015233c103f7 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1722,7 +1722,7 @@ }, "ctp": { "baseline": "6.6.1_P1_20210406_se", - "port-version": 2 + "port-version": 3 }, "ctre": { "baseline": "3.6.0", diff --git a/versions/c-/ctp.json b/versions/c-/ctp.json index 3382ae094b0941..90896c07c44d98 100644 --- a/versions/c-/ctp.json +++ b/versions/c-/ctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11ff3d437cca5956d99f8690143f12a0ebd5e839", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 3 + }, { "git-tree": "7160f9a456cfd057dee1cb0a92f92a4f16876fe8", "version-string": "6.6.1_P1_20210406_se", From 475954aaa10fc1e78fae46010d54bf09fb094573 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 24 May 2022 23:32:15 +0800 Subject: [PATCH 324/383] [libigl] add cgal support (#24891) * add cgal support * update --- ports/libigl/portfile.cmake | 1 + ports/libigl/vcpkg.json | 9 ++++++++- versions/baseline.json | 2 +- versions/l-/libigl.json | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ports/libigl/portfile.cmake b/ports/libigl/portfile.cmake index 345aa4cc7c58ee..4c722d070af108 100644 --- a/ports/libigl/portfile.cmake +++ b/ports/libigl/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS #png LIBIGL_WITH_PNG # Disable this feature due to issue https://github.com/libigl/libigl/issues/1199 xml LIBIGL_WITH_XML #python LIBIGL_WITH_PYTHON # Python binding are in the process of being redone. + cgal LIBIGL_WITH_CGAL ) vcpkg_cmake_configure( diff --git a/ports/libigl/vcpkg.json b/ports/libigl/vcpkg.json index c74ff015f758dc..fca500d19551a9 100644 --- a/ports/libigl/vcpkg.json +++ b/ports/libigl/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libigl", "version": "2.3.0", - "port-version": 1, + "port-version": 2, "description": "libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB.", "homepage": "https://github.com/libigl/libigl", + "license": "GPL-3.0-only", "supports": "!(arm | uwp)", "dependencies": [ "eigen3", @@ -17,6 +18,12 @@ } ], "features": { + "cgal": { + "description": "Build with cgal", + "dependencies": [ + "cgal" + ] + }, "embree": { "description": "Build with embree", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0f015233c103f7..3e94cdf92722b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3678,7 +3678,7 @@ }, "libigl": { "baseline": "2.3.0", - "port-version": 1 + "port-version": 2 }, "libilbc": { "baseline": "3.0.4", diff --git a/versions/l-/libigl.json b/versions/l-/libigl.json index 17a22a4f486017..da1c5373e4205b 100644 --- a/versions/l-/libigl.json +++ b/versions/l-/libigl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fbdb4cb097785d6b9814e4a4ec89f8530a51c1a", + "version": "2.3.0", + "port-version": 2 + }, { "git-tree": "b4de37a62b3d7349f427f26ad38b8fe1f386d09d", "version": "2.3.0", From 6b1d19fbdf11223b4a3b26a1f34fe247b83fad2f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 24 May 2022 17:34:35 +0200 Subject: [PATCH 325/383] [cereal] update to 1.3.2 (#24867) * update cereal * v db * use ${PORT} * v db --- ports/cereal/portfile.cmake | 14 +++++++------- ports/cereal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cereal.json | 5 +++++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ports/cereal/portfile.cmake b/ports/cereal/portfile.cmake index 9c44ab2719153d..8869fcbc194693 100644 --- a/ports/cereal/portfile.cmake +++ b/ports/cereal/portfile.cmake @@ -3,13 +3,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO USCiLab/cereal - REF v1.3.1 - SHA512 5beafdd95b16344d5db43a0e26fd670a770e2c2a661ae117c9593db86697ca1034e2bf004fe6dc3c2a690e8a682f60d8b6121211d898009e59361ebef33f6fc9 + REF v1.3.2 + SHA512 98d306d6292789129675f1c5c5aedcb90cfcc1029c4482893a8f9b23f3c9755e5ed4762d7a528f215345cae6392e87cd8d89467115b6f031b41c8673d6b4b109 HEAD_REF master ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DJUST_INSTALL_CEREAL=ON @@ -19,9 +19,9 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cereal) # Clean -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cereal) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/cereal/LICENSE ${CURRENT_PACKAGES_DIR}/share/cereal/copyright) +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/cereal/vcpkg.json b/ports/cereal/vcpkg.json index 9582616edc8f74..dbdefb89c7339b 100644 --- a/ports/cereal/vcpkg.json +++ b/ports/cereal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cereal", - "version": "1.3.1", + "version": "1.3.2", "description": "a header-only C++11 serialization library (built in support for binary, XML and JSon)", "homepage": "https://github.com/USCiLab/cereal", "license": "BSD-3-Clause" diff --git a/versions/baseline.json b/versions/baseline.json index 3e94cdf92722b5..96c95a3b696776 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1305,7 +1305,7 @@ "port-version": 2 }, "cereal": { - "baseline": "1.3.1", + "baseline": "1.3.2", "port-version": 0 }, "ceres": { diff --git a/versions/c-/cereal.json b/versions/c-/cereal.json index 46847d295f3d90..9a7602b61ad34d 100644 --- a/versions/c-/cereal.json +++ b/versions/c-/cereal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdaabbb005403148dd7e53f5158199f6b1b297f2", + "version": "1.3.2", + "port-version": 0 + }, { "git-tree": "e292069bec2c118568ea23a3db965037a9e38790", "version": "1.3.1", From 2922c6f464a9c1aee7449030129fbc7d09f94e93 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 24 May 2022 17:37:45 +0200 Subject: [PATCH 326/383] [freetype] Update to 2.12.1 (#24866) * update freetype * v db * readd bzip2 patch * v db * add license * v db * CI retrigger --- ports/freetype/bzip2.patch | 13 +++++++++++++ ports/freetype/fix-bzip2-pc.patch | 13 ------------- ports/freetype/fix-exports.patch | 12 ++++++------ ports/freetype/portfile.cmake | 18 +++++++++--------- ports/freetype/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/f-/freetype.json | 5 +++++ 7 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 ports/freetype/bzip2.patch delete mode 100644 ports/freetype/fix-bzip2-pc.patch diff --git a/ports/freetype/bzip2.patch b/ports/freetype/bzip2.patch new file mode 100644 index 00000000000000..c0f9101f758b97 --- /dev/null +++ b/ports/freetype/bzip2.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 469a141a2..eec19c7d0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -517,7 +517,7 @@ if (BZIP2_FOUND) + if (PC_BZIP2_FOUND) + list(APPEND PKGCONFIG_REQUIRES_PRIVATE "bzip2") + else () +- list(APPEND PKGCONFIG_LIBS_PRIVATE "-lbz2") ++ list(APPEND PKGCONFIG_REQUIRES_PRIVATE "bzip2") + endif () + endif () + if (PNG_FOUND) diff --git a/ports/freetype/fix-bzip2-pc.patch b/ports/freetype/fix-bzip2-pc.patch deleted file mode 100644 index dac43924c07e24..00000000000000 --- a/ports/freetype/fix-bzip2-pc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb1b9a0f2..53d0bfc68 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -503,7 +503,7 @@ endif () - if (BZIP2_FOUND) - target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES}) - target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS -- list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2") -+ list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "bzip2") - endif () - if (PNG_FOUND) - target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES}) diff --git a/ports/freetype/fix-exports.patch b/ports/freetype/fix-exports.patch index 44dea78010d1f0..39b1e1581206e6 100644 --- a/ports/freetype/fix-exports.patch +++ b/ports/freetype/fix-exports.patch @@ -2,14 +2,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index cb1b9a0f2..edca5d579 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -496,7 +496,7 @@ set(PKG_CONFIG_REQUIRED_PRIVATE "") - set(PKG_CONFIG_LIBS_PRIVATE "") +@@ -508,7 +508,6 @@ set(PKG_CONFIG_REQUIRED_PRIVATE "") + set(PKGCONFIG_LIBS_PRIVATE "") if (ZLIB_FOUND) -- target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES}) -+ target_link_libraries(freetype PRIVATE ZLIB::ZLIB) - target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS}) - list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "zlib") +- target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES}) ++ target_link_libraries(freetype PRIVATE ZLIB::ZLIB) +- target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS}) + list(APPEND PKGCONFIG_REQUIRES_PRIVATE "zlib") endif () @@ -596,12 +596,25 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) install( diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 92e544feab3cbd..daa4ebf79e9eef 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -1,15 +1,15 @@ -set(FT_VERSION 2.11.1) +set(FT_VERSION 2.12.1) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO freetype/freetype2 REF ${FT_VERSION} FILENAME freetype-${FT_VERSION}.tar.xz - SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 + SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f PATCHES 0003-Fix-UWP.patch - fix-bzip2-pc.patch # we have a bzip2 file that we can use - https://gitlab.freedesktop.org/freetype/freetype/-/commit/b2aeca5fda870751f3c9d645e0dca4c80fa1ae5a brotli-static.patch + bzip2.patch fix-exports.patch ) @@ -53,7 +53,7 @@ string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlidec.lib" [[\$<\$ Date: Tue, 24 May 2022 17:41:00 +0200 Subject: [PATCH 327/383] [paraview] no absolute paths (#24852) * [paraview] no absolute paths * format portfile.cmake and remove version-semver * format vcpkg.json * x-add-version * update portfile.cmake * x-add-version * add license * update version Co-authored-by: Lily Wang --- ports/paraview/portfile.cmake | 47 +++++++++++++++++++---------------- ports/paraview/vcpkg.json | 13 ++++++++-- versions/baseline.json | 2 +- versions/p-/paraview.json | 5 ++++ 4 files changed, 42 insertions(+), 25 deletions(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 94ccea1a6f8f46..46ea8b9a8915fe 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -1,5 +1,5 @@ file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _vcpkg_json) -string(JSON _ver_string GET "${_vcpkg_json}" "version-semver") +string(JSON _ver_string GET "${_vcpkg_json}" "version") string(REGEX MATCH "^[0-9]+\.[0-9]+" VERSION "${_ver_string}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -62,9 +62,9 @@ vcpkg_from_gitlab( ) -file(COPY ${VISITIT_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/Utilities/VisItBridge) -file(COPY ${QTTESTING_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting) -file(COPY ${CATALYST_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/catalyst/vtkcatalyst/catalyst) +file(COPY "${VISITIT_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/Utilities/VisItBridge") +file(COPY "${QTTESTING_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting") +file(COPY "${CATALYST_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/catalyst/vtkcatalyst/catalyst") if("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) @@ -75,9 +75,8 @@ if("python" IN_LIST FEATURES) #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON @@ -102,16 +101,16 @@ if(CMAKE_HOST_UNIX) set(ENV{LD_LIBRARY_PATH} "${BACKUP_LD_LIBRARY_PATH}:${CURRENT_INSTALLED_DIR}/lib") endif() -vcpkg_install_cmake(ADD_BIN_TO_PATH) # Bin to path required since paraview will use some self build tools +vcpkg_cmake_install(ADD_BIN_TO_PATH) # Bin to path required since paraview will use some self build tools if(CMAKE_HOST_UNIX) set(ENV{LD_LIBRARY_PATH} "${BACKUP_LD_LIBRARY_PATH}") endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/paraview-${VERSION}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/paraview-${VERSION}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # see https://gitlab.kitware.com/paraview/paraview/-/issues/21328 file(REMOVE "${CURRENT_PACKAGES_DIR}/include/paraview-${VERSION}/vtkCPConfig.h") @@ -131,34 +130,34 @@ foreach(tool ${TOOLS}) # Remove debug tools set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) if(EXISTS ${filename}) - file(REMOVE ${filename}) + file(REMOVE "${filename}") endif() set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}-${TOOLVER}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) if(EXISTS ${filename}) - file(REMOVE ${filename}) + file(REMOVE "${filename}") endif() set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}-${TOOLVER}d${VCPKG_TARGET_EXECUTABLE_SUFFIX}) if(EXISTS ${filename}) - file(REMOVE ${filename}) + file(REMOVE "${filename}") endif() # Move release tools set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) if(EXISTS ${filename}) - file(INSTALL ${filename} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(REMOVE ${filename}) + file(INSTALL "${filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${filename}") endif() set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}-${TOOLVER}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) if(EXISTS ${filename}) - file(INSTALL ${filename} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(REMOVE ${filename}) + file(INSTALL "${filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${filename}") endif() endforeach() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) # # Handle copyright -file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/paraview RENAME Copyright.txt) # Which one is the correct one? -file(INSTALL ${SOURCE_PATH}/License_v1.2.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/paraview RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME Copyright.txt) # Which one is the correct one? +file(INSTALL "${SOURCE_PATH}/License_v1.2.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") macro(move_bin_to_lib name) @@ -182,5 +181,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(WRITE "${cmake_file}" "${_contents}") endforeach() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() \ No newline at end of file + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# The plugins also work without these files +file(REMOVE "${CURRENT_PACKAGES_DIR}/Applications/paraview.app/Contents/Resources/paraview.conf") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/Applications/paraview.app/Contents/Resources/paraview.conf") diff --git a/ports/paraview/vcpkg.json b/ports/paraview/vcpkg.json index c531933dcbb93b..ba62136a07e25b 100644 --- a/ports/paraview/vcpkg.json +++ b/ports/paraview/vcpkg.json @@ -1,15 +1,24 @@ { "name": "paraview", - "version-semver": "5.9.1", - "port-version": 1, + "version": "5.9.1", + "port-version": 2, "description": "VTK-based Data Analysis and Visualization Application", "homepage": "https://www.paraview.org/", + "license": "BSD-3-Clause", "dependencies": [ "boost-algorithm", "boost-core", "boost-format", "cgns", "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, { "name": "vtk", "default-features": false, diff --git a/versions/baseline.json b/versions/baseline.json index 635b97917af0ea..9758e27329d29d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5322,7 +5322,7 @@ }, "paraview": { "baseline": "5.9.1", - "port-version": 1 + "port-version": 2 }, "parmetis": { "baseline": "4.0.3", diff --git a/versions/p-/paraview.json b/versions/p-/paraview.json index d3c3cbbab4bb15..91d43f8c5be465 100644 --- a/versions/p-/paraview.json +++ b/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f5d22c6754f293f54a360472f78e760f06aae80", + "version": "5.9.1", + "port-version": 2 + }, { "git-tree": "7011d869273b8aa610ef7b302587c614137c73e5", "version-semver": "5.9.1", From eddbb406cff0ff7828592d5a92e64abb59808534 Mon Sep 17 00:00:00 2001 From: Alexandre Bique Date: Tue, 24 May 2022 17:47:18 +0200 Subject: [PATCH 328/383] [mpg123] Update to 1.29.3 (#24805) Fixes #24381 --- ports/mpg123/fix-m1-build.patch | 4 ++-- ports/mpg123/no-executables.patch | 13 ------------- ports/mpg123/portfile.cmake | 10 +++++----- ports/mpg123/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/m-/mpg123.json | 5 +++++ 6 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 ports/mpg123/no-executables.patch diff --git a/ports/mpg123/fix-m1-build.patch b/ports/mpg123/fix-m1-build.patch index f8367d3ef93b9f..d198d953b3aa15 100644 --- a/ports/mpg123/fix-m1-build.patch +++ b/ports/mpg123/fix-m1-build.patch @@ -5,9 +5,9 @@ index ee9a1ba..81d23f8 100644 @@ -185,7 +185,7 @@ if(NO_MESSAGES) set(NO_ERETURN ON) endif() - + -if(WIN32) -+if(WIN32 OR APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm) ++if(WIN32 OR APPLE) set(HAVE_FPU 1) else() cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU) diff --git a/ports/mpg123/no-executables.patch b/ports/mpg123/no-executables.patch deleted file mode 100644 index a7a62ec1d961d2..00000000000000 --- a/ports/mpg123/no-executables.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt -index c7ba36f..7147174 100644 ---- a/ports/cmake/src/CMakeLists.txt -+++ b/ports/cmake/src/CMakeLists.txt -@@ -372,7 +372,7 @@ if(BUILD_LIBOUT123) - endif() - add_subdirectory("libsyn123") - --if(UNIX) -+if(0) - add_subdirectory("tests") - - if(BUILD_LIBOUT123) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 080ec09e4ec599..4efadfc92125cb 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -1,14 +1,12 @@ -set(MPG123_VERSION 1.29.2) -set(MPG123_HASH ffb82ffbebedeb12783338b5159bf055afd25cb77e1b705bef29f04fa50bcb2ceaf2a6418d0e111fab1151ea956fe48ba3576d978e6b0c8f4ca72c3883608ec0) +set(MPG123_VERSION 1.29.3) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO mpg123/mpg123 REF ${MPG123_VERSION} FILENAME "mpg123-${MPG123_VERSION}.tar.bz2" - SHA512 ${MPG123_HASH} + SHA512 0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6 PATCHES - no-executables.patch fix-modulejack.patch fix-m1-build.patch ) @@ -20,7 +18,9 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/ports/cmake" - OPTIONS -DUSE_MODULES=OFF + OPTIONS + -DUSE_MODULES=OFF + -DBUILD_PROGRAMS=OFF ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index 50daa81591905d..018bac57e7b3e1 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mpg123", - "version": "1.29.2", - "port-version": 3, + "version": "1.29.3", "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 9758e27329d29d..a82b85b07970da 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4649,8 +4649,8 @@ "port-version": 4 }, "mpg123": { - "baseline": "1.29.2", - "port-version": 3 + "baseline": "1.29.3", + "port-version": 0 }, "mpi": { "baseline": "1", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 6f87618c878669..82c90e4bc82d47 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b99f7a71d1996dc6a61c81a11a9a98805eba1c4", + "version": "1.29.3", + "port-version": 0 + }, { "git-tree": "d3b079fc036d9384ae34ead0db7c689499937039", "version": "1.29.2", From 6a66e95caad0c880393cd0b99dc0edecd7d7a751 Mon Sep 17 00:00:00 2001 From: SunBlack Date: Tue, 24 May 2022 21:11:39 +0200 Subject: [PATCH 329/383] [vcpkg.cmake][ports.cmake] Prefer STREQUAL over MATCHES (#23014) Co-authored-by: Heiko Thiel --- scripts/buildsystems/vcpkg.cmake | 16 ++++++++-------- scripts/ports.cmake | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 6362c8eaf23cb6..31cee14eb703bd 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -245,21 +245,21 @@ elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]$") elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]64$") set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) else() - if(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015 Win64$") + if(CMAKE_GENERATOR STREQUAL "Visual Studio 14 2015 Win64") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) - elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015 ARM$") + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 14 2015 ARM") set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) - elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015$") + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 14 2015") set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) - elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 Win64$") + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017 Win64") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) - elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 ARM$") + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017 ARM") set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) - elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017$") + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017") set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) - elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019$") + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 16 2019") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) - elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 17 2022$") + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) else() find_program(Z_VCPKG_CL cl) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 581969636b4771..e8592824fbf8fe 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -95,7 +95,7 @@ if(PORT) set(CURRENT_PACKAGES_DIR "${PACKAGES_DIR}/${PORT}_${TARGET_TRIPLET}") endif() -if(CMD MATCHES "^BUILD$") +if(CMD STREQUAL "BUILD") set(CMAKE_TRIPLET_FILE "${TARGET_TRIPLET_FILE}") if(NOT EXISTS "${CMAKE_TRIPLET_FILE}") message(FATAL_ERROR "Unsupported target triplet. Triplet file does not exist: ${CMAKE_TRIPLET_FILE}") @@ -147,7 +147,7 @@ if(CMD MATCHES "^BUILD$") if(DEFINED PORT) include("${SCRIPTS}/build_info.cmake") endif() -elseif(CMD MATCHES "^CREATE$") +elseif(CMD STREQUAL "CREATE") file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}" NATIVE_VCPKG_ROOT_DIR) file(TO_NATIVE_PATH "${DOWNLOADS}" NATIVE_DOWNLOADS) if(NOT DEFINED PORT_PATH) From c40e73f7e97bd9947c82da937cbdae7b56606e28 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 25 May 2022 01:10:34 +0200 Subject: [PATCH 330/383] [llvm] no absolute paths (#24878) --- ports/llvm/portfile.cmake | 5 +++++ ports/llvm/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/llvm.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 0896fa6ba332c3..b04d7e44c6cd79 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -302,6 +302,11 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") ) endif() +if("mlir" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "set(MLIR_MAIN_SRC_DIR \"${SOURCE_PATH}/mlir\")" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "\${MLIR_INCLUDE_DIRS}") +endif() + # LLVM still generates a few DLLs in the static build: # * LLVM-C.dll # * libclang.dll diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 383aad641ffe79..918f1cd7cad37a 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "llvm", "version": "14.0.3", + "port-version": 1, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a82b85b07970da..af0c0f094854b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4266,7 +4266,7 @@ }, "llvm": { "baseline": "14.0.3", - "port-version": 0 + "port-version": 1 }, "lmdb": { "baseline": "0.9.29", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index a2af523ae03617..18b97acd0d6990 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "741b89d3872cb0152d5c295ce075b8d751381f51", + "version": "14.0.3", + "port-version": 1 + }, { "git-tree": "751084451d4807176af868b2edab17131c2e4a09", "version": "14.0.3", From 93b38546e271ac8047a6dd00469f14845beb4642 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 25 May 2022 07:21:09 +0800 Subject: [PATCH 331/383] [kinectsdk1][kinectsdk2] Add Config.cmake.in (#24877) * [kinectsdk1, kinectsdk2] Add Config.cmake.in * change version-string to version * x-add-version * update supports * x-add-version * [kinectsdk1][kinectsdk2] Switch to lessmsi Co-authored-by: Lily Wang Co-authored-by: Robert Schumacher --- ports/kinectsdk1/Config.cmake.in | 33 +++++++++++++++++++++ ports/kinectsdk1/portfile.cmake | 50 +++++++++++++++++--------------- ports/kinectsdk1/vcpkg.json | 11 +++++-- ports/kinectsdk2/Config.cmake.in | 33 +++++++++++++++++++++ ports/kinectsdk2/portfile.cmake | 36 ++++++++++------------- ports/kinectsdk2/vcpkg.json | 13 +++++++-- scripts/ci.baseline.txt | 8 ----- versions/baseline.json | 4 +-- versions/k-/kinectsdk1.json | 5 ++++ versions/k-/kinectsdk2.json | 5 ++++ 10 files changed, 139 insertions(+), 59 deletions(-) create mode 100644 ports/kinectsdk1/Config.cmake.in create mode 100644 ports/kinectsdk2/Config.cmake.in diff --git a/ports/kinectsdk1/Config.cmake.in b/ports/kinectsdk1/Config.cmake.in new file mode 100644 index 00000000000000..37b7a133ab306b --- /dev/null +++ b/ports/kinectsdk1/Config.cmake.in @@ -0,0 +1,33 @@ + +get_filename_component(_kinectsdk1_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_kinectsdk1_root "${_kinectsdk1_root}" PATH) +get_filename_component(_kinectsdk1_root "${_kinectsdk1_root}" PATH) + +set(_kinectsdk1_rel_lib "${_kinectsdk1_root}/lib/Kinect10.lib") +set(_kinectsdk1_dbg_lib "${_kinectsdk1_root}/debug/lib/Kinect10.lib") +if (EXISTS "${_kinectsdk1_rel_lib}" OR EXISTS "${_kinectsdk1_dbg_lib}") + + add_library(unofficial::kinectsdk1::kinectsdk1 INTERFACE IMPORTED) + set_target_properties(unofficial::kinectsdk1::kinectsdk1 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_kinectsdk1_root}/include") + + if (EXISTS "${_kinectsdk1_rel_lib}") + set_target_properties(unofficial::kinectsdk1::kinectsdk1 + PROPERTIES IMPORTED_LOCATION_RELEASE "${_kinectsdk1_rel_lib}") + set_property(TARGET unofficial::kinectsdk1::kinectsdk1 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + endif() + if (EXISTS "${_kinectsdk1_dbg_lib}") + set_target_properties(unofficial::kinectsdk1::kinectsdk1 + PROPERTIES IMPORTED_LOCATION_DEBUG "${_kinectsdk1_dbg_lib}") + set_property(TARGET unofficial::kinectsdk1::kinectsdk1 APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + endif() + +else() + + set(kinectsdk1_FOUND FALSE) + +endif() + +unset(_kinectsdk1_rel_lib) +unset(_kinectsdk1_dbg_lib) + +unset(_kinectsdk1_root) diff --git a/ports/kinectsdk1/portfile.cmake b/ports/kinectsdk1/portfile.cmake index 305f9d7bb5dbab..59c0ddf0166db8 100644 --- a/ports/kinectsdk1/portfile.cmake +++ b/ports/kinectsdk1/portfile.cmake @@ -1,4 +1,13 @@ set(KINECTSDK10_VERSION "v1.8") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ARCHITECTURE x86) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCHITECTURE amd64) +else() + message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + vcpkg_download_distfile(KINECTSDK10_INSTALLER URLS "https://download.microsoft.com/download/E/1/D/E1DEC243-0389-4A23-87BF-F47DE869FC1A/KinectSDK-${KINECTSDK10_VERSION}-Setup.exe" FILENAME "KinectSDK-${KINECTSDK10_VERSION}-Setup.exe" @@ -10,23 +19,22 @@ vcpkg_find_acquire_program(DARK) set(KINECTSDK10_WIX_INSTALLER "${KINECTSDK10_INSTALLER}") set(KINECTSDK10_WIX_EXTRACT_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/wix") vcpkg_execute_required_process( - COMMAND ${DARK} -x ${KINECTSDK10_WIX_EXTRACT_DIR} ${KINECTSDK10_WIX_INSTALLER} + COMMAND "${DARK}" -x "${KINECTSDK10_WIX_EXTRACT_DIR}" "${KINECTSDK10_WIX_INSTALLER}" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME extract_wix_installer + LOGNAME extract-wix-${TARGET_TRIPLET} ) -file(TO_NATIVE_PATH "${KINECTSDK10_WIX_EXTRACT_DIR}/AttachedContainer/KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}.msi" KINECTSDK10_MSI_INSTALLER) -file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/src/installer/msi/${VCPKG_TARGET_ARCHITECTURE}" KINECTSDK10_MSI_EXTRACT_DIR) -file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/msiexec.log" MSIEXEC_LOG_PATH) -set(BATCH_FILE ${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat) -file(WRITE ${BATCH_FILE} "msiexec.exe /a \"${KINECTSDK10_MSI_INSTALLER}\" /qn /log \"${MSIEXEC_LOG_PATH}\" TARGETDIR=\"${KINECTSDK10_MSI_EXTRACT_DIR}\"") +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}") +set(KINECTSDK10_MSI_INSTALLER "installer\\wix\\AttachedContainer\\KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}.msi") vcpkg_execute_required_process( - COMMAND ${BATCH_FILE} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME extract_msi_installer_${VCPKG_TARGET_ARCHITECTURE} + COMMAND + "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" + x + "${KINECTSDK10_MSI_INSTALLER}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src" + LOGNAME extract-msi-${TARGET_TRIPLET} ) - -set(KINECTSDK10_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/msi/${VCPKG_TARGET_ARCHITECTURE}/Microsoft SDKs/Kinect/${KINECTSDK10_VERSION}") +set(KINECTSDK10_DIR "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}/SourceDir/Microsoft SDKs/Kinect/${KINECTSDK10_VERSION}") file( INSTALL @@ -35,30 +43,24 @@ file( "${KINECTSDK10_DIR}/inc/NuiSensor.h" "${KINECTSDK10_DIR}/inc/NuiSkeleton.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include + "${CURRENT_PACKAGES_DIR}/include" ) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(ARCHITECTURE x86) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(ARCHITECTURE amd64) -else() - message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - file( INSTALL "${KINECTSDK10_DIR}/lib/${ARCHITECTURE}/Kinect10.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/lib" ) file( INSTALL "${KINECTSDK10_DIR}/lib/${ARCHITECTURE}/Kinect10.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib + "${CURRENT_PACKAGES_DIR}/debug/lib" ) +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY) + # Handle copyright -file(INSTALL ${KINECTSDK10_DIR}/SDKEula.rtf DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${KINECTSDK10_DIR}/SDKEula.rtf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kinectsdk1/vcpkg.json b/ports/kinectsdk1/vcpkg.json index 225fe460e37185..7d4a3a029f8295 100644 --- a/ports/kinectsdk1/vcpkg.json +++ b/ports/kinectsdk1/vcpkg.json @@ -1,7 +1,14 @@ { "name": "kinectsdk1", "version": "1.8", - "port-version": 4, + "port-version": 5, "description": "Kinect for Windows SDK for Kinect v1 sensor.", - "supports": "!arm" + "license": null, + "supports": "!arm & windows", + "dependencies": [ + { + "name": "vcpkg-tool-lessmsi", + "host": true + } + ] } diff --git a/ports/kinectsdk2/Config.cmake.in b/ports/kinectsdk2/Config.cmake.in new file mode 100644 index 00000000000000..04291aa0969e28 --- /dev/null +++ b/ports/kinectsdk2/Config.cmake.in @@ -0,0 +1,33 @@ + +get_filename_component(_kinectsdk2_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_kinectsdk2_root "${_kinectsdk2_root}" PATH) +get_filename_component(_kinectsdk2_root "${_kinectsdk2_root}" PATH) + +set(_kinectsdk2_rel_lib "${_kinectsdk2_root}/lib/Kinect20.lib") +set(_kinectsdk2_dbg_lib "${_kinectsdk2_root}/debug/lib/Kinect20.lib") +if (EXISTS "${_kinectsdk2_rel_lib}" OR EXISTS "${_kinectsdk2_dbg_lib}") + + add_library(unofficial::kinectsdk2::kinectsdk2 INTERFACE IMPORTED) + set_target_properties(unofficial::kinectsdk2::kinectsdk2 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_kinectsdk2_root}/include") + + if (EXISTS "${_kinectsdk2_rel_lib}") + set_target_properties(unofficial::kinectsdk2::kinectsdk2 + PROPERTIES IMPORTED_LOCATION_RELEASE "${_kinectsdk2_rel_lib}") + set_property(TARGET unofficial::kinectsdk2::kinectsdk2 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + endif() + if (EXISTS "${_kinectsdk2_dbg_lib}") + set_target_properties(unofficial::kinectsdk2::kinectsdk2 + PROPERTIES IMPORTED_LOCATION_DEBUG "${_kinectsdk2_dbg_lib}") + set_property(TARGET unofficial::kinectsdk2::kinectsdk2 APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + endif() + +else() + + set(kinectsdk2_FOUND FALSE) + +endif() + +unset(_kinectsdk2_rel_lib) +unset(_kinectsdk2_dbg_lib) + +unset(_kinectsdk2_root) diff --git a/ports/kinectsdk2/portfile.cmake b/ports/kinectsdk2/portfile.cmake index 3ed2101721a0ab..8e8e3e5c0b4997 100644 --- a/ports/kinectsdk2/portfile.cmake +++ b/ports/kinectsdk2/portfile.cmake @@ -1,9 +1,5 @@ vcpkg_buildpath_length_warning(37) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - set(KINECTSDK20_VERSION "v2.0_1409") vcpkg_download_distfile(KINECTSDK20_INSTALLER URLS "https://download.microsoft.com/download/F/2/D/F2D1012E-3BC6-49C5-B8B3-5ACFF58AF7B8/KinectSDK-${KINECTSDK20_VERSION}-Setup.exe" @@ -18,43 +14,43 @@ set(KINECTSDK20_WIX_EXTRACT_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/wix") vcpkg_execute_required_process( COMMAND ${DARK} -x ${KINECTSDK20_WIX_EXTRACT_DIR} ${KINECTSDK20_WIX_INSTALLER} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME extract_wix_installer + LOGNAME extract-wix-${TARGET_TRIPLET} ) -file(TO_NATIVE_PATH "${KINECTSDK20_WIX_EXTRACT_DIR}/AttachedContainer/KinectSDK-${KINECTSDK20_VERSION}-x64.msi" KINECTSDK20_MSI_INSTALLER) -file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/src/installer/msi" KINECTSDK20_MSI_EXTRACT_DIR) -file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/msiexec.log" MSIEXEC_LOG_PATH) -set(BATCH_FILE ${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat) -file(WRITE ${BATCH_FILE} "msiexec.exe /a \"${KINECTSDK20_MSI_INSTALLER}\" /qn /log \"${MSIEXEC_LOG_PATH}\" TARGETDIR=\"${KINECTSDK20_MSI_EXTRACT_DIR}\"") +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK20_VERSION}-x64") +set(KINECTSDK20_MSI_INSTALLER "installer\\wix\\AttachedContainer\\KinectSDK-${KINECTSDK20_VERSION}-x64.msi") vcpkg_execute_required_process( - COMMAND ${BATCH_FILE} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME extract_msi_installer + COMMAND + "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" + x + "${KINECTSDK20_MSI_INSTALLER}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src" + LOGNAME extract-msi-${TARGET_TRIPLET} ) - -set(KINECTSDK20_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/msi/Microsoft SDKs/Kinect/${KINECTSDK20_VERSION}") +set(KINECTSDK20_DIR "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK20_VERSION}-x64/SourceDir/Microsoft SDKs/Kinect/${KINECTSDK20_VERSION}") file( INSTALL "${KINECTSDK20_DIR}/inc/" DESTINATION - ${CURRENT_PACKAGES_DIR}/include + "${CURRENT_PACKAGES_DIR}/include" ) file( INSTALL "${KINECTSDK20_DIR}/Lib/${VCPKG_TARGET_ARCHITECTURE}/Kinect20.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/lib" ) file( INSTALL "${KINECTSDK20_DIR}/Lib/${VCPKG_TARGET_ARCHITECTURE}/Kinect20.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib + "${CURRENT_PACKAGES_DIR}/debug/lib" ) +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY) + # Handle copyright -file(COPY "${KINECTSDK20_DIR}/SDKEula.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/kinectsdk2) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/kinectsdk2/SDKEula.rtf ${CURRENT_PACKAGES_DIR}/share/kinectsdk2/copyright) +file(INSTALL "${KINECTSDK20_DIR}/SDKEula.rtf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kinectsdk2/vcpkg.json b/ports/kinectsdk2/vcpkg.json index 5b065d28f6a6e2..def81862845891 100644 --- a/ports/kinectsdk2/vcpkg.json +++ b/ports/kinectsdk2/vcpkg.json @@ -1,7 +1,14 @@ { "name": "kinectsdk2", - "version-string": "2.0", - "port-version": 3, + "version": "2.0", + "port-version": 4, "description": "Kinect for Windows SDK for Kinect v2 sensor.", - "supports": "!arm" + "license": null, + "supports": "!arm & windows", + "dependencies": [ + { + "name": "vcpkg-tool-lessmsi", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index badbf8f376d987..b9d01b3cfbac99 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -416,14 +416,6 @@ jinja2cpplight:x64-uwp=fail kfr:arm64-windows=fail kfr:arm-uwp=fail kfr:x64-linux=fail -kinectsdk1:arm64-windows=fail -kinectsdk1:arm-uwp=fail -kinectsdk1:x64-linux=fail -kinectsdk1:x64-osx=fail -kinectsdk2:arm64-windows=fail -kinectsdk2:arm-uwp=fail -kinectsdk2:x64-linux=fail -kinectsdk2:x64-osx=fail lastools:arm-uwp=fail lastools:x64-uwp=fail laszip:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index af0c0f094854b8..17debef06d9389 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3278,11 +3278,11 @@ }, "kinectsdk1": { "baseline": "1.8", - "port-version": 4 + "port-version": 5 }, "kinectsdk2": { "baseline": "2.0", - "port-version": 3 + "port-version": 4 }, "kissfft": { "baseline": "2021-11-14", diff --git a/versions/k-/kinectsdk1.json b/versions/k-/kinectsdk1.json index 263c425735568d..5c8c5bfc22c45a 100644 --- a/versions/k-/kinectsdk1.json +++ b/versions/k-/kinectsdk1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "688e49039e9c86fcb57c431b527a7f125a996857", + "version": "1.8", + "port-version": 5 + }, { "git-tree": "d49f0532a6e9776666ef3960a9b267f32ff3cfc4", "version": "1.8", diff --git a/versions/k-/kinectsdk2.json b/versions/k-/kinectsdk2.json index 0243bb1b496c7b..418b22af43461f 100644 --- a/versions/k-/kinectsdk2.json +++ b/versions/k-/kinectsdk2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fc9568898ab7f14edea8ffb65da87161c9c0b6c", + "version": "2.0", + "port-version": 4 + }, { "git-tree": "a0a13df11c972355370eef866bd266e2ae7c90d5", "version-string": "2.0", From 46720b28d5743270850b1bc01a312a61ed96ea92 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Wed, 25 May 2022 12:17:49 -0700 Subject: [PATCH 332/383] [cppgraphqlgen] Update to v4.5.0 release (#24907) * [cppgraphqlgen] Update to v4.5.0 release * vcpkg x-add-version --all --- ports/cppgraphqlgen/portfile.cmake | 4 ++-- ports/cppgraphqlgen/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cppgraphqlgen.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 0800fab2571504..1270b2f9e8a1d9 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cppgraphqlgen - REF v4.4.1 - SHA512 6d22b1b63e2aaed9264bbb88a09c33a3a30d596a2745696b893cb19ae143e9372615913c6b70fcceb09778e645f1a81371fbb2096f522fe395b95df018e9218e + REF v4.5.0 + SHA512 5a8eb6fc90aee05ae25245fac3e97a00c637d61340a070a28f1e5b7827d0e18ed01d3e6c4dcc138961769f7eef64ac8c6b33f7f16f8536d070a5ddffad0de414 HEAD_REF main ) diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json index 4becb34130f4a9..16e12c0381e026 100644 --- a/ports/cppgraphqlgen/vcpkg.json +++ b/ports/cppgraphqlgen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppgraphqlgen", - "version": "4.4.1", + "version": "4.5.0", "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 17debef06d9389..76c1531366ccbf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1613,7 +1613,7 @@ "port-version": 1 }, "cppgraphqlgen": { - "baseline": "4.4.1", + "baseline": "4.5.0", "port-version": 0 }, "cppitertools": { diff --git a/versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json index 7a4d7c679fb084..4d56a8c7e14325 100644 --- a/versions/c-/cppgraphqlgen.json +++ b/versions/c-/cppgraphqlgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "301c3f2b22160ddfc752b69253cc3745ef4320f8", + "version": "4.5.0", + "port-version": 0 + }, { "git-tree": "52eaf92f61791cfb08e2a8848ccbf1c02748f064", "version": "4.4.1", From 4a182b35d85300a2b13788edce6c3d1a87efbbd3 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 25 May 2022 21:18:21 +0200 Subject: [PATCH 333/383] [cereal] Replace deprecated cmake (#24897) * Replace deprecared cmake * version --- ports/cereal/portfile.cmake | 10 ++++------ ports/cereal/vcpkg.json | 13 ++++++++++++- versions/baseline.json | 2 +- versions/c-/cereal.json | 5 +++++ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ports/cereal/portfile.cmake b/ports/cereal/portfile.cmake index 8869fcbc194693..cf667b6f3740ca 100644 --- a/ports/cereal/portfile.cmake +++ b/ports/cereal/portfile.cmake @@ -8,20 +8,18 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DJUST_INSTALL_CEREAL=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cereal) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cereal) # Clean file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cereal/vcpkg.json b/ports/cereal/vcpkg.json index dbdefb89c7339b..aface78b9abcc3 100644 --- a/ports/cereal/vcpkg.json +++ b/ports/cereal/vcpkg.json @@ -1,7 +1,18 @@ { "name": "cereal", "version": "1.3.2", + "port-version": 1, "description": "a header-only C++11 serialization library (built in support for binary, XML and JSon)", "homepage": "https://github.com/USCiLab/cereal", - "license": "BSD-3-Clause" + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 76c1531366ccbf..9ac628a3b281a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1306,7 +1306,7 @@ }, "cereal": { "baseline": "1.3.2", - "port-version": 0 + "port-version": 1 }, "ceres": { "baseline": "2.1.0", diff --git a/versions/c-/cereal.json b/versions/c-/cereal.json index 9a7602b61ad34d..9ceeed2ddaa46f 100644 --- a/versions/c-/cereal.json +++ b/versions/c-/cereal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "075869fcf5302c6dd11d564286d0dfa1d2d4d7a1", + "version": "1.3.2", + "port-version": 1 + }, { "git-tree": "fdaabbb005403148dd7e53f5158199f6b1b297f2", "version": "1.3.2", From 8b9004a202d88df026cf8667328e096e6ed88b27 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 26 May 2022 03:19:06 +0800 Subject: [PATCH 334/383] [gdcm] update to 3.0.12 (#24892) * [gdcm] update to 3.0.12 * updtae version --- ports/gdcm/portfile.cmake | 4 ++-- ports/gdcm/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/g-/gdcm.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake index 99abfc8a6f0f60..3055b1a4220da2 100644 --- a/ports/gdcm/portfile.cmake +++ b/ports/gdcm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO malaterre/GDCM - REF c0824c0ae66e9f9e3c8bddba8b65238c1c28481d # v3.0.7 - SHA512 1889f18f7164e1395e2cf5fe29b6ccd615f9a31433d1a7bda19cac472b20bc52018ef45bd9d9ca72ecb248c9fd5d895b94bfd111157693f70e0b90cf7b582edd + REF 1f94bafc929db3648612848836f7899f101d6641 # v3.0.12 + SHA512 cec050c61d9880880b8b72234f8b0824a1f1fa8f9b2419fec85a0f27fe3bca4f9f80aa735b35775ac098f5827fde454aba700ebea17f5f8657894d26f5140f4a HEAD_REF master PATCHES use-openjpeg-config.patch diff --git a/ports/gdcm/vcpkg.json b/ports/gdcm/vcpkg.json index 8583fbda203812..e0dedd842baf45 100644 --- a/ports/gdcm/vcpkg.json +++ b/ports/gdcm/vcpkg.json @@ -1,9 +1,9 @@ { "name": "gdcm", - "version": "3.0.7", - "port-version": 4, + "version": "3.0.12", "description": "Grassroots DICOM library", "homepage": "https://github.com/malaterre/GDCM", + "license": "BSD-3-Clause", "supports": "!uwp & !(windows & arm)", "dependencies": [ "expat", diff --git a/versions/baseline.json b/versions/baseline.json index 9ac628a3b281a4..e65a7705225829 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2437,8 +2437,8 @@ "port-version": 0 }, "gdcm": { - "baseline": "3.0.7", - "port-version": 4 + "baseline": "3.0.12", + "port-version": 0 }, "gdcm2": { "baseline": "deprecated", diff --git a/versions/g-/gdcm.json b/versions/g-/gdcm.json index 3c99bc96ff3840..f18a8a6e17a975 100644 --- a/versions/g-/gdcm.json +++ b/versions/g-/gdcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d88a2229a173f1d38ae7beeb24d8169957968e74", + "version": "3.0.12", + "port-version": 0 + }, { "git-tree": "64bda232157a1119e4a16b3379294d13354e8971", "version": "3.0.7", From b3e88649a2d57f1d728c4c242b583a77a43a9b22 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 25 May 2022 12:19:53 -0700 Subject: [PATCH 335/383] [dxut, effects11] ports updated for May 2022 releases (#24890) * [dxut, effects11] updated ports for May 2022 release * Update basline --- ports/dxut/portfile.cmake | 13 ++++++------- ports/dxut/vcpkg.json | 13 ++++++++++--- ports/effects11/portfile.cmake | 15 +++++++-------- ports/effects11/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 8 ++++---- versions/d-/dxut.json | 5 +++++ versions/e-/effects11.json | 5 +++++ 7 files changed, 49 insertions(+), 25 deletions(-) diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake index a8cd6ceb1be1df..e38856c50611f4 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -3,18 +3,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/DXUT - REF jun2021 - SHA512 4c95cefcf685e95b26677d0aba3d118df7860e3bf1b99b567013d326f890a3f67657be2c60677d3d996cccacce30f70d0c2fc60a692372053cce50318fa79a70 - HEAD_REF master + REF may2022 + SHA512 ea8ba759666acb4520c2dc1754e937433a1c54f1c83fe15396c573a6513d9b3fd49d1712eae9fc42fff9cddc4f3a4a759a7fc99377ef9750c6c55813d8c90000 + HEAD_REF main ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/dxut/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/dxut/vcpkg.json b/ports/dxut/vcpkg.json index 777546f3460ed9..fad08c19dc42c1 100644 --- a/ports/dxut/vcpkg.json +++ b/ports/dxut/vcpkg.json @@ -1,13 +1,20 @@ { "name": "dxut", - "version": "11.26", - "port-version": 1, + "version": "11.27", "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications", "homepage": "https://github.com/Microsoft/DXUT", "documentation": "https://github.com/microsoft/DXUT/wiki", "license": "MIT", "supports": "windows & !uwp", "dependencies": [ - "directxmath" + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/effects11/portfile.cmake b/ports/effects11/portfile.cmake index 798d3554d88e4d..c1c3e87d08237f 100644 --- a/ports/effects11/portfile.cmake +++ b/ports/effects11/portfile.cmake @@ -1,20 +1,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/FX11 - REF feb2021 - SHA512 bdf35347582646e782c20a96180c8286786da46583527b76b2d348cd76a75285a31ebb88297962cd279c09bbd416c15c0d25ae91881ffebbf9e8ce2f21912f16 - HEAD_REF master - FILE_DISAMBIGUATOR 1 + REF may2022 + SHA512 e395071430d7e6cd717729846e8d0f44700185597684f722cceb084df2a89b89ef7c04b5dfe948790640134838f409f0a3071e5d74760f8a9fcd74b0840ce78c + HEAD_REF main ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/effects11/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/effects11/vcpkg.json b/ports/effects11/vcpkg.json index a5bd57af49427f..bcabd7295ef34a 100644 --- a/ports/effects11/vcpkg.json +++ b/ports/effects11/vcpkg.json @@ -1,10 +1,19 @@ { "name": "effects11", - "version": "11.26", - "port-version": 2, + "version": "11.27", "description": "Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.", "homepage": "https://github.com/Microsoft/FX11", "documentation": "https://github.com/microsoft/FX11/wiki", "license": "MIT", - "supports": "windows" + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index e65a7705225829..da5dbfb5da6f4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1985,8 +1985,8 @@ "port-version": 4 }, "dxut": { - "baseline": "11.26", - "port-version": 1 + "baseline": "11.27", + "port-version": 0 }, "eabase": { "baseline": "2.09.12", @@ -2037,8 +2037,8 @@ "port-version": 1 }, "effects11": { - "baseline": "11.26", - "port-version": 2 + "baseline": "11.27", + "port-version": 0 }, "effolkronium-random": { "baseline": "1.4.1", diff --git a/versions/d-/dxut.json b/versions/d-/dxut.json index 3ce7912d854411..487d9ab966bbda 100644 --- a/versions/d-/dxut.json +++ b/versions/d-/dxut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b6c7ea3b64d6446296a16c7ad5f8ebdeb2e9915", + "version": "11.27", + "port-version": 0 + }, { "git-tree": "b8f2fd1c9674e75aee3d139934b3980a47b3d0eb", "version": "11.26", diff --git a/versions/e-/effects11.json b/versions/e-/effects11.json index 8389d07440a1c6..7e1872b1f40b53 100644 --- a/versions/e-/effects11.json +++ b/versions/e-/effects11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a08f12302be72c15cea701a71122e62f4b7df5a", + "version": "11.27", + "port-version": 0 + }, { "git-tree": "c2c6305e1ca4352d853c035f29d1d7daa3e47444", "version": "11.26", From 24881cdfea4bf89e3582dd4f34cffd0ed262c2e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Tabin?= Date: Wed, 25 May 2022 21:22:08 +0200 Subject: [PATCH 336/383] [libzippp] Update to 5.1-1.8.0 (#24885) --- ports/libzippp/portfile.cmake | 17 ++++++++--------- ports/libzippp/vcpkg.json | 11 +++++++++-- versions/baseline.json | 4 ++-- versions/l-/libzippp.json | 5 +++++ 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ports/libzippp/portfile.cmake b/ports/libzippp/portfile.cmake index 7bf26dd6ba2c77..9eaac582758783 100644 --- a/ports/libzippp/portfile.cmake +++ b/ports/libzippp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ctabin/libzippp - REF 0e907d7ef8de46822602cb7633a5bc6fc0cc36de #v5.0-1.8.0 with CXX std version c++11 - SHA512 f91724b0225bddcaf705e7e1493ad415b534096cfe3636d50995245982984e7420148206f4e24d72e596d75eac570d7b512c5aa836eaf4a8951e27737bcee9eb + REF 4248d7bf200e00b637cbd394c2b2369891de4e30 #v5.1-1.8.0 with CXX std version c++11 + SHA512 171010da61ab4893648ceef80009925e7b79294008de220fe132c42843cb939e454812c0e70de29dfb0318e6bf11c7924a31da52f7703c523ab95c68ba61051a HEAD_REF master PATCHES fix-find-lzma.patch ) @@ -12,9 +12,8 @@ vcpkg_check_features( FEATURES encryption LIBZIPPP_ENABLE_ENCRYPTION) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DLIBZIPPP_BUILD_TESTS=OFF @@ -22,16 +21,16 @@ vcpkg_configure_cmake( -DLIBZIPPP_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake/libzippp") + vcpkg_cmake_config_fixup(CONFIG_PATH "cmake/libzippp") else() - vcpkg_fixup_cmake_targets(CONFIG_PATH "share/libzippp") + vcpkg_cmake_config_fixup(CONFIG_PATH "share/libzippp") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libzippp/vcpkg.json b/ports/libzippp/vcpkg.json index e17b123b287893..096b27bacf89e5 100644 --- a/ports/libzippp/vcpkg.json +++ b/ports/libzippp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libzippp", - "version-string": "5.0-1.8.0", - "port-version": 1, + "version": "5.1-1.8.0", "description": "Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling", "homepage": "https://github.com/ctabin/libzippp", "dependencies": [ @@ -12,6 +11,14 @@ "bzip2" ] }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index da5dbfb5da6f4a..4893748790d44b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4229,8 +4229,8 @@ "port-version": 0 }, "libzippp": { - "baseline": "5.0-1.8.0", - "port-version": 1 + "baseline": "5.1-1.8.0", + "port-version": 0 }, "licensepp": { "baseline": "2020-05-19", diff --git a/versions/l-/libzippp.json b/versions/l-/libzippp.json index 2d17503c7c596e..5b48d498e6c052 100644 --- a/versions/l-/libzippp.json +++ b/versions/l-/libzippp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e5a10e0beabc7b9a1f9f313e62a1c73833e1c4f", + "version": "5.1-1.8.0", + "port-version": 0 + }, { "git-tree": "40f7e8d02ea29cb28b5c0c19257aebf97def3f8e", "version-string": "5.0-1.8.0", From efabd217023dce85341ecfe5f7e959a88645a773 Mon Sep 17 00:00:00 2001 From: talregev Date: Wed, 25 May 2022 22:24:02 +0300 Subject: [PATCH 337/383] [sdformat9] Add linux to supports (#24855) --- ports/sdformat9/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 2 +- versions/baseline.json | 2 +- versions/s-/sdformat9.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/sdformat9/vcpkg.json b/ports/sdformat9/vcpkg.json index c4f2a7dcc84531..df9310a61c9b7d 100644 --- a/ports/sdformat9/vcpkg.json +++ b/ports/sdformat9/vcpkg.json @@ -1,11 +1,11 @@ { "name": "sdformat9", "version": "9.4.0", - "port-version": 5, + "port-version": 6, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "license": "Apache-2.0", - "supports": "!(linux | uwp)", + "supports": "!uwp", "dependencies": [ "ignition-math6", "tinyxml", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b9d01b3cfbac99..623e4810ad7fc4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -288,6 +288,7 @@ ftgl:x64-uwp=fail functions-framework-cpp:x64-uwp=fail fuzzylite:x64-osx=fail +gazebo:x64-linux=fail # gsoap does not offer stable public source downloads gsoap:x64-windows = skip gsoap:x86-windows = skip @@ -1047,7 +1048,6 @@ sdformat6:arm64-windows=fail sdformat6:x64-uwp=fail sdformat6:x64-windows-static-md=fail sdformat9:arm-uwp=fail -sdformat9:x64-linux=fail sdformat9:x64-uwp=fail sdformat9:x64-windows-static-md=fail sdl2-mixer:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 4893748790d44b..e9643d8236158b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6386,7 +6386,7 @@ }, "sdformat9": { "baseline": "9.4.0", - "port-version": 5 + "port-version": 6 }, "sdl1": { "baseline": "1.2.15", diff --git a/versions/s-/sdformat9.json b/versions/s-/sdformat9.json index 547317e56551b4..379c64eb75ba3a 100644 --- a/versions/s-/sdformat9.json +++ b/versions/s-/sdformat9.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a599309f16afe5d3163ec1eb131eed575880ae4", + "version": "9.4.0", + "port-version": 6 + }, { "git-tree": "d050d624faf72f8dcb62fdb7a5378ae5d8e8b5d8", "version": "9.4.0", From 8abb3a585cedef903b8c6b9462037e7cd058766e Mon Sep 17 00:00:00 2001 From: Daniel Parker Date: Wed, 25 May 2022 15:35:29 -0400 Subject: [PATCH 338/383] [jsoncons] Update to version 0.168.7 (#24820) * [jsoncons] Update to version 0.168.7 * [jsoncons] Update to ver 0.168.7, update baseline * [jsoncons] port-version removed from vcpkg.json * update version * Modernize and use new functions * overwrite version Co-authored-by: FrankXie --- ports/jsoncons/portfile.cmake | 19 +++++++++---------- ports/jsoncons/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/j-/jsoncons.json | 5 +++++ 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake index e31a55bef861bb..7e323e4f8ec1e6 100644 --- a/ports/jsoncons/portfile.cmake +++ b/ports/jsoncons/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons - REF 1120e26743ad89621497ebd37acd61cf81152828 # v0.168.3 - SHA512 12842c0eda9709b8b8010540a482c6dd08d5b979d8f9469a663fb68b402db9f786cfa00856f8ef9396273a0fa488df581f4da008ef3f2ad3ae989bf317a77cd1 + REF dff2d7d64ca03de27e79347d6473483f95c066d3 # v0.168.7 + SHA512 e388dbc5f9ee0f8fc36bda46f9a68210c2467a8e3f91ae6b57b0e0bc78b732287cb3e36ffa5ee5147f434deeabf3ea4456897a89b868befeb757df88297ec002 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DJSONCONS_BUILD_TESTS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jsoncons/vcpkg.json b/ports/jsoncons/vcpkg.json index f13f250b0c97bb..8fd4ab51db85b3 100644 --- a/ports/jsoncons/vcpkg.json +++ b/ports/jsoncons/vcpkg.json @@ -1,7 +1,17 @@ { "name": "jsoncons", - "version-string": "0.168.3", - "port-version": 1, + "version": "0.168.7", "description": "A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSON Schema, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON", - "homepage": "https://github.com/danielaparker/jsoncons" + "homepage": "https://github.com/danielaparker/jsoncons", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index e9643d8236158b..c153bf30b2ef4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3077,8 +3077,8 @@ "port-version": 3 }, "jsoncons": { - "baseline": "0.168.3", - "port-version": 1 + "baseline": "0.168.7", + "port-version": 0 }, "jsoncpp": { "baseline": "1.9.5", diff --git a/versions/j-/jsoncons.json b/versions/j-/jsoncons.json index 8ef14f5069fe54..097a7f1d19ec9b 100644 --- a/versions/j-/jsoncons.json +++ b/versions/j-/jsoncons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55d8c58c4275c63e12b3a23413421609cc35ba4e", + "version": "0.168.7", + "port-version": 0 + }, { "git-tree": "ee0a71fa7021ce4daf9c225529489e7e1da7f10a", "version-string": "0.168.3", From ee0d840e32a94670e23c17090fd290ccbec553f0 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 May 2022 21:48:13 +0200 Subject: [PATCH 339/383] [nvtt] Control CUDA dependency, fix linkage (#24888) * Control CUDA dependency * Fix release build flags for MSVC * Update versions --- ports/nvtt/fix-release-flags.patch | 15 +++++++++++++++ ports/nvtt/portfile.cmake | 13 ++++++++++++- ports/nvtt/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/n-/nvtt.json | 5 +++++ 5 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 ports/nvtt/fix-release-flags.patch diff --git a/ports/nvtt/fix-release-flags.patch b/ports/nvtt/fix-release-flags.patch new file mode 100644 index 00000000000000..04263e0c6b229b --- /dev/null +++ b/ports/nvtt/fix-release-flags.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/OptimalOptions.cmake b/cmake/OptimalOptions.cmake +index e4d5c56..eba8624 100644 +--- a/cmake/OptimalOptions.cmake ++++ b/cmake/OptimalOptions.cmake +@@ -11,8 +11,8 @@ IF(MSVC) + # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /fp:fast") + + # Optimization flags. +- SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL") +- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL") ++ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GL") ++ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GL") + SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG") + SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG") + SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG") diff --git a/ports/nvtt/portfile.cmake b/ports/nvtt/portfile.cmake index 8ede400965742b..34b7d0a8a1919f 100644 --- a/ports/nvtt/portfile.cmake +++ b/ports/nvtt/portfile.cmake @@ -15,18 +15,29 @@ vcpkg_from_github( add-compile-options-for-osx.patch skip-building-libsquish.patch fix-intrinsic-function.patch + fix-release-flags.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cuda CMAKE_REQUIRE_FIND_PACKAGE_CUDA + INVERTED_FEATURES + cuda CMAKE_DISABLE_FIND_PACKAGE_CUDA ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNVTT_SHARED=0 + ${FEATURE_OPTIONS} + OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=_d # required by OSG ) vcpkg_cmake_install() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/nvtt/vcpkg.json b/ports/nvtt/vcpkg.json index 931bca6b8fbc70..0dddd028a222f3 100644 --- a/ports/nvtt/vcpkg.json +++ b/ports/nvtt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nvtt", "version": "2.1.2", - "port-version": 4, + "port-version": 5, "description": "Texture processing tools with support for Direct3D 10 and 11 formats.", "homepage": "https://github.com/castano/nvidia-texture-tools", "license": "MIT", @@ -12,5 +12,13 @@ "name": "vcpkg-cmake", "host": true } - ] + ], + "features": { + "cuda": { + "description": "Enable CUDA support", + "dependencies": [ + "cuda" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index c153bf30b2ef4a..e93fd55a1aafb7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4938,7 +4938,7 @@ }, "nvtt": { "baseline": "2.1.2", - "port-version": 4 + "port-version": 5 }, "oatpp": { "baseline": "1.3.0", diff --git a/versions/n-/nvtt.json b/versions/n-/nvtt.json index 9eb4a0ee08566b..876fe47d006a8f 100644 --- a/versions/n-/nvtt.json +++ b/versions/n-/nvtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1a685fa7402dce13182820ddd1dce2c6126b69f", + "version": "2.1.2", + "port-version": 5 + }, { "git-tree": "5889b2b68d1c3b13bf681c75e0b8347fff3d72fc", "version": "2.1.2", From f4de177097b24273203024e07c1a62f2c02d25b3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 25 May 2022 22:44:12 +0200 Subject: [PATCH 340/383] [vcpkg-tool-meson] update meson to 0.62.1 (#23717) * update meson and see what breaks * include patch again. * update meson to 0.62.1 * remove old patch * move to 64bit since 32bit not longer exists. * fix gobject-introspection * v db * revert nasm changes * set MESON_SCRIPT instead of MESON. * v db * apply CR Co-authored-by: Robert Schumacher * v db Co-authored-by: Alexander Neumann Co-authored-by: Robert Schumacher --- ports/gobject-introspection/portfile.cmake | 8 ++--- ports/gobject-introspection/python.patch | 29 +++++++++++++++++++ ports/gobject-introspection/vcpkg.json | 4 +-- .../fix_linker_detection.patch | 25 ---------------- ports/vcpkg-tool-meson/portfile.cmake | 11 +++---- .../vcpkg-tool-meson/vcpkg-port-config.cmake | 1 + ports/vcpkg-tool-meson/vcpkg.json | 4 +-- versions/baseline.json | 8 ++--- versions/g-/gobject-introspection.json | 5 ++++ versions/v-/vcpkg-tool-meson.json | 5 ++++ 10 files changed, 58 insertions(+), 42 deletions(-) create mode 100644 ports/gobject-introspection/python.patch delete mode 100644 ports/vcpkg-tool-meson/fix_linker_detection.patch create mode 100644 ports/vcpkg-tool-meson/vcpkg-port-config.cmake diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake index 56e6be53e79b76..b5ae3bc053499c 100644 --- a/ports/gobject-introspection/portfile.cmake +++ b/ports/gobject-introspection/portfile.cmake @@ -1,11 +1,11 @@ -set(GI_MAJOR_MINOR 1.70) +set(GI_MAJOR_MINOR 1.72) set(GI_PATCH 0) vcpkg_download_distfile(ARCHIVE URLS "https://download.gnome.org/sources/gobject-introspection/${GI_MAJOR_MINOR}/gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz" FILENAME "gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz" - SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0 + SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5 ) vcpkg_extract_source_archive_ex( @@ -14,15 +14,15 @@ vcpkg_extract_source_archive_ex( PATCHES 0001-g-ir-tool-template.in.patch 0002-cross-build.patch + python.patch ) -vcpkg_find_acquire_program(PYTHON3) vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) set(OPTIONS_DEBUG -Dbuild_introspection_data=false) set(OPTIONS_RELEASE -Dbuild_introspection_data=true) -if(NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET AND +if(VCPKG_CROSSCOMPILING AND NOT (CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")) list(APPEND OPTIONS_RELEASE -Dgi_cross_use_prebuilt_gi=true) endif() diff --git a/ports/gobject-introspection/python.patch b/ports/gobject-introspection/python.patch new file mode 100644 index 00000000000000..5a196ae6525319 --- /dev/null +++ b/ports/gobject-introspection/python.patch @@ -0,0 +1,29 @@ +diff --git a/giscanner/meson.build b/giscanner/meson.build +index e63a5ab78..3d7dc678a 100644 +--- a/giscanner/meson.build ++++ b/giscanner/meson.build +@@ -97,11 +97,11 @@ giscanner_lib = static_library('giscanner', + dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep], + ) + + # https://github.com/mesonbuild/meson/issues/4117 + if host_machine.system() == 'windows' ++ python_ext_dep = libpython_dep +- python_ext_dep = python.dependency() + else ++ python_ext_dep = libpython_dep +- python_ext_dep = python.dependency().partial_dependency(compile_args: true) + endif + + if not python_ext_dep.found() +diff --git a/meson.build b/meson.build +index 2a9d68556..cffe9014c 100644 +--- a/meson.build ++++ b/meson.build +@@ -156,4 +156,5 @@ libffi_dep = dependency('libffi', + + # python headers +-cc.check_header('Python.h', dependencies: [python.dependency()], required: true) ++libpython_dep = dependency('python-3.10', method : 'pkg-config') ++cc.check_header('Python.h', dependencies: [libpython_dep], required: true) + diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json index e7996b9253226a..1da115b5f238e4 100644 --- a/ports/gobject-introspection/vcpkg.json +++ b/ports/gobject-introspection/vcpkg.json @@ -1,9 +1,9 @@ { "name": "gobject-introspection", - "version": "1.70.0", - "port-version": 1, + "version": "1.72.0", "description": "A middleware layer between C libraries (using GObject) and language bindings.", "homepage": "https://gi.readthedocs.io/en/latest/", + "license": null, "supports": "!static & (native | (windows & x86))", "dependencies": [ { diff --git a/ports/vcpkg-tool-meson/fix_linker_detection.patch b/ports/vcpkg-tool-meson/fix_linker_detection.patch deleted file mode 100644 index 89e6dfa214b850..00000000000000 --- a/ports/vcpkg-tool-meson/fix_linker_detection.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tools/meson/mesonbuild/compilers/detect.py b/tools/meson/mesonbuild/compilers/detect.py -index 1eacecfa8..74668da1a 100644 ---- a/tools/meson/mesonbuild/compilers/detect.py -+++ b/tools/meson/mesonbuild/compilers/detect.py -@@ -292,7 +292,7 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker - linkers = default_linkers - popen_exceptions = {} - for linker in linkers: -- if not {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'}.isdisjoint(linker): -+ if any(os.path.basename(x) in {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'} for x in linker): - arg = '/?' - elif not {'ar2000', 'ar2000.exe'}.isdisjoint(linker): - arg = '?' -diff --git a/tools/meson/mesonbuild/linkers/detect.py b/tools/meson/mesonbuild/linkers/detect.py -index 0bfd7083b..323801d9a 100644 ---- a/tools/meson/mesonbuild/linkers/detect.py -+++ b/tools/meson/mesonbuild/linkers/detect.py -@@ -72,6 +72,7 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty - override = [] # type: T.List[str] - value = env.lookup_binary_entry(for_machine, comp_class.language + '_ld') - if value is not None: -+ compiler = value - override = comp_class.use_linker_args(value[0]) - check_args += override - diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index c4a94114651fb7..ea2a7b2293990c 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -5,17 +5,17 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) set(program MESON) -set(program_version 0.60.2) +set(program_version 0.62.1) set(program_name meson) set(search_names meson meson.py) set(interpreter PYTHON3) set(apt_package_name "meson") set(brew_package_name "meson") -set(ref 5e9b709ad0b34d8ac920dff057a5361080c0889b) +set(ref bb91cea0d66d8d036063dedec1f194d663399cdf) set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/meson") set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") set(download_filename "meson-${ref}.tar.gz") -set(download_sha512 5fb89c6b81f75825b6f300039db6dae9d907c81403a8ebe30c7426729d5cb3179e30b9b84d6ed756c2aa39ca34ea681afa0c5cd78835a94c43d5ab25e625abd0) +set(download_sha512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da) set(supported_on_unix ON) set(version_command --version) set(extra_search_args EXACT_VERSION_MATCH) @@ -46,10 +46,11 @@ if(NOT "${program}") file(RENAME "${CURRENT_PACKAGES_DIR}/tools/meson-${ref}" "${CURRENT_PACKAGES_DIR}/tools/meson") z_vcpkg_apply_patches( SOURCE_PATH "${CURRENT_PACKAGES_DIR}" - PATCHES meson-intl.patch - fix_linker_detection.patch + PATCHES + meson-intl.patch ) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) endif() z_vcpkg_find_acquire_program_find_internal("${program}" diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..887c4adbec0c8a --- /dev/null +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -0,0 +1 @@ +set(SCRIPT_MESON "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py") diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 82a1d87aeb01ff..4863acacaa8aef 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,8 +1,8 @@ { "name": "vcpkg-tool-meson", - "version": "0.60.2", - "port-version": 2, + "version": "0.62.1", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", + "license": "Apache-2.0", "supports": "native" } diff --git a/versions/baseline.json b/versions/baseline.json index e93fd55a1aafb7..cbd0a9b750f9be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2589,8 +2589,8 @@ "port-version": 0 }, "gobject-introspection": { - "baseline": "1.70.0", - "port-version": 1 + "baseline": "1.72.0", + "port-version": 0 }, "google-cloud-cpp": { "baseline": "1.40.1", @@ -7377,8 +7377,8 @@ "port-version": 0 }, "vcpkg-tool-meson": { - "baseline": "0.60.2", - "port-version": 2 + "baseline": "0.62.1", + "port-version": 0 }, "vcpkg-tool-mozbuild": { "baseline": "3.3", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index 16c0cbb1dfbc45..5594257788dd5c 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7af27cca9283357e5b7447e5a1c6583afc50c793", + "version": "1.72.0", + "port-version": 0 + }, { "git-tree": "a39c3bd1142fd69e6dba29cf3bd4c7e93b049406", "version": "1.70.0", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index c5143684dbbe85..54a6ffdeed55d2 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e35f24d912749fa1de06cb3cf533028e6f363398", + "version": "0.62.1", + "port-version": 0 + }, { "git-tree": "6fe7cf1649af5d90c1e88765411a463cac55e99c", "version": "0.60.2", From 20907dc8bfd4a3baf555467727755fbba708ad84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 25 May 2022 20:55:25 +0000 Subject: [PATCH 341/383] [wxwidgets] Fix find dependency pcre2 (#24874) * [wxwidgets] Fix find dependency pcre2 * version * Use pcre2.pc * version * Fix double quotes * version * Use PC_PCRE2_LINK_LIBRARIES instead of target name to fix wx-config content * version * Set wxUSE_SECRETSTORE to FALSE to avoid introduce system pcre in wx-config * version --- ports/wxwidgets/fix-pcre2.patch | 23 +++++++++++++++++++++++ ports/wxwidgets/portfile.cmake | 8 ++++++++ ports/wxwidgets/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 +++++ 5 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 ports/wxwidgets/fix-pcre2.patch diff --git a/ports/wxwidgets/fix-pcre2.patch b/ports/wxwidgets/fix-pcre2.patch new file mode 100644 index 00000000000000..20063f4418a4f4 --- /dev/null +++ b/ports/wxwidgets/fix-pcre2.patch @@ -0,0 +1,23 @@ +diff --git a/build/cmake/modules/FindPCRE2.cmake b/build/cmake/modules/FindPCRE2.cmake +index a27693a..455675a 100644 +--- a/build/cmake/modules/FindPCRE2.cmake ++++ b/build/cmake/modules/FindPCRE2.cmake +@@ -24,7 +24,10 @@ set(PCRE2_CODE_UNIT_WIDTH_USED "${PCRE2_CODE_UNIT_WIDTH}" CACHE INTERNAL "") + + find_package(PkgConfig QUIET) + pkg_check_modules(PC_PCRE2 QUIET libpcre2-${PCRE2_CODE_UNIT_WIDTH}) ++set(PCRE2_LIBRARIES ${PC_PCRE2_LINK_LIBRARIES}) ++set(PCRE2_INCLUDE_DIRS ${PC_PCRE2_INCLUDE_DIRS}) + ++if (0) + find_path(PCRE2_INCLUDE_DIRS + NAMES pcre2.h + HINTS ${PC_PCRE2_INCLUDEDIR} +@@ -36,6 +39,7 @@ find_library(PCRE2_LIBRARIES + HINTS ${PC_PCRE2_LIBDIR} + ${PC_PCRE2_LIBRARY_DIRS} + ) ++endif() + + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE2 REQUIRED_VARS PCRE2_LIBRARIES PCRE2_INCLUDE_DIRS VERSION_VAR PC_PCRE2_VERSION) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 583bfbb5a9f085..32b331623874e7 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( relocatable-wx-config.patch nanosvg-ext-depend.patch fix-libs-export.patch + fix-pcre2.patch ) if(VCPKG_TARGET_IS_LINUX) @@ -35,6 +36,8 @@ vcpkg_check_features( sound wxUSE_SOUND ) +vcpkg_find_acquire_program(PKGCONFIG) + set(OPTIONS "") if(VCPKG_TARGET_IS_OSX) list(APPEND OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) @@ -86,10 +89,15 @@ vcpkg_cmake_configure( -DwxUSE_LIBJPEG=sys -DwxUSE_LIBPNG=sys -DwxUSE_LIBTIFF=sys + -DwxUSE_SECRETSTORE=FALSE -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON -DwxUSE_STL=${WXWIDGETS_USE_STL} -DwxUSE_STD_CONTAINERS=${WXWIDGETS_USE_STD_CONTAINERS} ${OPTIONS} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + # The minimum cmake version requirement for Cotire is 2.8.12. + # however, we need to declare that the minimum cmake version requirement is at least 3.1 to use CMAKE_PREFIX_PATH as the path to find .pc. + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON ) vcpkg_cmake_install() diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 3c4398508636df..fdf7608f0e69f3 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wxwidgets", "version": "3.1.6", + "port-version": 1, "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", diff --git a/versions/baseline.json b/versions/baseline.json index cbd0a9b750f9be..ad426a70d7b2e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7574,7 +7574,7 @@ }, "wxwidgets": { "baseline": "3.1.6", - "port-version": 0 + "port-version": 1 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index ea2a00e9bcb64f..e71cd8312a1666 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "793b49ce7710b440be0a451354614e282e6fc9fa", + "version": "3.1.6", + "port-version": 1 + }, { "git-tree": "16d9f0aabf4f0df68bebd7b42ff6005d952f9392", "version": "3.1.6", From 90024c57708ac1cefe3bf0c61a08f4ca6d92492f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=84=B6Y?= <1294379167@qq.com> Date: Fri, 27 May 2022 04:02:15 +0800 Subject: [PATCH 342/383] [air-ctl] add new port (#24837) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add port ctl * update version database * use vcpkg_from_github * update version database * rename air-ctl * . * update version * Update portfile.cmake * update version Co-authored-by: ē„¶Y --- ports/air-ctl/portfile.cmake | 19 +++++++++++++++++++ ports/air-ctl/vcpkg.json | 18 ++++++++++++++++++ versions/a-/air-ctl.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 50 insertions(+) create mode 100644 ports/air-ctl/portfile.cmake create mode 100644 ports/air-ctl/vcpkg.json create mode 100644 versions/a-/air-ctl.json diff --git a/ports/air-ctl/portfile.cmake b/ports/air-ctl/portfile.cmake new file mode 100644 index 00000000000000..03f5bcd63bc7a8 --- /dev/null +++ b/ports/air-ctl/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO inie0722/CTL + REF v1.0.0 + SHA512 facd0afdb20437c0ffa5b097a68e2028faa314be6052e0db1e2c727ce5a0305bca8e575c946b0e10a6343dfaddc38770c1e5a56ae201e1aa906883df6d662398 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/air-ctl/vcpkg.json b/ports/air-ctl/vcpkg.json new file mode 100644 index 00000000000000..9f5b0c46ec9827 --- /dev/null +++ b/ports/air-ctl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "air-ctl", + "version": "1.0.0", + "description": "C template container library", + "homepage": "https://github.com/inie0722/CTL", + "license": "BSL-1.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/air-ctl.json b/versions/a-/air-ctl.json new file mode 100644 index 00000000000000..e129dcb5165f17 --- /dev/null +++ b/versions/a-/air-ctl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7f997c28da50f2d8c86639da2c7beab3a00189ce", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index ad426a70d7b2e0..ecb06f74b35296 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -32,6 +32,10 @@ "baseline": "2020-06-26", "port-version": 0 }, + "air-ctl": { + "baseline": "1.0.0", + "port-version": 0 + }, "aixlog": { "baseline": "1.5.0", "port-version": 1 From 75536e7c6186d3ab3a958e8f334591f40870bf45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 26 May 2022 20:05:01 +0000 Subject: [PATCH 343/383] [mpi/msmpi] Add cmake wrapper to fix bug getting MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS when calling FindMPI.cmake on Windows (#24746) * [mpi] Add cmake wrapper to fix bug getting MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS when calling FindMPI.cmake * version * Move wrapper to msmpi, only copy the wrapper in the meta port installation * version * typo * version * Apply suggestion * version * move unset before _find_package * version * Add double quotes * version * Fix * version * Don't double quote list! * version * Apply suggestion * version --- ports/mpi/portfile.cmake | 4 ++++ ports/mpi/vcpkg.json | 3 ++- ports/msmpi/mpi-wrapper.cmake | 9 +++++++++ ports/msmpi/portfile.cmake | 37 +++++++++++++++++++---------------- ports/msmpi/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/m-/mpi.json | 5 +++++ versions/m-/msmpi.json | 5 +++++ 8 files changed, 48 insertions(+), 21 deletions(-) create mode 100644 ports/msmpi/mpi-wrapper.cmake diff --git a/ports/mpi/portfile.cmake b/ports/mpi/portfile.cmake index 065116c276adcf..89bec5e34c61b1 100644 --- a/ports/mpi/portfile.cmake +++ b/ports/mpi/portfile.cmake @@ -1 +1,5 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if (VCPKG_TARGET_IS_WINDOWS) + file(INSTALL "${CURRENT_INSTALLED_DIR}/share/msmpi/mpi-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME vcpkg-cmake-wrapper.cmake) +endif() diff --git a/ports/mpi/vcpkg.json b/ports/mpi/vcpkg.json index 386b978bd9cbe2..2d5bbaddfd8db6 100644 --- a/ports/mpi/vcpkg.json +++ b/ports/mpi/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mpi", "version-string": "1", - "port-version": 2, + "port-version": 3, "description": "Message Passing Interface (MPI) is a standardized and portable message-passing standard designed by a group of researchers from academia and industry to function on a wide variety of parallel computing architectures. The standard defines the syntax and semantics of a core of library routines useful to a wide range of users writing portable message-passing programs in C, C++, and Fortran. There are several well-tested and efficient implementations of MPI, many of which are open-source or in the public domain.", + "license": null, "supports": "!uwp", "dependencies": [ { diff --git a/ports/msmpi/mpi-wrapper.cmake b/ports/msmpi/mpi-wrapper.cmake new file mode 100644 index 00000000000000..03fc46c4f5f546 --- /dev/null +++ b/ports/msmpi/mpi-wrapper.cmake @@ -0,0 +1,9 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +# Suitable for FindMPI.cmake line 937 +set(ENV{MSMPI_INC} "${_IMPORT_PREFIX}/include") +unset(_IMPORT_PREFIX) + +_find_package(${ARGS}) diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index c94e2c30490624..75dd3905251259 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -1,5 +1,5 @@ set(MSMPI_VERSION "10.1.12498") -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}) +set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}") vcpkg_download_distfile(SDK_ARCHIVE URLS "https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisdk.msi" @@ -27,10 +27,10 @@ if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}") set(MPIEXEC_VERSION_LOGNAME "mpiexec-version") vcpkg_execute_required_process( COMMAND ${SYSTEM_MPIEXEC_FILEPATH} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" LOGNAME ${MPIEXEC_VERSION_LOGNAME} ) - file(READ ${CURRENT_BUILDTREES_DIR}/${MPIEXEC_VERSION_LOGNAME}-out.log MPIEXEC_OUTPUT) + file(READ "${CURRENT_BUILDTREES_DIR}/${MPIEXEC_VERSION_LOGNAME}-out.log" MPIEXEC_OUTPUT) if(MPIEXEC_OUTPUT MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+)\\.[0-9]+\\]") if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_VERSION) @@ -69,13 +69,13 @@ file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/msiexec-${TARGET_TRIPLET}.log" MS set(PARAM_MSI "/a \"${SDK_ARCHIVE}\"") set(PARAM_LOG "/log \"${MSIEXEC_LOG_PATH}\"") set(PARAM_TARGET_DIR "TARGETDIR=\"${SDK_SOURCE_DIR}\"") -set(SCRIPT_FILE ${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat) +set(SCRIPT_FILE "${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat") # Write the command out to a script file and run that to avoid weird escaping behavior when spaces are present file(WRITE ${SCRIPT_FILE} "msiexec ${PARAM_MSI} /qn ${PARAM_LOG} ${PARAM_TARGET_DIR}") vcpkg_execute_required_process( COMMAND ${SCRIPT_FILE} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" LOGNAME extract-sdk ) @@ -92,34 +92,37 @@ file(INSTALL "${SOURCE_INCLUDE_PATH}/pmidbg.h" "${SOURCE_INCLUDE_PATH}/${TRIPLET_SYSTEM_ARCH}/mpifptr.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include + "${CURRENT_PACKAGES_DIR}/include" ) # NOTE: since the binary distribution does not include any debug libraries we always install the release libraries SET(VCPKG_POLICY_ONLY_RELEASE_CRT enabled) file(GLOB STATIC_LIBS - ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib - ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib - ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib - ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib" + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib" + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib" + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib" ) file(INSTALL "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib" - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib" - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) if(VCPKG_CRT_LINKAGE STREQUAL "static") - file(INSTALL ${STATIC_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${STATIC_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL ${STATIC_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL ${STATIC_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/mpi-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + # Handle copyright -file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MicrosoftMPI-SDK-EULA.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) -file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MPI-SDK-TPN.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/msmpi/copyright "See the accompanying MicrosoftMPI-SDK-EULA.rtf and MPI-SDK-TPN.txt") +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MicrosoftMPI-SDK-EULA.rtf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MPI-SDK-TPN.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "See the accompanying MicrosoftMPI-SDK-EULA.rtf and MPI-SDK-TPN.txt") diff --git a/ports/msmpi/vcpkg.json b/ports/msmpi/vcpkg.json index d220c1d6189cfb..972571482692d1 100644 --- a/ports/msmpi/vcpkg.json +++ b/ports/msmpi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "msmpi", "version": "10.1.12498", - "port-version": 3, + "port-version": 4, "description": "Microsoft MPI (MS-MPI) is a Microsoft implementation of the Message Passing Interface standard for developing and running parallel applications on the Windows platform.", "homepage": "https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ecb06f74b35296..887b8ddded507f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4658,7 +4658,7 @@ }, "mpi": { "baseline": "1", - "port-version": 2 + "port-version": 3 }, "mpir": { "baseline": "2022-03-02", @@ -4710,7 +4710,7 @@ }, "msmpi": { "baseline": "10.1.12498", - "port-version": 3 + "port-version": 4 }, "mstch": { "baseline": "1.0.2", diff --git a/versions/m-/mpi.json b/versions/m-/mpi.json index 599d1b627a8f3b..d177803d619866 100644 --- a/versions/m-/mpi.json +++ b/versions/m-/mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2eacb3d18a3407d1ceb6211ee7cad0b157249d22", + "version-string": "1", + "port-version": 3 + }, { "git-tree": "783aea281dc7cdf59ec0636bd60c2feaef6595b4", "version-string": "1", diff --git a/versions/m-/msmpi.json b/versions/m-/msmpi.json index 16149fa9555cec..1cca454f3945f6 100644 --- a/versions/m-/msmpi.json +++ b/versions/m-/msmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3ccfae00ebdaac2c41fa2acfa59b862171be3ae", + "version": "10.1.12498", + "port-version": 4 + }, { "git-tree": "92f5e217faeaf4ec7e205a56bfff3a13b75e0393", "version": "10.1.12498", From af650ee001077ed5fc84b7ee8d49fe812f01e749 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 26 May 2022 22:11:21 +0200 Subject: [PATCH 344/383] [elfutils] remove debug scripts (#24915) --- ports/elfutils/portfile.cmake | 4 ++-- ports/elfutils/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/elfutils.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake index 450e3799b92def..434d4046390e28 100644 --- a/ports/elfutils/portfile.cmake +++ b/ports/elfutils/portfile.cmake @@ -47,10 +47,10 @@ file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CUR file(REMOVE ${TO_REMOVE}) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/etc/profile.d/debuginfod.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/etc/profile.d/debuginfod.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/elfutils/bin/eu-make-debug-archive" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/elfutils/debug/bin/eu-make-debug-archive" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/elfutils/debug") # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/elfutils/vcpkg.json b/ports/elfutils/vcpkg.json index e7b479013e9492..a0f4da2eca4f9d 100644 --- a/ports/elfutils/vcpkg.json +++ b/ports/elfutils/vcpkg.json @@ -1,7 +1,7 @@ { "name": "elfutils", "version": "0.186", - "port-version": 3, + "port-version": 4, "description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.", "homepage": "https://sourceware.org/elfutils/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 887b8ddded507f..2fbb88950e82e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2066,7 +2066,7 @@ }, "elfutils": { "baseline": "0.186", - "port-version": 3 + "port-version": 4 }, "embree2": { "baseline": "2.17.7", diff --git a/versions/e-/elfutils.json b/versions/e-/elfutils.json index 9d6c48f7c49c54..9a3a75518c2d63 100644 --- a/versions/e-/elfutils.json +++ b/versions/e-/elfutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f16a19e22e33e89ff809c74983035b93a50038e", + "version": "0.186", + "port-version": 4 + }, { "git-tree": "8f78ad2c6d0fe406f09a163e5fb74a9b000c815c", "version": "0.186", From 851eef78e5acf89cf088a263f53d9e373c6b837e Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 26 May 2022 13:12:36 -0700 Subject: [PATCH 345/383] [dstorage] port updated for 1.0.2 release (#24919) * [dstorage] update port for 1.0.2 release * Documentation link update * Update baseline --- ports/dstorage/portfile.cmake | 16 ++++++++-------- ports/dstorage/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/d-/dstorage.json | 5 +++++ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ports/dstorage/portfile.cmake b/ports/dstorage/portfile.cmake index 45c04b469a75c5..b05d0e5d0ee080 100644 --- a/ports/dstorage/portfile.cmake +++ b/ports/dstorage/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DirectStorage/1.0.0" - FILENAME "directstorage.1.0.0.zip" - SHA512 34f24842d509ccddf2c8a06e94a2f67c0746ed8acb6d90ab89453ed4ec9b123970cf1e802375af27e6d5be3c82211813009f8f4b83f233ce419a1467b8c10846 + URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DirectStorage/1.0.2" + FILENAME "directstorage.1.0.2.zip" + SHA512 42a8d21a1be9981d5fcaaa2aa90d1e4bfe20969ee7959803f6acb76b0846d91d49ad89cebac069463729d013532508c6fbe41af3a1e99187ac13e849d747dd7e ) vcpkg_extract_source_archive_ex( @@ -12,13 +12,13 @@ vcpkg_extract_source_archive_ex( NO_REMOVE_ONE_LEVEL ) -file(INSTALL "${PACKAGE_PATH}/Include/DirectStorage/dstorage.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${PACKAGE_PATH}/Include/DirectStorage/dstorageerr.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${PACKAGE_PATH}/native/include/dstorage.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${PACKAGE_PATH}/native/include/dstorageerr.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${PACKAGE_PATH}/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${PACKAGE_PATH}/native/lib/${VCPKG_TARGET_ARCHITECTURE}/dstorage.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -file(COPY "${PACKAGE_PATH}/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") -file(COPY "${PACKAGE_PATH}/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/dstorage/vcpkg.json b/ports/dstorage/vcpkg.json index a0f7f24f6f2a34..3e6c4bbae4502a 100644 --- a/ports/dstorage/vcpkg.json +++ b/ports/dstorage/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dstorage", - "version": "1.0.0", - "port-version": 1, + "version": "1.0.2", "description": "DirectStorage for Windows", "homepage": "https://aka.ms/directstorage/", + "documentation": "https://github.com/microsoft/DirectStorage", "license": null, "supports": "windows & !uwp & !staticcrt" } diff --git a/versions/baseline.json b/versions/baseline.json index 2fbb88950e82e6..b9c8fbe17c5015 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1961,8 +1961,8 @@ "port-version": 0 }, "dstorage": { - "baseline": "1.0.0", - "port-version": 1 + "baseline": "1.0.2", + "port-version": 0 }, "dtl": { "baseline": "1.19", diff --git a/versions/d-/dstorage.json b/versions/d-/dstorage.json index 5d72f09e7b8992..d2e8dfa9dd3903 100644 --- a/versions/d-/dstorage.json +++ b/versions/d-/dstorage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6672c5472d42f2ba2e3fe0a0e8acf3d00879c129", + "version": "1.0.2", + "port-version": 0 + }, { "git-tree": "8b3e0c3eaf98dec92b8e97f19e10efac69c6a187", "version": "1.0.0", From 9ab334404665a5792f3e165a9c8fe41462dc0098 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 26 May 2022 22:14:21 +0200 Subject: [PATCH 346/383] [hwloc|hpx] Update to latest version (#24918) * update hpx and hwloc * v db * remove unnecessary patch * v db * allow CMAKE_CXX_STANDARD to be set * v db --- ports/hpx/fix-cmakecache-paths.patch | 22 ---------------------- ports/hpx/portfile.cmake | 6 +++--- ports/hpx/vcpkg.json | 3 +-- ports/hwloc/portfile.cmake | 4 ++-- ports/hwloc/vcpkg.json | 2 +- versions/baseline.json | 6 +++--- versions/h-/hpx.json | 5 +++++ versions/h-/hwloc.json | 5 +++++ 8 files changed, 20 insertions(+), 33 deletions(-) delete mode 100644 ports/hpx/fix-cmakecache-paths.patch diff --git a/ports/hpx/fix-cmakecache-paths.patch b/ports/hpx/fix-cmakecache-paths.patch deleted file mode 100644 index 5a9e1b3ca02bbe..00000000000000 --- a/ports/hpx/fix-cmakecache-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmake/HPX_ForwardCacheVariables.cmake b/cmake/HPX_ForwardCacheVariables.cmake -index 7c434085a76..34cc47c7750 100644 ---- a/cmake/HPX_ForwardCacheVariables.cmake -+++ b/cmake/HPX_ForwardCacheVariables.cmake -@@ -23,6 +23,17 @@ set(_cache_var_file_template - ) - set(_cache_variables) - foreach(_var IN LISTS cache_vars) -+ if(HPX_WITH_VCPKG) -+ # avoid writing directory names into cache file -+ string(FIND ${_var} "_DIR" _pos) -+ if(NOT ${_pos} EQUAL -1) -+ continue() -+ endif() -+ string(FIND ${_var} "_PATH" _pos) -+ if(NOT ${_pos} EQUAL -1) -+ continue() -+ endif() -+ endif() - set(_cache_variables "${_cache_variables}set(${_var} ${${_var}})\n") - endforeach() - diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 9cbdf361fe99a8..37b18138672976 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF 1.7.1 - SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3 + REF f48c81865800ae72618b40b4e79d4168cfb0bd56 + SHA512 06d1384615b327194d871145c1899317bd350c43a072be2cbfdc773f7869b71aafce3e9cabf835a8fe902a13d7050d5e0400a76f74023985575347a645196b1d HEAD_REF stable PATCHES fix-dependency-hwloc.patch - fix-cmakecache-paths.patch ) set(HPX_WITH_MALLOC system) @@ -28,6 +27,7 @@ vcpkg_cmake_configure( -DHPX_WITH_EXAMPLES=OFF -DHPX_WITH_TOOLS=OFF -DHPX_WITH_RUNTIME=OFF + -DHPX_USE_CMAKE_CXX_STANDARD=ON "-DHPX_WITH_MALLOC=${HPX_WITH_MALLOC}" ) diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json index c82018a7574d64..3c49969c1cdbff 100644 --- a/ports/hpx/vcpkg.json +++ b/ports/hpx/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hpx", - "version-semver": "1.7.1", - "port-version": 5, + "version": "1.8.0", "description": [ "The C++ Standards Library for Concurrency and Parallelism", "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." diff --git a/ports/hwloc/portfile.cmake b/ports/hwloc/portfile.cmake index 2109cf4147f81e..8c328031db2a79 100644 --- a/ports/hwloc/portfile.cmake +++ b/ports/hwloc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-mpi/hwloc - REF 6fa8466a9c9c28de8ca3bd9e879c426edd85decf # hwloc-2.7.0 - SHA512 33bcc30362ba27076eacc83327a9d6235e2914a3c64536631e05e2d44c2c12b0176d55cc42ec0dc3c80682b977a83e60bd3a41f3ef486581cf8afa62ad2e9516 + REF 3cf146011de099c53efee163ea7d3a059fd7bd60 # hwloc-2.7.1 + SHA512 c6c4fbd3a1bea2bd1df65b7512748cd10944a255b145effe6f75d5fa2c5b1da32d344f2cbff3062391d47230e84361620c69f87500113b45992282a512be90b4 PATCHES fix_shared_win_build.patch ) diff --git a/ports/hwloc/vcpkg.json b/ports/hwloc/vcpkg.json index 139760ba480cd1..3ede6626376bca 100644 --- a/ports/hwloc/vcpkg.json +++ b/ports/hwloc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hwloc", - "version": "2.7.0", + "version": "2.7.1", "maintainers": "bgoglin", "description": [ "Portable Hardware Locality (hwloc)", diff --git a/versions/baseline.json b/versions/baseline.json index b9c8fbe17c5015..9acd28b7aafbb8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2793,8 +2793,8 @@ "port-version": 0 }, "hpx": { - "baseline": "1.7.1", - "port-version": 5 + "baseline": "1.8.0", + "port-version": 0 }, "http-parser": { "baseline": "2.9.4", @@ -2809,7 +2809,7 @@ "port-version": 8 }, "hwloc": { - "baseline": "2.7.0", + "baseline": "2.7.1", "port-version": 0 }, "hyperscan": { diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index 2bf34abecc8d43..3d312e3cf8aed9 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bd151915f73223a06d9470f38f56d253392a484", + "version": "1.8.0", + "port-version": 0 + }, { "git-tree": "48d153f2932b01257af5a799676268abdfb35fac", "version-semver": "1.7.1", diff --git a/versions/h-/hwloc.json b/versions/h-/hwloc.json index f3f40d96a4f869..1e09f8aa0f0f6b 100644 --- a/versions/h-/hwloc.json +++ b/versions/h-/hwloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ce0161512ee6cc0ef1f2e68a6c73db63422f0ee", + "version": "2.7.1", + "port-version": 0 + }, { "git-tree": "22d2c0f63d27b10b032eb6cb3bd07055300fc961", "version": "2.7.0", From a97ebbef7fca32ed90b79fb2bfe0c9b730683751 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Thu, 26 May 2022 18:24:58 -0400 Subject: [PATCH 347/383] [grpc] Fix path quoting (#24948) * [grpc] Fix path quoting * Update version --- ports/grpc/portfile.cmake | 4 ++-- ports/grpc/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/g-/grpc.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 11705ec434c6e5..4c68ff11208a84 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -64,8 +64,8 @@ vcpkg_cmake_configure( -DgRPC_INSTALL_LIBDIR:STRING=lib -DgRPC_INSTALL_INCLUDEDIR:STRING=include -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc - -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE="${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" - -DPROTOBUF_PROTOC_EXECUTABLE="${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-DPROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" MAYBE_UNUSED_VARIABLES gRPC_MSVC_STATIC_RUNTIME ) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 63b1b33dd7a704..4b6c322df983f8 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,8 +1,10 @@ { "name": "grpc", "version-semver": "1.44.0", + "port-version": 1, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", + "license": "Apache-2.0", "dependencies": [ "abseil", { diff --git a/versions/baseline.json b/versions/baseline.json index 9acd28b7aafbb8..45ae7c776ef383 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2654,7 +2654,7 @@ }, "grpc": { "baseline": "1.44.0", - "port-version": 0 + "port-version": 1 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 160d6a33a18736..9d3262ff4b7e52 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b15dbb6b2a6f81d7ae885b5b8f273b729b8d0ba", + "version-semver": "1.44.0", + "port-version": 1 + }, { "git-tree": "489c160e47ae99de58a438f93714ecbb008df330", "version-semver": "1.44.0", From 36b6831d19038ea9ccc84f714fcec59b38683413 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 27 May 2022 09:34:11 -0700 Subject: [PATCH 348/383] [docs] Initial addition of CLI Reference docs (#24754) * [docs] Initial addition of CLI Reference docs * PR comments round 1 * [docs] Fix manifests.md TOC * [docs] Sort common options * [docs] Apply PR comments --- docs/README.md | 4 + docs/commands/common-options.md | 121 +++++++++++++++++++++ docs/commands/index.md | 13 +++ docs/commands/install.md | 183 ++++++++++++++++++++++++++++++++ docs/users/manifests.md | 77 +++++++------- 5 files changed, 358 insertions(+), 40 deletions(-) create mode 100644 docs/commands/common-options.md create mode 100644 docs/commands/index.md create mode 100644 docs/commands/install.md diff --git a/docs/README.md b/docs/README.md index f0114efa4ec19f..6914dcd54b4767 100644 --- a/docs/README.md +++ b/docs/README.md @@ -12,6 +12,10 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Patching Example: Patching libpng to work for x64-uwp](examples/patching.md) - [Getting Started with Versioning](examples/versioning.getting-started.md) +### Command Line Reference + +- [Command Line Reference](commands/index.md) + ### User Help - [Buildsystem Integration](users/buildsystems/integration.md) diff --git a/docs/commands/common-options.md b/docs/commands/common-options.md new file mode 100644 index 00000000000000..86fb64595b64da --- /dev/null +++ b/docs/commands/common-options.md @@ -0,0 +1,121 @@ +# Common Command Options + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/common-options.md).** + +Most vcpkg commands accept a group of common options that control cross-cutting aspects of the tool. Not all options affect every command. For example, a command that does not download any files will be unaffected by changing the downloads directory. + + + +## `--x-asset-sources=` + +**Experimental: will change or be removed at any time** + +Specify the cache configuration for [Asset Caching](../users/assetcaching.md). + + + +## `--binarysource=` + +Add a source for [Binary Caching](../users/binarycaching.md). + +This option can be specified multiple times; see the Binary Caching documentation for how multiple binary sources interact. + + + +## `--x-buildtrees-root=` + +**Experimental: will change or be removed at any time** + +Specifies the temporary path to store intermediate build files, such as objects or unpacked source code. + +Defaults to `buildtrees/` under the vcpkg root folder. + + + +## `--downloads-root=` + +Specify where downloaded tools and source code archives should be kept. + +Defaults to the `VCPKG_DOWNLOADS` environment variable. If that is unset, defaults to `downloads/` under the vcpkg root folder. + + + +## `--host-triplet=` + +Specify the host [architecture triplet][triplets]. + +Defaults to the `VCPKG_DEFAULT_HOST_TRIPLET` environment variable. If that is unset, deduced based on the host architecture and operating system. + + + +## `--x-install-root=` + +**Experimental: will change or be removed at any time** + +Specifies the path to lay out installed packages. + +In Classic Mode, defaults to `installed/` under the vcpkg root folder. + +In [Manifest Mode][../users/manifests.md], defaults to `vcpkg_installed/` under the manifest folder. + + + +### `--x-manifest-root=` + +**Experimental: will change or be removed at any time** + +Specifies the directory containing [`vcpkg.json`](../users/manifests.md). + +Defaults to searching upwards from the current working directory for the nearest `vcpkg.json`. + + + +## `--overlay-ports=` + +Specifies a directory containing [overlay ports](../specifications/ports-overlay.md). + +This option can be specified multiple times; ports will resolve to the first match. + + + +## `--overlay-triplets=` + +Specifies a directory containing [overlay triplets](../examples/overlay-triplets-linux-dynamic.md). + +This option can be specified multiple times; [triplets][] will resolve to the first match. + + + +## `--x-packages-root=` + +**Experimental: will change or be removed at any time** + +Specifies the temporary path to stage intermediate package files before final install. + +Defaults to `packages/` under the vcpkg root folder. + + + +## `--triplet=` + +Specify the target [architecture triplet][triplets]. + +Defaults to the `VCPKG_DEFAULT_TRIPLET` environment variable. If that is unset, deduced based on the host architecture and operating system. + +Note that on Windows operating systems, the architecture is always deduced as x86 for legacy reasons. + + + +## `--vcpkg-root=` + +Specifies the vcpkg root folder. + +Defaults to the directory containing the vcpkg program. The directory must be a valid vcpkg instance, such as a `git clone` of `https://github.com/microsoft/vcpkg`. This option can be used to run a custom-built copy of the tool directly from the build folder. + +## Response Files (`@`) + +The vcpkg command line accepts text files containing newline-separated command line parameters. + +The tool will act as though the items in the file were spliced into the command line in place of the `@` reference. Response files cannot contain additional response files. + +[triplets]: ../users/triplets.md diff --git a/docs/commands/index.md b/docs/commands/index.md new file mode 100644 index 00000000000000..e498b07249f61b --- /dev/null +++ b/docs/commands/index.md @@ -0,0 +1,13 @@ +# vcpkg Command Line Reference + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/index.md).** + +## Contents + +- [Common Options](common-options.md) +- Commands + - [vcpkg install](install.md) + +## Source + +The vcpkg command line is developed in a separate repository on GitHub: [microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool). Issues should be posted to [microsoft/vcpkg](https://github.com/microsoft/vcpkg/issues). diff --git a/docs/commands/install.md b/docs/commands/install.md new file mode 100644 index 00000000000000..651ac3a6331e2a --- /dev/null +++ b/docs/commands/install.md @@ -0,0 +1,183 @@ +# vcpkg install + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/install.md).** + +## Synopsis + +**Classic Mode** +```no-highlight +vcpkg install [options] ... +``` + +**Manifest Mode** +```no-highlight +vcpkg install [options] +``` + +## Description + +Build and install port packages. + +### Classic Mode + +In Classic Mode, this verb adds port packages to the existing set in the [installed directory][] (defaults to `installed/` under the vcpkg root). This can require removing and rebuilding existing packages, which can fail. + +**Package Syntax** +``` +portname[feature1,feature2]:triplet +``` + +Package references without a triplet are automatically qualified by the [default target triplet](common-options.md#triplet). Package references that do not explicitly list `core` are considered to imply all default features. + +### Manifest Mode + +In [Manifest Mode][], this verb sets the [installed directory][] to the state specified by the `vcpkg.json` manifest file, adding, removing, or rebuilding packages as needed. + +[installed directory]: common-options.md#install-root + +## Options + +All vcpkg commands support a set of [common options](common-options.md). + +### `--allow-unsupported` + +Instead of stopping on an unsupported port, continue with a warning. + +By default, vcpkg refuses to execute an install plan containing a port installation for a triplet outside its [`"supports"`][] clause. The [`"supports"`][] clause of a package describes the full set of platforms a package is expected to be buildable on. This flag instructs vcpkg to warn that the build is expected to fail instead of stopping. + +### `--clean-after-build` + +Clean buildtrees, packages, and downloads after building each package. + +This option has the same effect as passing [`--clean-buildtrees-after-build`](#clean-buildtrees-after-build), [`--clean-downloads-after-build`](#clean-downloads-after-build), and [`--clean-packages-after-build`](#clean-packages-after-build). + + + +### `--clean-buildtrees-after-build` + +Clean all subdirectories from the buildtrees temporary subfolder after building each package. + +All top-level files in the buildtrees subfolder (e.g. `buildtrees/zlib/config-x64-windows-out.log`) will be kept. All subdirectories will be deleted. + + + +### `--clean-downloads-after-build` + +Clean all unextracted assets from the `downloads/` folder after building each package. + +All top level files in the `downloads/` folder will be deleted. Extracted tools will be kept. + + + +### `--clean-packages-after-build` + +Clean the packages temporary subfolder after building each package. + +The packages subfolder for the built package (for example, `packages/zlib_x64-windows`) will be deleted after installation. + +### `--dry-run` + +Print the install plan, but do not remove or install any packages. + +The install plan lists all packages and features that will be installed, as well as any other packages that need to be removed and rebuilt. + +### `--editable` + +**Classic Mode Only** + +Perform editable builds for all directly referenced packages on the command line. + +When vcpkg builds ports, it purges and re-extracts the source code each time to ensure inputs are accurately. This is necessary for [Manifest Mode][] to accurately update what is installed and [Binary Caching][] to ensure cached content is correct. + +Passing the `--editable` flag disables this behavior, preserving edits to the extracted sources in the `buildtrees/` folder. This helps develop patches quickly by avoiding the need to write a file on each change. + +Sources extracted during an editable build do not have a `.clean/` suffix on the directory name and will not be cleared by subsequent non-editable builds. + +### `--enforce-port-checks` + +Fail install if a port has detected problems or attempts to use a deprecated feature. + +By default, vcpkg will run several checks on built packages and emit warnings if any issues are detected. This flag upgrades those warnings to an error. + +### `--x-feature=` + +**Experimental and may change or be removed at any time** + +**[Manifest Mode][] Only** + +Specify an additional [feature](../users/manifests.md#features) from the `vcpkg.json` to install dependencies for. + +By default, only [`"dependencies"`](../users/manifests.md#dependencies) and the dependencies of the [`"default-features"`](../users/manifests.md#default-features) will be installed. + +### `--head` + +**Classic Mode Only** + +Request all packages explicitly referenced on the command line to fetch the latest sources available when building. + +This flag is only intended for temporary testing and is not intended for production or long-term use. This disables [Binary Caching][] for all explicitly referenced packages and their dependents because vcpkg cannot accurately track all inputs. + +### `--keep-going` + +Continue the install plan after the first failure. + +By default, vcpkg will stop at the first package build failure. This flag instructs vcpkg to continue building and installing other parts of the install plan that don't depend upon the failed package. + +### `--x-no-default-features` + +**Experimental and may change or be removed at any time** + +**[Manifest Mode][] Only** + +Don't install the default features from the top-level manifest. + +When using `install` in Manifest Mode, by default all dependencies of the features listed in [`"default-features"`][] will be installed. This flag disables that behavior so (without any `TODO` flags) only the dependencies listed in [`"dependencies"`][] will be installed. + +### `--no-downloads` + +When building a package, prevent ports from downloading new assets during the build. + +By default, ports will acquire source code and tools on demand from the internet (subject to [Asset Caching][]). This parameter blocks downloads and restricts ports to only the assets that were previously downloaded and cached on the machine. + +### `--only-downloads` + +Attempt to download all assets required for an install plan without performing any builds. + +When passed this option, vcpkg will run each build in the plan until it makes its first non-downloading external process call. Most ports perform all downloads before the first external process call (usually to their buildsystem), so this procedure will download all required assets. Ports that do not follow this procedure will not have their assets predownloaded. + +### `--only-binarycaching` + +Refuse to perform any builds. Only restore packages from [Binary Caches][Binary Caching]. + +This flag blocks vcpkg from performing builds on demand and will fail if a package cannot be found in any binary caches. + +### `--recurse` + +**Classic Mode Only** + +Approve an install plan that requires rebuilding packages. + +In order to modify the set of features of an installed package, vcpkg must remove and rebuild that package. Because this has the potential of failing and leaving the install tree with fewer packages than the user started with, the user must approve plans that rebuild packages by passing this flag. + +### `--x-use-aria2` + +**Experimental and may change or be removed at any time** + +Use aria2 to perform download tasks. + + + +### `--x-write-nuget-packages-config` + +**Experimental and may change or be removed at any time** + +Writes out a NuGet `packages.config`-formatted file for use with [Binary Caching][]. + +This option can be used in conjunction with `--dry-run` to obtain the list of NuGet packages required from [Binary Caching][] without building or installing any packages. This enables the NuGet command line to be invoked separately for advanced scenarios, such as using alternate protocols to acquire the `.nupkg` files. + +[Asset Caching]: ../users/assetcaching.md +[Binary Caching]: ../users/binarycaching.md +[Manifest Mode]: ../users/manifests.md +[`"supports"`]: ../users/manifests.md#supports +[`"default-features"`]: ../users/manifests.md#default-features +[`"dependencies"`]: ../users/manifests.md#dependencies diff --git a/docs/users/manifests.md b/docs/users/manifests.md index 001c73cc658898..74f03718f7a5d4 100644 --- a/docs/users/manifests.md +++ b/docs/users/manifests.md @@ -23,7 +23,20 @@ manifest mode. - [Simple Example Manifest](#simple-example-manifest) - [Manifest Syntax Reference](#manifest-syntax-reference) -- [Command Line Interface](#command-line-interface) + - [`"name"`](#name) + - [Version Fields](#version-fields) + - [`"description"`](#description) + - [`"builtin-baseline"`](#builtin-baseline) + - [`"dependencies"`](#dependencies) + - [`"name"`](#dependencies-name) + - [`"default-features"`](#dependencies-default-features) + - [`"features"`](#dependencies-features) + - [`"platform"`](#platform) + - [`"version>="`](#version-gt) + - [`"overrides"`](#overrides) + - [`"supports"`](#supports) + - [`"features"`](#features) + - [`"default-features"`](#default-features) See also [the original specification](../specifications/manifests.md) for more low-level details. @@ -59,6 +72,8 @@ These comment fields are not allowed in any objects which permit user-defined ke Each manifest contains a top level object with the fields documented below; the most important ones are [`"name"`](#name), the [version fields](#version-fields), and [`"dependencies"`](#dependencies): + + ### `"name"` This is the name of your project! It must be formatted in a way that vcpkg understands - in other words, @@ -67,7 +82,7 @@ For example, `Boost.Asio` might be given the name `boost-asio`. This is a required field. -### Version fields +### Version Fields There are four version field options, depending on how the port orders its releases. @@ -89,6 +104,8 @@ field should not be used. See [versioning](versioning.md#version-schemes) for more details. + + ### `"description"` This is where you describe your project. Give it a good description to help in searching for it! @@ -96,6 +113,8 @@ This can be a single string, or it can be an array of strings; in the latter case, the first string is treated as a summary, while the remaining strings are treated as the full description. + + ### `"builtin-baseline"` This field indicates the commit of vcpkg which provides global minimum version @@ -108,6 +127,8 @@ registry in See [versioning](versioning.md#builtin-baseline) for more semantic details. + + ### `"dependencies"` This field lists all the dependencies you'll need to build your library (as well as any your dependents might need, @@ -136,10 +157,15 @@ if they were to use you). It's an array of strings and objects: ] ``` + + #### `"name"` Field The name of the dependency. This follows the same restrictions as the [`"name"`](#name) property for a project. + + + #### `"features"` and `"default-features"` Fields `"features"` is an array of feature names which tell you the set of features that the @@ -160,6 +186,7 @@ Then, you might just ask for: ``` + #### `"platform"` Field The `"platform"` field defines the platforms where the dependency should be installed - for example, @@ -185,6 +212,8 @@ The common identifiers are: although one can define their own. + + #### `"version>="` Field A minimum version constraint on the dependency. @@ -194,6 +223,8 @@ This field specifies the minimum version of the dependency, optionally using a See also [versioning](versioning.md#version-1) for more semantic details. + + ### `"overrides"` This field pins exact versions for individual dependencies. @@ -212,6 +243,8 @@ See also [versioning](versioning.md#overrides) for more semantic details. ] ``` + + ### `"supports"` If your project doesn't support common platforms, you can tell your users this with the `"supports"` field. @@ -219,6 +252,8 @@ It uses the same platform expressions as [`"platform"`](#platform), from depende `"supports"` field of features. For example, if your library doesn't support linux, you might write `{ "supports": "!linux" }`. + + ### `"features"` and `"default-features"` @@ -275,41 +310,3 @@ and that's the `"default-features"` field, which is an array of feature names. } } ``` - -## Command Line Interface - -When invoked from any subdirectory of the directory containing `vcpkg.json`, `vcpkg install` with no package arguments -will install all manifest dependencies into `/vcpkg_installed/`. Most of `vcpkg -install`'s classic mode parameters function the same in manifest mode. - -### `--x-install-root=` - -**Experimental and may change or be removed at any time** - -Specifies an alternate install location than `/vcpkg_installed/`. - -### `--triplet=` - -Specify the triplet to be used for installation. - -Defaults to the same default triplet as in classic mode. - -### `--x-feature=` - -**Experimental and may change or be removed at any time** - -Specify an additional feature from the `vcpkg.json` to install dependencies from. - -### `--x-no-default-features` - -**Experimental and may change or be removed at any time** - -Disables automatic activation of all default features listed in the `vcpkg.json`. - -### `--x-manifest-root=` - -**Experimental and may change or be removed at any time** - -Specifies the directory containing `vcpkg.json`. - -Defaults to searching upwards from the current working directory. From d8a31a97c5feded71e61b149d7e676a52e5a1c29 Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Fri, 27 May 2022 16:24:32 -0400 Subject: [PATCH 349/383] [arrow] Update to 8.0.0 (#24714) * Bump version to 8.0.0 * Update version files * Update patches * Update version files * Add patch for MSVC 2022 compat * Update version files * [arrow] Minimize dependencies patch * [arrow] Fix issue with getting brotli include dir for dynamic targets Co-authored-by: Robert Schumacher --- ports/arrow/fix-ThirdPartyToolchain.patch | 143 ++++++++++ ports/arrow/fix-dependencies.patch | 316 ---------------------- ports/arrow/portfile.cmake | 10 +- ports/arrow/vcpkg.json | 3 +- ports/arrow/vs-2022-fixes.patch | 42 +++ versions/a-/arrow.json | 5 + versions/baseline.json | 4 +- 7 files changed, 198 insertions(+), 325 deletions(-) create mode 100644 ports/arrow/fix-ThirdPartyToolchain.patch delete mode 100644 ports/arrow/fix-dependencies.patch create mode 100644 ports/arrow/vs-2022-fixes.patch diff --git a/ports/arrow/fix-ThirdPartyToolchain.patch b/ports/arrow/fix-ThirdPartyToolchain.patch new file mode 100644 index 00000000000000..f39cc9758f9672 --- /dev/null +++ b/ports/arrow/fix-ThirdPartyToolchain.patch @@ -0,0 +1,143 @@ +diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake +index f070323..290b5a7 100644 +--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake +@@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + AWSSDK + benchmark + Boost +- Brotli ++ unofficial-brotli + BZip2 + c-ares + gflags +@@ -62,7 +62,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + gRPC + GTest + LLVM +- Lz4 ++ lz4 + nlohmann_json + opentelemetry-cpp + ORC +@@ -72,7 +72,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + Snappy + Substrait + Thrift +- utf8proc ++ unofficial-utf8proc + xsimd + ZLIB + zstd) +@@ -139,6 +139,9 @@ foreach(DEPENDENCY ${ARROW_THIRDPARTY_DEPENDENCIES}) + endforeach() + + macro(build_dependency DEPENDENCY_NAME) ++ if(NOT "${DEPENDENCY_NAME}" STREQUAL "xsimd") ++ message(FATAL_ERROR "dependencies should never be built in vcpkg") ++ endif() + if("${DEPENDENCY_NAME}" STREQUAL "AWSSDK") + build_awssdk() + elseif("${DEPENDENCY_NAME}" STREQUAL "benchmark") +@@ -222,7 +225,7 @@ macro(resolve_dependency DEPENDENCY_NAME) + endif() + + if(ARG_HAVE_ALT) +- set(PACKAGE_NAME "${DEPENDENCY_NAME}Alt") ++ set(PACKAGE_NAME "${DEPENDENCY_NAME}") + else() + set(PACKAGE_NAME ${DEPENDENCY_NAME}) + endif() +@@ -1129,10 +1132,16 @@ macro(build_brotli) + endmacro() + + if(ARROW_WITH_BROTLI) +- resolve_dependency(Brotli PC_PACKAGE_NAMES libbrotlidec libbrotlienc) ++ resolve_dependency(unofficial-brotli USE_CONFIG TRUE PC_PACKAGE_NAMES libbrotlidec libbrotlienc) ++ add_library(Brotli::brotlicommon ALIAS unofficial::brotli::brotlicommon) ++ add_library(Brotli::brotlienc ALIAS unofficial::brotli::brotlienc) ++ add_library(Brotli::brotlidec ALIAS unofficial::brotli::brotlidec) ++ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon-static INTERFACE_INCLUDE_DIRECTORIES) + # TODO: Don't use global includes but rather target_include_directories ++ if(NOT BROTLI_INCLUDE_DIR) + get_target_property(BROTLI_INCLUDE_DIR Brotli::brotlicommon + INTERFACE_INCLUDE_DIRECTORIES) ++ endif() + include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) + endif() + +@@ -1249,7 +1261,7 @@ macro(build_glog) + endmacro() + + if(ARROW_USE_GLOG) +- resolve_dependency(GLOG PC_PACKAGE_NAMES libglog) ++ resolve_dependency(glog USE_CONFIG TRUE PC_PACKAGE_NAMES libglog) + # TODO: Don't use global includes but rather target_include_directories + get_target_property(GLOG_INCLUDE_DIR glog::glog INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${GLOG_INCLUDE_DIR}) +@@ -1434,6 +1446,13 @@ if(ARROW_WITH_THRIFT) + # TODO: Don't use global includes but rather target_include_directories + include_directories(SYSTEM ${THRIFT_INCLUDE_DIR}) + ++ if(THRIFT_INCLUDE_DIR) ++ file(READ "${THRIFT_INCLUDE_DIR}/config.h" THRIFT_CONFIG_H_CONTENT) ++ string(REGEX MATCH "#define PACKAGE_VERSION \"[0-9.]+\"" THRIFT_VERSION_DEFINITION "${THRIFT_CONFIG_H_CONTENT}") ++ string(REGEX MATCH "[0-9.]+" THRIFT_VERSION "${THRIFT_VERSION_DEFINITION}") ++ set(THRIFT_VERSION "${THRIFT_VERSION}") ++ endif() ++ + string(REPLACE "." ";" VERSION_LIST ${THRIFT_VERSION}) + list(GET VERSION_LIST 0 THRIFT_VERSION_MAJOR) + list(GET VERSION_LIST 1 THRIFT_VERSION_MINOR) +@@ -1561,6 +1580,8 @@ if(ARROW_WITH_PROTOBUF) + ${ARROW_PROTOBUF_REQUIRED_VERSION} + PC_PACKAGE_NAMES + protobuf) ++ get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf ++ INTERFACE_INCLUDE_DIRECTORIES) + + if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) + add_definitions(-DPROTOBUF_USE_DLLS) +@@ -2121,8 +2142,6 @@ endmacro() + if(ARROW_WITH_RAPIDJSON) + set(ARROW_RAPIDJSON_REQUIRED_VERSION "1.1.0") + resolve_dependency(RapidJSON +- HAVE_ALT +- TRUE + REQUIRED_VERSION + ${ARROW_RAPIDJSON_REQUIRED_VERSION} + IS_RUNTIME_DEPENDENCY +@@ -2260,7 +2279,8 @@ macro(build_lz4) + endmacro() + + if(ARROW_WITH_LZ4) +- resolve_dependency(Lz4 PC_PACKAGE_NAMES liblz4) ++ resolve_dependency(lz4 USE_CONFIG TRUE PC_PACKAGE_NAMES liblz4) ++ add_library(LZ4::lz4 ALIAS lz4::lz4) + + # TODO: Don't use global includes but rather target_include_directories + get_target_property(LZ4_INCLUDE_DIR LZ4::lz4 INTERFACE_INCLUDE_DIRECTORIES) +@@ -2517,11 +2537,10 @@ macro(build_utf8proc) + endmacro() + + if(ARROW_WITH_UTF8PROC) +- resolve_dependency(utf8proc +- REQUIRED_VERSION +- "2.2.0" ++ resolve_dependency(unofficial-utf8proc + PC_PACKAGE_NAMES + libutf8proc) ++ add_library(utf8proc::utf8proc ALIAS utf8proc) + + add_definitions(-DARROW_WITH_UTF8PROC) + +@@ -3719,6 +3738,9 @@ if(ARROW_WITH_GRPC) + # TODO: Don't use global includes but rather target_include_directories + get_target_property(GRPC_INCLUDE_DIR gRPC::grpc++ INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${GRPC_INCLUDE_DIR}) ++ if (ABSL_USE_CXX17) ++ set(CMAKE_CXX_STANDARD 17) ++ endif() + + if(GRPC_VENDORED) + set(GRPCPP_PP_INCLUDE TRUE) diff --git a/ports/arrow/fix-dependencies.patch b/ports/arrow/fix-dependencies.patch deleted file mode 100644 index e9b740df9ff9aa..00000000000000 --- a/ports/arrow/fix-dependencies.patch +++ /dev/null @@ -1,316 +0,0 @@ -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 2d7baf118..ace45d35b 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -699,7 +699,7 @@ endif() - - if(ARROW_WITH_BROTLI) - # Order is important for static linking -- set(ARROW_BROTLI_LIBS Brotli::brotlienc Brotli::brotlidec Brotli::brotlicommon) -+ set(ARROW_BROTLI_LIBS unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon) - list(APPEND ARROW_LINK_LIBS ${ARROW_BROTLI_LIBS}) - list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_BROTLI_LIBS}) - if(Brotli_SOURCE STREQUAL "SYSTEM") -@@ -715,9 +715,9 @@ if(ARROW_WITH_BZ2) - endif() - - if(ARROW_WITH_LZ4) -- list(APPEND ARROW_STATIC_LINK_LIBS LZ4::lz4) -+ list(APPEND ARROW_STATIC_LINK_LIBS lz4::lz4) - if(Lz4_SOURCE STREQUAL "SYSTEM") -- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS LZ4::lz4) -+ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS lz4::lz4) - endif() - endif() - -@@ -787,10 +787,10 @@ if(ARROW_WITH_OPENTELEMETRY) - endif() - - if(ARROW_WITH_UTF8PROC) -- list(APPEND ARROW_LINK_LIBS utf8proc::utf8proc) -- list(APPEND ARROW_STATIC_LINK_LIBS utf8proc::utf8proc) -+ list(APPEND ARROW_LINK_LIBS utf8proc) -+ list(APPEND ARROW_STATIC_LINK_LIBS utf8proc) - if(utf8proc_SOURCE STREQUAL "SYSTEM") -- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS utf8proc::utf8proc) -+ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS utf8proc) - endif() - endif() - -diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake -index bc389521b..1b358ce70 100644 ---- a/cpp/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake -@@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - AWSSDK - benchmark - Boost -- Brotli -+ unofficial-brotli - BZip2 - c-ares - gflags -@@ -62,7 +62,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - gRPC - GTest - LLVM -- Lz4 -+ lz4 - opentelemetry-cpp - ORC - re2 -@@ -70,7 +70,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - RapidJSON - Snappy - Thrift -- utf8proc -+ unofficial-utf8proc - xsimd - ZLIB - zstd) -@@ -893,17 +893,7 @@ set(Boost_ADDITIONAL_VERSIONS - # so we first need to determine whether we're building it - if(ARROW_WITH_THRIFT AND Thrift_SOURCE STREQUAL "AUTO") - find_package(Thrift 0.11.0 MODULE COMPONENTS ${ARROW_THRIFT_REQUIRED_COMPONENTS}) -- if(Thrift_FOUND) -- find_package(PkgConfig QUIET) -- pkg_check_modules(THRIFT_PC -- thrift -- NO_CMAKE_PATH -- NO_CMAKE_ENVIRONMENT_PATH -- QUIET) -- if(THRIFT_PC_FOUND) -- string(APPEND ARROW_PC_REQUIRES_PRIVATE " thrift") -- endif() -- else() -+ if(NOT Thrift_FOUND AND NOT THRIFT_FOUND) - set(Thrift_SOURCE "BUNDLED") - endif() - endif() -@@ -1038,7 +1028,7 @@ macro(build_snappy) - endmacro() - - if(ARROW_WITH_SNAPPY) -- resolve_dependency(Snappy PC_PACKAGE_NAMES snappy) -+ resolve_dependency(Snappy USE_CONFIG TRUE PC_PACKAGE_NAMES snappy) - if(${Snappy_SOURCE} STREQUAL "SYSTEM" AND NOT snappy_PC_FOUND) - get_target_property(SNAPPY_LIB Snappy::snappy IMPORTED_LOCATION) - string(APPEND ARROW_PC_LIBS_PRIVATE " ${SNAPPY_LIB}") -@@ -1108,10 +1098,16 @@ macro(build_brotli) - endmacro() - - if(ARROW_WITH_BROTLI) -- resolve_dependency(Brotli PC_PACKAGE_NAMES libbrotlidec libbrotlienc) -+ set(unofficial-brotli_SOURCE "SYSTEM") -+ resolve_dependency(unofficial-brotli USE_CONFIG TRUE PC_PACKAGE_NAMES libbrotlidec libbrotlienc) - # TODO: Don't use global includes but rather target_include_directories -- get_target_property(BROTLI_INCLUDE_DIR Brotli::brotlicommon -- INTERFACE_INCLUDE_DIRECTORIES) -+ if (BUILD_SHARED_LIBS) -+ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon -+ INTERFACE_INCLUDE_DIRECTORIES) -+ else() -+ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon-static -+ INTERFACE_INCLUDE_DIRECTORIES) -+ endif() - include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) - endif() - -@@ -1228,7 +1224,7 @@ macro(build_glog) - endmacro() - - if(ARROW_USE_GLOG) -- resolve_dependency(GLOG PC_PACKAGE_NAMES libglog) -+ resolve_dependency(glog USE_CONFIG TRUE PC_PACKAGE_NAMES libglog) - # TODO: Don't use global includes but rather target_include_directories - get_target_property(GLOG_INCLUDE_DIR glog::glog INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${GLOG_INCLUDE_DIR}) -@@ -1302,8 +1298,7 @@ endmacro() - if(ARROW_NEED_GFLAGS) - set(ARROW_GFLAGS_REQUIRED_VERSION "2.1.0") - resolve_dependency(gflags -- HAVE_ALT -- TRUE -+ USE_CONFIG TRUE - REQUIRED_VERSION - ${ARROW_GFLAGS_REQUIRED_VERSION} - IS_RUNTIME_DEPENDENCY -@@ -1402,9 +1397,10 @@ endmacro() - if(ARROW_WITH_THRIFT) - # We already may have looked for Thrift earlier, when considering whether - # to build Boost, so don't look again if already found. -- if(NOT Thrift_FOUND) -+ if(TRUE) - # Thrift c++ code generated by 0.13 requires 0.11 or greater - resolve_dependency(Thrift -+ USE_CONFIG TRUE - REQUIRED_VERSION - 0.11.0 - PC_PACKAGE_NAMES -@@ -1413,6 +1409,14 @@ if(ARROW_WITH_THRIFT) - # TODO: Don't use global includes but rather target_include_directories - include_directories(SYSTEM ${THRIFT_INCLUDE_DIR}) - -+ if(THRIFT_INCLUDE_DIR) -+ file(READ "${THRIFT_INCLUDE_DIR}/config.h" THRIFT_CONFIG_H_CONTENT) -+ string(REGEX MATCH "#define PACKAGE_VERSION \"[0-9.]+\"" THRIFT_VERSION_DEFINITION -+ "${THRIFT_CONFIG_H_CONTENT}") -+ string(REGEX MATCH "[0-9.]+" THRIFT_VERSION "${THRIFT_VERSION_DEFINITION}") -+ set(THRIFT_VERSION "${THRIFT_VERSION}") -+ endif() -+ - string(REPLACE "." ";" VERSION_LIST ${THRIFT_VERSION}) - list(GET VERSION_LIST 0 THRIFT_VERSION_MAJOR) - list(GET VERSION_LIST 1 THRIFT_VERSION_MINOR) -@@ -1528,6 +1532,7 @@ if(ARROW_WITH_PROTOBUF) - set(ARROW_PROTOBUF_REQUIRED_VERSION "2.6.1") - endif() - resolve_dependency(Protobuf -+ USE_CONFIG TRUE - REQUIRED_VERSION - ${ARROW_PROTOBUF_REQUIRED_VERSION} - PC_PACKAGE_NAMES -@@ -1538,6 +1543,10 @@ if(ARROW_WITH_PROTOBUF) - endif() - - # TODO: Don't use global includes but rather target_include_directories -+ if (TARGET protobuf::libprotobuf) -+ get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf -+ INTERFACE_INCLUDE_DIRECTORIES) -+ endif() - include_directories(SYSTEM ${PROTOBUF_INCLUDE_DIR}) - - if(TARGET arrow::protobuf::libprotobuf) -@@ -1586,12 +1595,18 @@ if(ARROW_WITH_PROTOBUF) - - # Log protobuf paths as we often see issues with mixed sources for - # the libraries and protoc. -+ if (NOT TARGET protobuf::protoc) - get_target_property(PROTOBUF_PROTOC_EXECUTABLE ${ARROW_PROTOBUF_PROTOC} - IMPORTED_LOCATION) -+ endif() - message(STATUS "Found protoc: ${PROTOBUF_PROTOC_EXECUTABLE}") - # Protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake - message(STATUS "Found libprotoc: ${Protobuf_PROTOC_LIBRARY}") -+ if (NOT TARGET protobuf::libprotobuf) - get_target_property(PROTOBUF_LIBRARY ${ARROW_PROTOBUF_LIBPROTOBUF} IMPORTED_LOCATION) -+ else() -+ set(PROTOBUF_LIBRARY protobuf::libprotobuf) -+ endif() - message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") - message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") - endif() -@@ -2001,7 +2016,7 @@ endmacro() - if(ARROW_WITH_RAPIDJSON) - set(ARROW_RAPIDJSON_REQUIRED_VERSION "1.1.0") - resolve_dependency(RapidJSON -- HAVE_ALT -+ USE_CONFIG - TRUE - REQUIRED_VERSION - ${ARROW_RAPIDJSON_REQUIRED_VERSION} -@@ -2140,10 +2155,11 @@ macro(build_lz4) - endmacro() - - if(ARROW_WITH_LZ4) -- resolve_dependency(Lz4 PC_PACKAGE_NAMES liblz4) -+ set(lz4_SOURCE "SYSTEM") -+ resolve_dependency(lz4 USE_CONFIG TRUE PC_PACKAGE_NAMES liblz4) - - # TODO: Don't use global includes but rather target_include_directories -- get_target_property(LZ4_INCLUDE_DIR LZ4::lz4 INTERFACE_INCLUDE_DIRECTORIES) -+ get_target_property(LZ4_INCLUDE_DIR lz4::lz4 INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${LZ4_INCLUDE_DIR}) - endif() - -@@ -2207,7 +2223,7 @@ endmacro() - if(ARROW_WITH_ZSTD) - # ARROW-13384: ZSTD_minCLevel was added in v1.4.0, required by ARROW-13091 - resolve_dependency(zstd -- PC_PACKAGE_NAMES -+ USE_CONFIG TRUE PC_PACKAGE_NAMES - libzstd - REQUIRED_VERSION - 1.4.0) -@@ -2390,9 +2406,8 @@ macro(build_utf8proc) - endmacro() - - if(ARROW_WITH_UTF8PROC) -- resolve_dependency(utf8proc -- REQUIRED_VERSION -- "2.2.0" -+ resolve_dependency(unofficial-utf8proc -+ USE_CONFIG TRUE - PC_PACKAGE_NAMES - libutf8proc) - -@@ -2400,7 +2415,7 @@ if(ARROW_WITH_UTF8PROC) - - # TODO: Don't use global definitions but rather - # target_compile_definitions or target_link_libraries -- get_target_property(UTF8PROC_COMPILER_DEFINITIONS utf8proc::utf8proc -+ get_target_property(UTF8PROC_COMPILER_DEFINITIONS utf8proc - INTERFACE_COMPILER_DEFINITIONS) - if(UTF8PROC_COMPILER_DEFINITIONS) - add_definitions(-D${UTF8PROC_COMPILER_DEFINITIONS}) -@@ -2408,7 +2423,7 @@ if(ARROW_WITH_UTF8PROC) - - # TODO: Don't use global includes but rather - # target_include_directories or target_link_libraries -- get_target_property(UTF8PROC_INCLUDE_DIR utf8proc::utf8proc -+ get_target_property(UTF8PROC_INCLUDE_DIR utf8proc - INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${UTF8PROC_INCLUDE_DIR}) - endif() -@@ -3317,7 +3332,7 @@ endmacro() - - macro(build_grpc) - resolve_dependency(c-ares -- HAVE_ALT -+ USE_CONFIG - TRUE - PC_PACKAGE_NAMES - libcares) -@@ -3555,7 +3570,7 @@ if(ARROW_WITH_GRPC) - set(gRPC_SOURCE "${Protobuf_SOURCE}") - endif() - resolve_dependency(gRPC -- HAVE_ALT -+ USE_CONFIG - TRUE - REQUIRED_VERSION - ${ARROW_GRPC_REQUIRED_VERSION} -@@ -3565,6 +3580,10 @@ if(ARROW_WITH_GRPC) - # TODO: Don't use global includes but rather target_include_directories - get_target_property(GRPC_INCLUDE_DIR gRPC::grpc++ INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${GRPC_INCLUDE_DIR}) -+ if (ABSL_USE_CXX17) -+ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") -+ set(CMAKE_CXX_STANDARD 17) -+ endif() - - if(GRPC_VENDORED) - set(GRPCPP_PP_INCLUDE TRUE) -@@ -4315,7 +4334,8 @@ if(ARROW_S3) - s3 - transfer - identity-management -- sts) -+ sts -+ CONFIG) - endif() - - # Restore previous value of BUILD_SHARED_LIBS -diff --git a/cpp/src/arrow/adapters/orc/CMakeLists.txt b/cpp/src/arrow/adapters/orc/CMakeLists.txt -index b1b6847cf..444a45e4e 100644 ---- a/cpp/src/arrow/adapters/orc/CMakeLists.txt -+++ b/cpp/src/arrow/adapters/orc/CMakeLists.txt -@@ -30,7 +30,7 @@ set(ORC_MIN_TEST_LIBS - GTest::gtest_main - GTest::gtest - Snappy::snappy -- LZ4::lz4 -+ lz4::lz4 - ZLIB::ZLIB) - - if(ARROW_BUILD_STATIC) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 1aa93020f7e779..4f5e759d9baacc 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-7.0.0 - SHA512 4df480e03dcd85c1c04f93ca55968cf64eb96b4bdb586d9ad3bd1d5ba6d9ec7cca34fefef43d84b921ba74ceaeb48f8ac9d1d1355f2408ebffd2b2a00a3da2bd + REF apache-arrow-8.0.0 + SHA512 08b6ab4a3c5e0dd9c46402da8e7b9ef9f918eea177413cb31695192dfdb5a472ebbfef255b8343fe775d81e8b5eb268c3428a699fac48b36bf808f5b81e83a64 HEAD_REF master PATCHES + vs-2022-fixes.patch all.patch - fix-dependencies.patch + fix-ThirdPartyToolchain.patch ) - file(REMOVE "${SOURCE_PATH}/cpp/cmake_modules/Findzstd.cmake" "${SOURCE_PATH}/cpp/cmake_modules/FindBrotli.cmake" "${SOURCE_PATH}/cpp/cmake_modules/Find-c-aresAlt.cmake" @@ -75,7 +75,7 @@ vcpkg_cmake_configure( -DARROW_DEPENDENCY_USE_SHARED=${ARROW_DEPENDENCY_USE_SHARED} -DARROW_THRIFT_USE_SHARED=${THRIFT_USE_SHARED} -DBUILD_WARNING_LEVEL=PRODUCTION - -DARROW_WITH_BROTLI=ON + -DARROW_WITH_BROTLI=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_LZ4=ON -DARROW_WITH_SNAPPY=ON diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index bab2dfe3274fcd..f435e7112f5736 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,6 @@ { "name": "arrow", - "version": "7.0.0", - "port-version": 3, + "version": "8.0.0", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/ports/arrow/vs-2022-fixes.patch b/ports/arrow/vs-2022-fixes.patch new file mode 100644 index 00000000000000..964706331d1f17 --- /dev/null +++ b/ports/arrow/vs-2022-fixes.patch @@ -0,0 +1,42 @@ +diff --git a/cpp/src/arrow/compute/light_array_test.cc b/cpp/src/arrow/compute/light_array_test.cc +index 3f6d47803..dcc7841a0 100644 +--- a/cpp/src/arrow/compute/light_array_test.cc ++++ b/cpp/src/arrow/compute/light_array_test.cc +@@ -18,6 +18,7 @@ + #include "arrow/compute/light_array.h" + + #include ++#include + + #include "arrow/compute/exec/test_util.h" + #include "arrow/testing/generator.h" +diff --git a/cpp/src/arrow/util/tracing.cc b/cpp/src/arrow/util/tracing.cc +index b8bddcd50..126c69781 100644 +--- a/cpp/src/arrow/util/tracing.cc ++++ b/cpp/src/arrow/util/tracing.cc +@@ -38,6 +38,7 @@ Span::Impl& Span::Set(Impl&& impl) { + #endif + + // Default destructor when impl type is complete. ++Span::Span() = default; + Span::~Span() = default; + + } // namespace tracing +diff --git a/cpp/src/arrow/util/tracing.h b/cpp/src/arrow/util/tracing.h +index 15f7fca1e..1d9d08b33 100644 +--- a/cpp/src/arrow/util/tracing.h ++++ b/cpp/src/arrow/util/tracing.h +@@ -35,11 +35,11 @@ class SpanImpl; + namespace util { + namespace tracing { + +-class ARROW_EXPORT Span { ++class Span { + public: + using Impl = arrow::internal::tracing::SpanImpl; + +- Span() = default; // Default constructor. The inner_impl is a nullptr. ++ Span(); // Default constructor. The inner_impl is a nullptr. + ~Span(); // Destructor. Default destructor defined in tracing.cc where impl is a + // complete type. + diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index d810dc21ecd881..febcc4fd3388fb 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4334074d163357f9002145ca722dc8dbcc546dbc", + "version": "8.0.0", + "port-version": 0 + }, { "git-tree": "9beefb8449a167f6dbcbe35a2bd2b7d3cb2889a2", "version": "7.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 45ae7c776ef383..cb9c15ffe0a7a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -173,8 +173,8 @@ "port-version": 0 }, "arrow": { - "baseline": "7.0.0", - "port-version": 3 + "baseline": "8.0.0", + "port-version": 0 }, "ashes": { "baseline": "2022-04-03", From e42e5115f6074c95677053a69ba17c932de6b01d Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Sat, 28 May 2022 04:24:51 +0800 Subject: [PATCH 350/383] [rsocket] Remove from ci.baseline.txt (#24959) Co-authored-by: Lily Wang --- scripts/ci.baseline.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 623e4810ad7fc4..66c0b04461e654 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1010,10 +1010,6 @@ rsasynccpp:x64-osx=fail rsm-binary-io:x64-linux=fail # Requires g++10 but CI compiler only has g++9 rsm-bsa:x64-linux=fail -# VS2022 17.2 ICE https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1490389 -rsocket:x64-windows=fail -rsocket:x64-windows-static=fail -rsocket:x64-windows-static-md=fail rtlsdr:x64-uwp=fail rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail From 8cfe2589b7060a9c1e131f31822aca3fa35ff3cf Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 28 May 2022 04:25:59 +0800 Subject: [PATCH 351/383] [libgo] Fix include directory not exposed by target (#24958) Co-authored-by: Cheney-Wang --- ports/libgo/Add-target-include-directory.patch | 13 +++++++++++++ ports/libgo/portfile.cmake | 1 + ports/libgo/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libgo.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/libgo/Add-target-include-directory.patch diff --git a/ports/libgo/Add-target-include-directory.patch b/ports/libgo/Add-target-include-directory.patch new file mode 100644 index 00000000000000..fe4dffea1160cb --- /dev/null +++ b/ports/libgo/Add-target-include-directory.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e21eee0..017cc7a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -176,6 +176,8 @@ if (WIN32) + set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4819 /wd4267") + endif() + ++TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} INTERFACE $) ++ + install(TARGETS ${PROJECT_NAME} + EXPORT "${PROJECT_NAME}Config" + LIBRARY DESTINATION lib diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake index e51f060e2729e1..826a162b434ed1 100644 --- a/ports/libgo/portfile.cmake +++ b/ports/libgo/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES cmake.patch + Add-target-include-directory.patch ) vcpkg_from_github( diff --git a/ports/libgo/vcpkg.json b/ports/libgo/vcpkg.json index 94c6818d16aab3..c8be7a4ca42a1d 100644 --- a/ports/libgo/vcpkg.json +++ b/ports/libgo/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libgo", "version": "3.1", - "port-version": 4, + "port-version": 5, "description": "The best stackful coroutine by c++11.", "homepage": "https://github.com/yyzybb537/libgo", + "license": "MIT", "supports": "!(arm | uwp)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index cb9c15ffe0a7a7..a7c8df0db7c7cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3606,7 +3606,7 @@ }, "libgo": { "baseline": "3.1", - "port-version": 4 + "port-version": 5 }, "libgpg-error": { "baseline": "1.42", diff --git a/versions/l-/libgo.json b/versions/l-/libgo.json index f8921f77ac6125..7fa55e263630f3 100644 --- a/versions/l-/libgo.json +++ b/versions/l-/libgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7eea4022110bad013d460a23328cd2e82385bb1", + "version": "3.1", + "port-version": 5 + }, { "git-tree": "b50450a394cd5b4e882d353439c3dae6cc0564f2", "version": "3.1", From 0371f465074183cb08b0b36f048736759781b6d0 Mon Sep 17 00:00:00 2001 From: eao197 Date: Sat, 28 May 2022 02:37:49 +0300 Subject: [PATCH 352/383] [restinio] Update to 0.6.15 (#24936) * RESTinio updated to v0.6.15. * RESTinio-0.6.15 added to baseline. * Update ports/restinio/vcpkg.json as suggested. Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update baseline to RESTinio-0.6.15. * Remove additional version entry Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- ports/restinio/portfile.cmake | 4 ++-- ports/restinio/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/restinio.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 0d36ca26c90122..56f8c8851aa47e 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/restinio - REF 20140bcecaec6f44ad5a8f68efcd8b44e1375604 # v.0.6.14 - SHA512 e4654342831cb5c9086b60b22a7a15dd68a6769e28936576a1ff61352ea204f8e171bd446d002cefb514fd0cc4842878f23d5d51bc0da48c6224b96e4a0f3b14 + REF 3bbbc97f572efc62dcf8ebfe3baf919593c22d81 # v.0.6.15 + SHA512 3a89d72bad4383b83bcfe8bbe16e12f7c08367dc3dfb2feff5642334d2bd5df3c75e5b25c4402c54d4279c45d5ab5997992fba18c3099772b6145fa90af7c808 ) vcpkg_cmake_configure( diff --git a/ports/restinio/vcpkg.json b/ports/restinio/vcpkg.json index ed6cc623b933d7..018ba32eb086be 100644 --- a/ports/restinio/vcpkg.json +++ b/ports/restinio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "restinio", - "version": "0.6.14", - "port-version": 1, + "version": "0.6.15", "description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.", "homepage": "https://github.com/Stiffstream/restinio", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index a7c8df0db7c7cf..d5743881f7e7e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6205,8 +6205,8 @@ "port-version": 0 }, "restinio": { - "baseline": "0.6.14", - "port-version": 1 + "baseline": "0.6.15", + "port-version": 0 }, "rexo": { "baseline": "0.2.2", diff --git a/versions/r-/restinio.json b/versions/r-/restinio.json index 7939d0c292abb9..cc92309e53fd39 100644 --- a/versions/r-/restinio.json +++ b/versions/r-/restinio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07fadf731052fa7900593db32c0515cba8c45138", + "version": "0.6.15", + "port-version": 0 + }, { "git-tree": "ea4d99d764e913dd233ac8d1df27c6720f5ccbd9", "version": "0.6.14", From c1ee7c6ab4c053ccaaae17b353241965186e9f85 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 28 May 2022 01:38:28 +0200 Subject: [PATCH 353/383] [gdal] Use pkg-config to find zlib (#24931) * Use pkg-config for zlib discovery * Update versions --- ports/gdal/0005-Fix-configure.patch | 19 +++++++++++++++++++ ports/gdal/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ports/gdal/0005-Fix-configure.patch b/ports/gdal/0005-Fix-configure.patch index 517047bc1ad7c7..0a032c405acb81 100644 --- a/ports/gdal/0005-Fix-configure.patch +++ b/ports/gdal/0005-Fix-configure.patch @@ -11,6 +11,25 @@ index 30cd613..43f1daf 100644 dnl Enable as much warnings as possible AC_LANG_PUSH([C]) AX_COMPILER_VENDOR +@@ -1111,6 +1111,8 @@ dnl --------------------------------------------------------------------------- + AC_ARG_WITH(libz,[ --with-libz[=ARG] Include libz support (ARG=internal or libz directory)],,) + + if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ; then ++ PKG_CHECK_MODULES([ZLIB], [zlib], [LIBZ_SETTING=external], [LIBZ_SETTING=internal]) ++elif false ; then + + AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,) + +@@ -1144,7 +1146,8 @@ elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then + fi + + if test "$LIBZ_SETTING" = "external" ; then +- LIBS="-lz $LIBS" ++ LIBS="${ZLIB_LIBS} $LIBS" ++ EXTRA_INCLUDES="${ZLIB_CFLAGS} $EXTRA_INCLUDES" + if test "$with_libz" != "" -a "$with_libz" != "yes" -a "$with_libz" != "external" ; then + EXTRA_INCLUDES="-I$with_libz -I$with_libz/include $EXTRA_INCLUDES" + fi @@ -1336,12 +1338,15 @@ AC_MSG_CHECKING([for libtiff]) if test "x${with_libtiff}" = "xyes" -o "x${with_libtiff}" = "x" ; then diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 910c80da5e4a85..636c1f50d2ccef 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdal", "version-semver": "3.4.3", + "port-version": 1, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index d5743881f7e7e4..3bfb9d457f3242 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2438,7 +2438,7 @@ }, "gdal": { "baseline": "3.4.3", - "port-version": 0 + "port-version": 1 }, "gdcm": { "baseline": "3.0.12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 6e65fae250eb3c..93235d40b5a02b 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bdf8b8ff951c1ce8719c789e66ac3a166eed063", + "version-semver": "3.4.3", + "port-version": 1 + }, { "git-tree": "8277225a2c5da40e154062f73526126fb00c9125", "version-semver": "3.4.3", From 5739a74ef0d0379695f83d4c2b5b5a56cd9fd57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sat, 28 May 2022 01:46:07 +0200 Subject: [PATCH 354/383] [qtbase] fix broken `gui` build (#24917) * [qtbase] add `thread` feature * [qtbase] add version --- ports/qtbase/portfile.cmake | 2 +- ports/qtbase/vcpkg.json | 25 +++++++++++++++++++++++-- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 0656be7eeaa6ce..d3f48e11849913 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -73,9 +73,9 @@ FEATURES "framework" FEATURE_framework "concurrent" FEATURE_concurrent "concurrent" FEATURE_future - "concurrent" FEATURE_thread "dbus" FEATURE_dbus "gui" FEATURE_gui + "thread" FEATURE_thread "network" FEATURE_network "sql" FEATURE_sql "widgets" FEATURE_widgets diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 7de58656267efd..482883605a1db8 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.3.0", - "port-version": 1, + "port-version": 2, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, @@ -63,6 +63,7 @@ "sql-psql", "sql-sqlite", "testlib", + "thread", "widgets", "zstd" ], @@ -84,7 +85,16 @@ ] }, "concurrent": { - "description": "Provides a high-level multi-threading API. Qt Concurrent" + "description": "Provides a high-level multi-threading API. Qt Concurrent", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "thread" + ] + } + ] }, "dbus": { "description": "Qt D-Bus" @@ -167,6 +177,14 @@ "features": [ "freetype" ] + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "thread" + ], + "platform": "windows" } ] }, @@ -278,6 +296,9 @@ "testlib": { "description": "Qt Testlib" }, + "thread": { + "description": "Thread support; provides QThread and related classes." + }, "vulkan": { "description": "Enable Vulkan support" }, diff --git a/versions/baseline.json b/versions/baseline.json index 3bfb9d457f3242..d766b26946a5af 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5882,7 +5882,7 @@ }, "qtbase": { "baseline": "6.3.0", - "port-version": 1 + "port-version": 2 }, "qtcharts": { "baseline": "6.3.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index da074daed1f43f..11e682dc5eb09f 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bad99835f1e2cf63bc1ddcd9d5871e3081964bbc", + "version": "6.3.0", + "port-version": 2 + }, { "git-tree": "32ffa659c93542477ed0f0ee90f3a7f99c0035f0", "version": "6.3.0", From d953973cfbfeaf8022f5219fbabb0bdf9defb706 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 28 May 2022 02:03:32 +0200 Subject: [PATCH 355/383] [libpq] Cleanup dependencies, features and autotools patches (#24941) * Consolidate autotools patches with pkg-config Fixes mingw builds. * No msbuild limitations for mingw * Implement readline support * Remove features which never built * Bonjour support is osx only * Move remaining support checks to manifest * Remove libpq uwp fail from ci baseline * Update versions --- ports/libpq/patches/fix-configure.patch | 66 +++++++++------- ports/libpq/patches/linux/configure.patch | 22 ------ .../patches/mingw/link-with-crypt32.patch | 79 ------------------- ports/libpq/portfile.cmake | 36 --------- ports/libpq/vcpkg.json | 29 ++----- scripts/ci.baseline.txt | 2 - versions/baseline.json | 2 +- versions/l-/libpq.json | 5 ++ 8 files changed, 51 insertions(+), 190 deletions(-) delete mode 100644 ports/libpq/patches/linux/configure.patch delete mode 100644 ports/libpq/patches/mingw/link-with-crypt32.patch diff --git a/ports/libpq/patches/fix-configure.patch b/ports/libpq/patches/fix-configure.patch index aa1dd2b9f8bd08..bf7c606e7b96f3 100644 --- a/ports/libpq/patches/fix-configure.patch +++ b/ports/libpq/patches/fix-configure.patch @@ -1,64 +1,72 @@ diff --git a/configure.ac b/configure.ac -index fba79ee36..4563fa9f7 100644 +index fba79ee..4fadb94 100644 --- a/configure.ac +++ b/configure.ac -@@ -18,15 +18,14 @@ dnl - m4_pattern_forbid(^PGAC_)dnl to catch undefined macros +@@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros AC_INIT([PostgreSQL], [14.1], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -- + -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.ac' but it is then --your responsibility whether the result works or not.])]) -+# m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -+# Untested combinations of 'autoconf' and PostgreSQL versions are not -+# recommended. You can remove the check from 'configure.ac' but it is then -+# your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) --AC_PREFIX_DEFAULT(/usr/local/pgsql) -+#AC_PREFIX_DEFAULT(/usr/local/pgsql) - AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure]) ++m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_warn([unsupported],[Autoconf version 2.69 is required. + Untested combinations of 'autoconf' and PostgreSQL versions are not + recommended. You can remove the check from 'configure.ac' but it is then + your responsibility whether the result works or not.])]) +@@ -1184,7 +1184,8 @@ if test "$enable_thread_safety" = yes; then + fi - [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`] + if test "$with_readline" = yes; then +- PGAC_CHECK_READLINE ++ PKG_CHECK_MODULES([READLINE], [readline], [HAVE_LIBREADLINE=1], [pgac_cv_check_readline=no]) ++ LIBS="$READLINE_LIBS $LIBS" + if test x"$pgac_cv_check_readline" = x"no"; then + AC_MSG_ERROR([readline library not found + If you have readline already installed, see config.log for details on the @@ -1194,7 +1195,7 @@ Use --without-readline to disable readline support.]) fi if test "$with_zlib" = yes; then - AC_CHECK_LIB(z, inflate, [], -+ AC_SEARCH_LIBS(inflate, [z zlib zlibd], [AC_DEFINE(HAVE_LIBZ,1,[Define to 1 if with zlib])], ++ PKG_CHECK_MODULES([ZLIB], [zlib], [LIBS="$ZLIB_LIBS $LIBS"], [AC_MSG_ERROR([zlib library not found If you have zlib already installed, see config.log for details on the failure. It is possible the compiler isn't looking in the proper directory. -@@ -1247,8 +1248,8 @@ if test "$with_ssl" = openssl ; then +@@ -1243,6 +1244,9 @@ if test "$with_ssl" = openssl ; then + # Minimum required OpenSSL version is 1.0.1 + AC_DEFINE(OPENSSL_API_COMPAT, [0x10001000L], + [Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.]) ++ PKG_CHECK_MODULES([CRYPTO_new_ex_data], [libcrypto], [LIBS="$CRYPTO_new_ex_data_LIBS $LIBS"], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) ++ PKG_CHECK_MODULES([SSL_new], [libssl], [LIBS="$SSL_new_LIBS $LIBS"], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) ++ if false ; then + if test "$PORTNAME" != "win32"; then AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) AC_CHECK_LIB(ssl, SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) - else -- AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) -- AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) -+ AC_SEARCH_LIBS(CRYPTO_new_ex_data, [libcrypto eay32 crypto], [AC_DEFINE(HAVE_LIBCRYPTO, 1, [Defined to 1 if libcrypto is found])], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) -+ AC_SEARCH_LIBS(SSL_new, [libssl ssleay32 ssl], [AC_DEFINE(HAVE_LIBSSL, 1, [Defined to 1 if libssl is found])], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) +@@ -1250,6 +1254,7 @@ if test "$with_ssl" = openssl ; then + AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) + AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) fi ++ fi # Function introduced in OpenSSL 1.0.2. AC_CHECK_FUNCS([X509_get_signature_nid]) -@@ -1273,15 +1274,15 @@ if test "$with_pam" = yes ; then + # Functions introduced in OpenSSL 1.1.0. We used to check for +@@ -1273,15 +1278,18 @@ if test "$with_pam" = yes ; then fi if test "$with_libxml" = yes ; then - AC_CHECK_LIB(xml2, xmlSaveToBuffer, [], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) -+ AC_SEARCH_LIBS(xmlSaveToBuffer, [xml2 libxml2], [AC_DEFINE(HAVE_LIBXML2,1,[Define to 1 if with xml2])], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) ++ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6.23], [AC_DEFINE(HAVE_LIBXML2,1,[Define to 1 if with xml2])], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) ++ LIBS="$LIBXML2_LIBS $LIBS" fi if test "$with_libxslt" = yes ; then - AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) -+ AC_SEARCH_LIBS(xsltCleanupGlobals, [xslt libxslt], [AC_DEFINE(HAVE_LIBXSLT,1,[Define to 1 if with xslt])], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) ++ PKG_CHECK_MODULES([LIBXSLT], [libxslt], [AC_DEFINE(HAVE_LIBXSLT,1,[Define to 1 if with xslt])], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) ++ LIBS="$LIBXSLT_LIBS $LIBS" fi if test "$with_lz4" = yes ; then - AC_CHECK_LIB(lz4, LZ4_compress_default, [], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])]) -+ AC_SEARCH_LIBS(LZ4_compress_default, [lz4 lz4d], [AC_DEFINE(HAVE_LIBLZ4,1,[Define to 1 if with lz4])], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])]) ++ PKG_CHECK_MODULES([LZ4], [liblz4], [AC_DEFINE(HAVE_LIBLZ4,1,[Define to 1 if with lz4])], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])]) ++ LIBS="$LZ4_LIBS $LIBS" fi # Note: We can test for libldap_r only after we know PTHREAD_LIBS; diff --git a/ports/libpq/patches/linux/configure.patch b/ports/libpq/patches/linux/configure.patch deleted file mode 100644 index cd4b30cf8db955..00000000000000 --- a/ports/libpq/patches/linux/configure.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure b/configure -index 54c852aca..96e2c89ba 100644 ---- a/configure -+++ b/configure -@@ -12452,7 +12452,7 @@ if ${ac_cv_lib_crypto_CRYPTO_new_ex_data+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lcrypto $LIBS" -+LIBS="-lcrypto -pthread $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -12487,7 +12487,7 @@ if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = xyes; then : - #define HAVE_LIBCRYPTO 1 - _ACEOF - -- LIBS="-lcrypto $LIBS" -+ LIBS="-lcrypto -pthread $LIBS" - - else - as_fn_error $? "library 'crypto' is required for OpenSSL" "$LINENO" 5 diff --git a/ports/libpq/patches/mingw/link-with-crypt32.patch b/ports/libpq/patches/mingw/link-with-crypt32.patch deleted file mode 100644 index 67167de1f87209..00000000000000 --- a/ports/libpq/patches/mingw/link-with-crypt32.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/configure b/configure -index 75210f0..6ea5e1f 100755 ---- a/configure -+++ b/configure -@@ -11708,6 +11708,62 @@ if test "$ac_res" != no; then : - - fi - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing CertOpenStore" >&5 -+$as_echo_n "checking for library containing CertOpenStore... " >&6; } -+if ${ac_cv_search_CertOpenStore+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char CertOpenStore (); -+int -+main () -+{ -+return CertOpenStore (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' crypt32; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_CertOpenStore=$ac_res -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if ${ac_cv_search_CertOpenStore+:} false; then : -+ break -+fi -+done -+if ${ac_cv_search_CertOpenStore+:} false; then : -+ -+else -+ ac_cv_search_CertOpenStore=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_CertOpenStore" >&5 -+$as_echo "$ac_cv_search_CertOpenStore" >&6; } -+ac_res=$ac_cv_search_CertOpenStore -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi -+ - - if test "$with_readline" = yes; then - -diff --git a/configure.in b/configure.in -index 0832636..0911ec0 100644 ---- a/configure.in -+++ b/configure.in -@@ -1158,6 +1158,7 @@ AC_SEARCH_LIBS(sched_yield, rt) - AC_SEARCH_LIBS(gethostbyname_r, nsl) - # Cygwin: - AC_SEARCH_LIBS(shmget, cygipc) -+AC_SEARCH_LIBS(CertOpenStore, crypt32) - - if test "$with_readline" = yes; then - PGAC_CHECK_READLINE diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 02d7e5a97de3f1..09b36591dfc803 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -1,36 +1,6 @@ set(PORT_VERSION 14.1) # NOTE: the python patches must be regenerated on version update -macro(feature_unsupported) - foreach(_feat ${ARGN}) - if("${FEATURES}" MATCHES "${_feat}") - message(FATAL_ERROR "Feature ${_feat} not supported by configure script on the target platform") - endif() - endforeach() -endmacro() - -macro(feature_not_implemented_yet) - foreach(_feat ${ARGN}) - if("${FEATURES}" MATCHES "${_feat}") - message(FATAL_ERROR "Feature ${_feat} is not yet implement on the target platform") - endif() - endforeach() -endmacro() - -if(VCPKG_TARGET_IS_WINDOWS) - # on windows libpq seems to only depend on openssl gss(kerberos) and ldap on the soruce site_name - # the configuration header depends on zlib, nls, uuid, xml, xlst,gss,openssl,icu - feature_unsupported(readline bonjour libedit systemd llvm) - feature_not_implemented_yet(uuid) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - feature_not_implemented_yet(client python tcl) - endif() -elseif(VCPKG_TARGET_IS_OSX) - feature_not_implemented_yet(readline libedit systemd llvm python tcl uuid) -else() - feature_not_implemented_yet(readline bonjour libedit systemd llvm python tcl uuid) -endif() - ## Download and extract sources vcpkg_download_distfile(ARCHIVE URLS "https://ftp.postgresql.org/pub/source/v${PORT_VERSION}/postgresql-${PORT_VERSION}.tar.bz2" @@ -51,12 +21,6 @@ set(PATCHES patches/fix-configure.patch ) -if(VCPKG_TARGET_IS_MINGW) - list(APPEND PATCHES patches/mingw/link-with-crypt32.patch) -endif() -if(VCPKG_TARGET_IS_LINUX) - list(APPEND PATCHES patches/linux/configure.patch) -endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND PATCHES patches/windows/MSBuildProject-static-lib.patch) list(APPEND PATCHES patches/windows/Mkvcbuild-static-lib.patch) diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 210c6e1d74c7ad..3e2532f4b4c200 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", "version": "14.1", - "port-version": 1, + "port-version": 2, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", @@ -23,10 +23,12 @@ ], "features": { "bonjour": { - "description": "Build with Bonjour support (--with-bonjour)" + "description": "Build with Bonjour support (--with-bonjour)", + "supports": "osx" }, "client": { - "description": "Build all client tools and libraries (dynamic only?)" + "description": "Build all client tools and libraries (dynamic only?)", + "supports": "!(windows & !mingw & static)" }, "icu": { "description": "Build with support for the ICU library (--with-icu)", @@ -34,18 +36,6 @@ "icu" ] }, - "libedit": { - "description": "prefer libedit (--with-libedit-preferred)", - "dependencies": [ - "libedit" - ] - }, - "llvm": { - "description": "Build with support for LLVM based JIT compilation (--with-llvm)", - "dependencies": [ - "llvm" - ] - }, "lz4": { "description": "Use lz4 (else --without-lz4)", "dependencies": [ @@ -73,6 +63,7 @@ }, "python": { "description": "build the PL/Python server programming language (dynamic only?) (--with-python)", + "supports": "!(windows & (static | mingw))", "dependencies": [ { "name": "libpq", @@ -86,15 +77,14 @@ }, "readline": { "description": "Use readline (else --without-readline)", + "supports": "!windows, mingw", "dependencies": [ "readline" ] }, - "systemd": { - "description": "Build with support for systemd service notifications. (--with-systemd)" - }, "tcl": { "description": "build the PL/Tcl procedural language(dynamic only?) (--with-tcl)", + "supports": "!(windows & (static | mingw))", "dependencies": [ { "name": "libpq", @@ -106,9 +96,6 @@ "tcl" ] }, - "uuid": { - "description": "Build the uuid-ossp module (which provides functions to generate UUIDs) (--with-uuid=LIBRARY LIBRARY=(bsd|e2fs|ossp))" - }, "xml": { "description": "Build with libxml (--with-libxml)", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 66c0b04461e654..f77c6fe1748087 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -525,8 +525,6 @@ libpng-apng:x64-windows = skip libpng-apng:x64-windows-static = skip libpng-apng:x64-windows-static-md=skip libpng-apng:x86-windows = skip -libpq:arm-uwp=fail -libpq:x64-uwp=fail # The developer of libqcow does not offer stable release archives libqcow:arm-uwp=skip libqcow:x64-uwp=skip diff --git a/versions/baseline.json b/versions/baseline.json index d766b26946a5af..82baf583d7fb74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3910,7 +3910,7 @@ }, "libpq": { "baseline": "14.1", - "port-version": 1 + "port-version": 2 }, "libpqxx": { "baseline": "7.7.3", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index 2944d48a557760..13954499188274 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b437be1592b794cb09437beba153937991a189a", + "version": "14.1", + "port-version": 2 + }, { "git-tree": "0f614944d19861d7751cd9c880c6b61d87f36a3d", "version": "14.1", From 8f77dbb04f01053920d8c6b17f31337d0ebed1e4 Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Tue, 31 May 2022 22:47:45 +0200 Subject: [PATCH 356/383] [Vc] Update to 1.4.3 (#24880) Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/vc/Fix-internal-func-export.patch | 16 ++++++++++++++ ports/vc/dont-use-uninit-var.patch | 17 --------------- ports/vc/portfile.cmake | 29 +++++++++++++------------ ports/vc/vcpkg.json | 16 +++++++++++--- versions/baseline.json | 4 ++-- versions/v-/vc.json | 5 +++++ 6 files changed, 51 insertions(+), 36 deletions(-) create mode 100644 ports/vc/Fix-internal-func-export.patch delete mode 100644 ports/vc/dont-use-uninit-var.patch diff --git a/ports/vc/Fix-internal-func-export.patch b/ports/vc/Fix-internal-func-export.patch new file mode 100644 index 00000000000000..a06321649dd594 --- /dev/null +++ b/ports/vc/Fix-internal-func-export.patch @@ -0,0 +1,16 @@ +diff --git a/src/support_x86.cpp b/src/support_x86.cpp +index 0ab9669..d5c17ba 100644 +--- a/src/support_x86.cpp ++++ b/src/support_x86.cpp +@@ -58,8 +58,9 @@ static inline bool xgetbvCheck(unsigned int bits) + #endif + } + +-Vc_TARGET_NO_SIMD +-bool isImplementationSupported(Implementation impl) ++ ++Vc_TARGET_NO_SIMD ++bool Vc_VDECL isImplementationSupported(Vc::Implementation impl) + { + CpuId::init(); + diff --git a/ports/vc/dont-use-uninit-var.patch b/ports/vc/dont-use-uninit-var.patch deleted file mode 100644 index c974555bd3a05c..00000000000000 --- a/ports/vc/dont-use-uninit-var.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/Vc/avx/const.h -+++ b/Vc/avx/const.h -@@ -131,13 +131,13 @@ - #endif - } - template <> Vc_ALWAYS_INLINE Vc_CONST Vector Const::highMask(int bits) - { - #ifdef Vc_IMPL_AVX2 - #if defined Vc_ICC || defined Vc_MSVC -- __m256i allone; -+ auto allone = __m256i(); - allone = _mm256_cmpeq_epi8(allone, allone); - #else - auto allone = ~__m256i(); - #endif - return _mm256_castsi256_pd(_mm256_slli_epi64(allone, bits)); - #else diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake index 2c9150c6a7ebd2..d185dd587fecbd 100644 --- a/ports/vc/portfile.cmake +++ b/ports/vc/portfile.cmake @@ -1,24 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VcDevel/Vc - REF 1.4.2 - SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf + REF 1.4.3 + SHA512 7c0c4ccf8c7c4585334482135f2daf1a5bc088114b880093893583bdcea1fbfcec02485da6059304c510c8b1bb1b768ef04fd7ac8ccb21b9ebbad5d0d5babaef HEAD_REF 1.4 - PATCHES - correct_cmake_config_path.patch - dont-use-uninit-var.patch + PATCHES + correct_cmake_config_path.patch + Fix-internal-func-export.patch #remove it in next version ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Vc/) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Vc/") vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/vc/vcpkg.json b/ports/vc/vcpkg.json index 11bf991ca43717..09bb050102a37f 100644 --- a/ports/vc/vcpkg.json +++ b/ports/vc/vcpkg.json @@ -1,8 +1,18 @@ { "name": "vc", - "version": "1.4.2", - "port-version": 3, + "version": "1.4.3", "description": "SIMD Vector Classes for C++ .", "homepage": "https://github.com/VcDevel/Vc", - "supports": "!arm64" + "license": "BSD-3-Clause", + "supports": "!arm64", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 82baf583d7fb74..7327cec2fc7b77 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7329,8 +7329,8 @@ "port-version": 0 }, "vc": { - "baseline": "1.4.2", - "port-version": 3 + "baseline": "1.4.3", + "port-version": 0 }, "vcglib": { "baseline": "1.0.1", diff --git a/versions/v-/vc.json b/versions/v-/vc.json index 18be5f33328459..f1232fc14d8b6a 100644 --- a/versions/v-/vc.json +++ b/versions/v-/vc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "933ac99201b15104edd8037e8bcc7959d36a6d67", + "version": "1.4.3", + "port-version": 0 + }, { "git-tree": "98b96fa582424d700421161838544f1daf738467", "version": "1.4.2", From 9feca681ef1fa3154c565669c334da48dfb54e15 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 1 Jun 2022 00:12:09 +0200 Subject: [PATCH 357/383] [openmvs] no absolute paths (#24848) --- ports/openmvs/fix-build.patch | 17 ----------------- ports/openmvs/no-absolute-paths.patch | 24 ++++++++++++++++++++++++ ports/openmvs/portfile.cmake | 1 + ports/openmvs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openmvs.json | 5 +++++ 6 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 ports/openmvs/no-absolute-paths.patch diff --git a/ports/openmvs/fix-build.patch b/ports/openmvs/fix-build.patch index 48f62ae0a9d0ea..f40ec26f484cdf 100644 --- a/ports/openmvs/fix-build.patch +++ b/ports/openmvs/fix-build.patch @@ -107,23 +107,6 @@ rename to MvgMvsPipeline.py.in index f4914bf..23d03e6 100644 --- a/MvgMvsPipeline.py +++ b/MvgMvsPipeline.py.in -@@ -91,12 +91,12 @@ def find(afile): - - - # Try to find openMVG and openMVS binaries in PATH --OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing") --OPENMVS_BIN = whereis("ReconstructMesh") -+OPENMVG_BIN = "@OPENMVG_TOOLS_PATH@" -+OPENMVS_BIN = "@OPENMVS_TOOLS_PATH@" - - # Try to find openMVG camera sensor database --CAMERA_SENSOR_DB_FILE = "sensor_width_camera_database.txt" --CAMERA_SENSOR_DB_DIRECTORY = find(CAMERA_SENSOR_DB_FILE) -+CAMERA_SENSOR_DB_FILE = "@SENSOR_WIDTH_CAMERA_DATABASE_TXT_PATH@" -+CAMERA_SENSOR_DB_DIRECTORY = "@OPENMVG_TOOLS_PATH@" - - # Ask user for openMVG and openMVS directories if not found - if not OPENMVG_BIN: @@ -175,10 +175,10 @@ class StepsStore: ["-i", "%input_dir%", "-o", "%matches_dir%", "-d", "%camera_file_params%"]], ["Compute features", # 1 diff --git a/ports/openmvs/no-absolute-paths.patch b/ports/openmvs/no-absolute-paths.patch new file mode 100644 index 00000000000000..0eda5377080913 --- /dev/null +++ b/ports/openmvs/no-absolute-paths.patch @@ -0,0 +1,24 @@ +diff --git a/MvgMvsPipeline.py.in b/MvgMvsPipeline.py.in +index 04433f4..e1beaf6 100644 +--- a/MvgMvsPipeline.py.in ++++ b/MvgMvsPipeline.py.in +@@ -95,14 +95,14 @@ def find(afile): + return d + return None + +- ++current_dir = os.path.dirname(os.path.abspath(__file__)) + # Try to find openMVG and openMVS binaries in PATH +-OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing") +-OPENMVS_BIN = whereis("ReconstructMesh") ++OPENMVG_BIN = os.path.join(current_dir, '..', 'openmvg') ++OPENMVS_BIN = current_dir + + # Try to find openMVG camera sensor database +-CAMERA_SENSOR_DB_FILE = "sensor_width_camera_database.txt" +-CAMERA_SENSOR_DB_DIRECTORY = find(CAMERA_SENSOR_DB_FILE) ++CAMERA_SENSOR_DB_FILE = os.path.join(OPENMVG_BIN, 'sensor_width_camera_database.txt') ++CAMERA_SENSOR_DB_DIRECTORY = OPENMVS_BIN + + # Ask user for openMVG and openMVS directories if not found + if not OPENMVG_BIN: diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index f7232ee1be38ed..ac412106258f83 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES fix-build.patch fix-build-boost-1_77_0.patch + no-absolute-paths.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json index 14a8c3e63ed3ef..1f1fc66a103914 100644 --- a/ports/openmvs/vcpkg.json +++ b/ports/openmvs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvs", "version": "1.1.1", - "port-version": 2, + "port-version": 3, "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7327cec2fc7b77..0c0da027fffe99 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5174,7 +5174,7 @@ }, "openmvs": { "baseline": "1.1.1", - "port-version": 2 + "port-version": 3 }, "openni2": { "baseline": "2.2.0.33", diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index 228825212966c4..883764f1397804 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6123f8755c140325b2800c51c6c68e3fb51c668", + "version": "1.1.1", + "port-version": 3 + }, { "git-tree": "a66ad18d59e5ffdd21f5bc1cae0b195ba35aba18", "version": "1.1.1", From 0e68bd8d020671dacf9665f152485336d3759a05 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 1 Jun 2022 00:12:22 +0200 Subject: [PATCH 358/383] [openmvg] no absolute paths (#24850) --- ports/openmvg/build_fixes.patch | 39 ---------------- ports/openmvg/no-absolute-paths.patch | 66 +++++++++++++++++++++++++++ ports/openmvg/portfile.cmake | 1 + ports/openmvg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openmvg.json | 5 ++ 6 files changed, 74 insertions(+), 41 deletions(-) create mode 100644 ports/openmvg/no-absolute-paths.patch diff --git a/ports/openmvg/build_fixes.patch b/ports/openmvg/build_fixes.patch index 8f61668bec214d..c343368b115c89 100644 --- a/ports/openmvg/build_fixes.patch +++ b/ports/openmvg/build_fixes.patch @@ -617,45 +617,6 @@ index 6db7e83..51e06f5 100644 ${OpenCV_LIBS}) target_include_directories(openMVG_main_ComputeFeatures_OpenCV PRIVATE ${OpenCV_INCLUDE_DIRS}) -diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in -index 42b41cc..7fda0cd 100644 ---- a/src/software/SfM/SfM_GlobalPipeline.py.in -+++ b/src/software/SfM/SfM_GlobalPipeline.py.in -@@ -21,7 +21,7 @@ - OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" - - # Indicate the openMVG camera sensor width directory --CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" -+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@" - - import os - import subprocess -diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in -index 423c85c..0ff2e77 100644 ---- a/src/software/SfM/SfM_SequentialPipeline.py.in -+++ b/src/software/SfM/SfM_SequentialPipeline.py.in -@@ -21,7 +21,7 @@ - OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" - - # Indicate the openMVG camera sensor width directory --CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" -+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@" - - import os - import subprocess -diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in -index c7361f3..1c56aab 100644 ---- a/src/software/SfM/tutorial_demo.py.in -+++ b/src/software/SfM/tutorial_demo.py.in -@@ -12,7 +12,7 @@ - OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" - - # Indicate the openMVG camera sensor width directory --CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" -+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@" - - import os - import subprocess diff --git a/src/software/VO/Tracker_opencv_klt.hpp b/src/software/VO/Tracker_opencv_klt.hpp index aa7dffe..2c4d237 100644 --- a/src/software/VO/Tracker_opencv_klt.hpp diff --git a/ports/openmvg/no-absolute-paths.patch b/ports/openmvg/no-absolute-paths.patch new file mode 100644 index 00000000000000..45d00aec4b63b6 --- /dev/null +++ b/ports/openmvg/no-absolute-paths.patch @@ -0,0 +1,66 @@ +diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in +index 7fda0cd..c6f0bdb 100644 +--- a/src/software/SfM/SfM_GlobalPipeline.py.in ++++ b/src/software/SfM/SfM_GlobalPipeline.py.in +@@ -16,14 +16,13 @@ + # + # if output_dir is not present script will create it + # +- ++import os + # Indicate the openMVG binary directory +-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" ++OPENMVG_SFM_BIN = os.path.dirname(__file__) + + # Indicate the openMVG camera sensor width directory +-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" ++CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__) + +-import os + import subprocess + import sys + +diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in +index 0ff2e77..98d3eb2 100644 +--- a/src/software/SfM/SfM_SequentialPipeline.py.in ++++ b/src/software/SfM/SfM_SequentialPipeline.py.in +@@ -16,14 +16,13 @@ + # + # if output_dir is not present script will create it + # +- ++import os + # Indicate the openMVG binary directory +-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" ++OPENMVG_SFM_BIN = os.path.dirname(__file__) + + # Indicate the openMVG camera sensor width directory +-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" ++CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__) + +-import os + import subprocess + import sys + +diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in +index 1c56aab..3fb31c4 100644 +--- a/src/software/SfM/tutorial_demo.py.in ++++ b/src/software/SfM/tutorial_demo.py.in +@@ -8,13 +8,14 @@ + # usage : python tutorial_demo.py + # + ++import os ++ + # Indicate the openMVG binary directory +-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" ++OPENMVG_SFM_BIN = os.path.dirname(__file__) + + # Indicate the openMVG camera sensor width directory +-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" ++CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__) + +-import os + import subprocess + import sys + diff --git a/ports/openmvg/portfile.cmake b/ports/openmvg/portfile.cmake index a5de94bff5921e..32c8c91968187c 100644 --- a/ports/openmvg/portfile.cmake +++ b/ports/openmvg/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( build_fixes.patch 0001-eigen_3.4.0.patch 0002-eigen-3.4.patch + no-absolute-paths.patch ) set(OpenMVG_USE_OPENMP OFF) diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json index 80a83a7d3c7ace..ea557428637b7a 100644 --- a/ports/openmvg/vcpkg.json +++ b/ports/openmvg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvg", "version": "2.0", - "port-version": 3, + "port-version": 4, "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", "license": "MPL-2.0-no-copyleft-exception", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0c0da027fffe99..aa1c5768e77a6b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5170,7 +5170,7 @@ }, "openmvg": { "baseline": "2.0", - "port-version": 3 + "port-version": 4 }, "openmvs": { "baseline": "1.1.1", diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index beea957cac0ac6..5c59d2175b2a08 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a97e175386e994ff24a45911a373450d17fe516", + "version": "2.0", + "port-version": 4 + }, { "git-tree": "f32be4f15d0babca5ba5a6e02b78f4610ab6d2f4", "version": "2.0", From 53842d61c9f74e8e88549c0110443db6b8a00a8e Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Tue, 31 May 2022 23:13:56 +0100 Subject: [PATCH 359/383] [tiff] 4.4.0 (#24986) --- ports/tiff/cmakelists.patch | 22 +++---- ports/tiff/fix-pkgconfig.patch | 104 --------------------------------- ports/tiff/portfile.cmake | 70 ++-------------------- ports/tiff/vcpkg.json | 7 ++- versions/baseline.json | 4 +- versions/t-/tiff.json | 5 ++ 6 files changed, 27 insertions(+), 185 deletions(-) delete mode 100644 ports/tiff/fix-pkgconfig.patch diff --git a/ports/tiff/cmakelists.patch b/ports/tiff/cmakelists.patch index 67c953714ae6f2..0e244a09b6f3a5 100644 --- a/ports/tiff/cmakelists.patch +++ b/ports/tiff/cmakelists.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dddbaf6..ee57b7b 100644 +index 770b0fac..df44e99e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -133,16 +133,28 @@ find_package(CMath REQUIRED) +@@ -131,16 +131,28 @@ find_package(CMath REQUIRED) # Release support include(Release) @@ -29,30 +29,30 @@ index dddbaf6..ee57b7b 100644 add_subdirectory(html) +endif() - - message(STATUS "") + # pkg-config support + include(PkgConfig) diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt -index 90105b2..db5f140 100755 +index b6b31677..5c21e29f 100755 --- a/libtiff/CMakeLists.txt +++ b/libtiff/CMakeLists.txt -@@ -161,7 +161,7 @@ if(CXX_SUPPORT) +@@ -189,7 +189,7 @@ if(CXX_SUPPORT) set(tiffxx_HEADERS tiffio.hxx) -- add_library(tiffxx) -+ add_library(tiffxx STATIC) +- add_library(tiffxx ../placeholder.h) ++ add_library(tiffxx STATIC ../placeholder.h) target_sources(tiffxx PRIVATE ${tiffxx_HEADERS} tif_stream.cxx) -@@ -189,6 +189,7 @@ if(CXX_SUPPORT) +@@ -217,6 +217,7 @@ if(CXX_SUPPORT) endif() +if(NOT CMAKE_CROSSCOMPILING) - add_executable(mkg3states) + add_executable(mkg3states ../placeholder.h) target_sources(mkg3states PRIVATE mkg3states.c tif_fax3.h) target_link_libraries(mkg3states tiff port) -@@ -198,3 +199,4 @@ add_custom_target(faxtable +@@ -226,3 +227,4 @@ add_custom_target(faxtable COMMAND ${CMAKE_COMMAND} -E rm "tif_fax3sm.c" COMMAND mkg3states -b -c const "tif_fax3sm.c" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/ports/tiff/fix-pkgconfig.patch b/ports/tiff/fix-pkgconfig.patch deleted file mode 100644 index f5bcdec3e492a8..00000000000000 --- a/ports/tiff/fix-pkgconfig.patch +++ /dev/null @@ -1,104 +0,0 @@ -From f337e19d0d0564b1b000ecd5dfbefed6c37f4d5b Mon Sep 17 00:00:00 2001 -From: Matthias Kuhn -Date: Tue, 21 Dec 2021 07:57:09 +0000 -Subject: [PATCH] Fix pkgconfig - ---- - CMakeLists.txt | 4 ++-- - libtiff-4.pc.in | 3 ++- - libtiff/CMakeLists.txt | 19 +++++++++++++++++++ - 3 files changed, 23 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2188f97..93e6a34 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -124,8 +124,6 @@ include(WindowsSupport) - # Orthogonal features - include(LibraryFeatures) - --# pkg-config support --include(PkgConfig) - - # math.h/libm portability - find_package(CMath REQUIRED) -@@ -156,6 +154,8 @@ add_subdirectory(man) - add_subdirectory(html) - endif() - -+# pkg-config support -+include(PkgConfig) - - message(STATUS "") - message(STATUS "Libtiff is now configured for ${CMAKE_SYSTEM}") -diff --git a/libtiff-4.pc.in b/libtiff-4.pc.in -index abe75a6..8899725 100644 ---- a/libtiff-4.pc.in -+++ b/libtiff-4.pc.in -@@ -5,7 +5,8 @@ includedir=@includedir@ - - Name: libtiff - Description: Tag Image File Format (TIFF) library. --Version: @VERSION@ -+Version: @LIBTIFF_VERSION_FULL@ - Libs: -L${libdir} -ltiff - Libs.private: @tiff_libs_private@ - Cflags: -I${includedir} -+Requires.private: @tiff_requires_private@ -diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt -index db5f140..32721ec 100755 ---- a/libtiff/CMakeLists.txt -+++ b/libtiff/CMakeLists.txt -@@ -106,14 +106,19 @@ target_include_directories(tiff - ${TIFF_INCLUDES} - ) - -+set(tiff_libs_private "") -+set(tiff_requires_private "") -+ - if(ZIP_SUPPORT) - target_link_libraries(tiff PRIVATE ZLIB::ZLIB) -+ string(APPEND tiff_requires_private " zlib") - endif() - if(ZIP_SUPPORT AND LIBDEFLATE_SUPPORT) - target_link_libraries(tiff PRIVATE Deflate::Deflate) - endif() - if(JPEG_SUPPORT) - target_link_libraries(tiff PRIVATE JPEG::JPEG) -+ string(APPEND tiff_requires_private " libjpeg") - if(JPEG_DUAL_MODE_8_12) - target_include_directories(tiff PRIVATE ${JPEG12_INCLUDE_DIR}) - target_link_libraries(tiff PRIVATE ${JPEG12_LIBRARIES}) -@@ -127,15 +132,29 @@ if(LERC_SUPPORT) - endif() - if(LZMA_SUPPORT) - target_link_libraries(tiff PRIVATE LibLZMA::LibLZMA) -+ string(APPEND tiff_requires_private " liblzma") - endif() - if(ZSTD_SUPPORT) - target_link_libraries(tiff PRIVATE ZSTD::ZSTD) -+ string(APPEND tiff_requires_private " libzstd") - endif() - if(WEBP_SUPPORT) - target_link_libraries(tiff PRIVATE WebP::WebP) -+ string(APPEND tiff_requires_private " libwebp") - endif() - target_link_libraries(tiff PRIVATE CMath::CMath) - -+include(CheckLibraryExists) -+ -+CHECK_LIBRARY_EXISTS(m sin "" HAVE_LIB_M) -+ -+if (HAVE_LIB_M) -+ string(APPEND tiff_libs_private " -lm") -+endif() -+ -+set(tiff_libs_private "${tiff_libs_private}" PARENT_SCOPE) -+set(tiff_requires_private "${tiff_requires_private}" PARENT_SCOPE) -+ - set_target_properties(tiff PROPERTIES SOVERSION ${SO_COMPATVERSION}) - if(NOT CYGWIN) - # This property causes shared libraries on Linux to have the full version --- -2.25.1 - diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 3c695f9b2aa0dc..be76cb405a6150 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -1,78 +1,14 @@ -set(LIBTIFF_VERSION 4.3.0) - -vcpkg_download_distfile(CVE_2022_0561_diff - URLS https://gitlab.com/libtiff/libtiff/-/commit/eecb0712f4c3a5b449f70c57988260a667ddbdef.diff - FILENAME libtiff-CVE-2022-0561.diff - SHA512 48df4e93202723778fdb6b87bcb7e2e4118546c6deb47e9999b8818e69420ad52a4a7823c68ab74d30657adb2278641971e43db771a1796fda95d2433ad991a0 -) - -vcpkg_download_distfile(CVE_2022_0562_diff - URLS https://gitlab.com/libtiff/libtiff/-/commit/561599c99f987dc32ae110370cfdd7df7975586b.diff - FILENAME libtiff-CVE-2022-0562.diff - SHA512 4346098e7a2433cf15d02a7baa3d1fa4b648f58845200264ecc0a230035f15da4cf1427c4a4ff73797bc01f105bd9ff705371c2f3867be4f9103b07d4d0edea8 -) - -vcpkg_download_distfile(CVE_2022_0865_diff - URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/306.diff - FILENAME libtiff-CVE-2022-0865.diff - SHA512 f22e0cee03716e6c6f130606c74acc7033dd61e20276e38e89a0ba485857d05a7bc22e445c52010797b7020febc30d3aca854d8a0c4ed0e2453201de550b4058 -) - -vcpkg_download_distfile(CVE_2022_0891_diff - URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/307.diff - FILENAME libtiff-CVE-2022-0891.diff - SHA512 6a88a0423057da11121d5297e2f425199341cbc6b299a0f77dd57baddf3f6a022a6dfe1fb97caabfd6e95a40b6c95a0e6b9a80e199054c271ccb257e23671fcf -) - -vcpkg_download_distfile(CVE_2022_0907_diff - URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/314.diff - FILENAME libtiff-CVE-2022-0907.diff - SHA512 72455bb9698e8670b7ffcc1e6c644b9fd4d3aab46ca5940dc8130c796435a838f05555bf85293770c77b73690b137cd6931d59d61d649482b42b7b98afe88f3a -) - -vcpkg_download_distfile(CVE_2022_0908_diff - URLS https://gitlab.com/libtiff/libtiff/-/commit/a95b799f65064e4ba2e2dfc206808f86faf93e85.diff - FILENAME libtiff-CVE-2022-0908.diff - SHA512 1f6bb30c00d671665870aea46898390c1545d00d80e17db07b5136f6bfb85fff8d95c2c63493066b9257d871858935497062d992cf978ca5037d8b079bfdeab1 -) - -vcpkg_download_distfile(CVE_2022_0909_diff - URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/310.diff - FILENAME libtiff-CVE-2022-0909.diff - SHA512 d675ac09a40136bdc808ae75030f199ebcbaf38b2e904b3b26b21d18e39fe89a1c703d5ee6156b337ec9dde29ad311cb6551de984aa87d796c9af0a26d758af3 -) - -vcpkg_download_distfile(CVE_2022_0924_diff - URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/311.diff - FILENAME libtiff-CVE-2022-0924.diff - SHA512 dcd22b4ef121128aabc8b2aadf4eac16597ee8b211bb06467c93bbccafe47a45917f07a6f4264d43f4c1596eb54d7d0a073987e6899a9f8d057632244cf75c67 -) - -vcpkg_download_distfile(CVE_2022_22844_diff - URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/287.diff - FILENAME libtiff-CVE-2022-22844.diff - SHA512 2a3bb8ae9191794bff52a4b776a35b244a24e3b2ca963ccfd40166566fae18a2333d7db6c2e2cf17daa9fe61eaca3bd8c36d9807fd1aa0491a041ec22d65c70e -) +set(LIBTIFF_VERSION 4.4.0) vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libtiff/libtiff REF v${LIBTIFF_VERSION} - SHA512 eaa2503dc1805283e0590b06e3e660a793fe849ae8b975b2d69369695d65a40640787c156574faaca856917be799eeb844e60f55555e1f219dd513cef66ea95d + SHA512 93955a2b802cf243e41d49048499da73862b5d3ffc005e3eddf0bf948a8bd1537f7c9e7f112e72d082549b4c49e256b9da9a3b6d8039ad8fc5c09a941b7e75d7 HEAD_REF master PATCHES cmakelists.patch - fix-pkgconfig.patch FindCMath.patch - ${CVE_2022_0561_diff} - ${CVE_2022_0562_diff} - ${CVE_2022_0865_diff} - ${CVE_2022_0891_diff} - ${CVE_2022_0907_diff} - ${CVE_2022_0908_diff} - ${CVE_2022_0909_diff} - ${CVE_2022_0924_diff} - ${CVE_2022_22844_diff} ) set(EXTRA_OPTIONS "") @@ -111,6 +47,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") if(EXISTS "${_file}") vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd") diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 498810b8c82836..29181215e417e1 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tiff", - "version": "4.3.0", - "port-version": 8, + "version": "4.4.0", "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": null, @@ -9,6 +8,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index aa1c5768e77a6b..4c906ffb0d6c5e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6977,8 +6977,8 @@ "port-version": 5 }, "tiff": { - "baseline": "4.3.0", - "port-version": 8 + "baseline": "4.4.0", + "port-version": 0 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 1aa82bc5c0070c..ec7d1f5dc74ddf 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18c67848b7384af1ff6ad1c4e92b013376b136b6", + "version": "4.4.0", + "port-version": 0 + }, { "git-tree": "e2cafe3465d7c00233114c75abd86ed11538c186", "version": "4.3.0", From 018b48e7775487ba93b54e445b1af856ba3e47ef Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 1 Jun 2022 06:14:16 +0800 Subject: [PATCH 360/383] [yyjson] Update to 0.5.0 (#24979) * [yyjson] Update to 0.5.0 * [yyjson] Bump version --- ports/yyjson/portfile.cmake | 4 ++-- ports/yyjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/y-/yyjson.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/yyjson/portfile.cmake b/ports/yyjson/portfile.cmake index f2ffc85a1b248c..e1e4833bba2359 100644 --- a/ports/yyjson/portfile.cmake +++ b/ports/yyjson/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ibireme/yyjson - REF 0.4.0 - SHA512 0d5824158f7491926e6d2a1fd1a1e637fdb2ce5a6bd1ec88301231dd567345295751c1e8f12f8a1ffc7179970081cf50b97301691a47ae5d418331f0d41479ce + REF 0.5.0 + SHA512 6b2e051f7d5829acb9ca25ce97e4872f5517b3f291a30c6a86ec40f71670b8114f43c2d272410834a5c92b5203726b65696f06423bc6e5001dff2aabf5eb20d9 HEAD_REF master ) diff --git a/ports/yyjson/vcpkg.json b/ports/yyjson/vcpkg.json index 021e711ace1126..5492a2db73fbe1 100644 --- a/ports/yyjson/vcpkg.json +++ b/ports/yyjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yyjson", - "version": "0.4.0", + "version": "0.5.0", "description": "A high performance JSON library written in ANSI C", "homepage": "https://github.com/ibireme/yyjson", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4c906ffb0d6c5e..8d235d79de05b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7713,7 +7713,7 @@ "port-version": 0 }, "yyjson": { - "baseline": "0.4.0", + "baseline": "0.5.0", "port-version": 0 }, "z3": { diff --git a/versions/y-/yyjson.json b/versions/y-/yyjson.json index d244ce01444522..73ac88b717cd84 100644 --- a/versions/y-/yyjson.json +++ b/versions/y-/yyjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "228eaef5ad7cddcc8e76dc73b2741f75cc18912a", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "2d4f6a2936ab89c986bb1c3cafd5e3ca796ce7fa", "version": "0.4.0", From 2d2f0230e7e911cb53a87c4c9b704808d5f314e5 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 1 Jun 2022 06:35:57 +0800 Subject: [PATCH 361/383] [flecs] Add new port (#24980) * [flecs] Add new port Fix #10774. * [flecs] Add version stuffs * [flecs] Disable UWP support GetModuleHandle doesn't support UWP. * [flecs] Overwrite version * [flecs] Add vcpkg-cmake-wrapper.cmake * [flecs] Overwrite version --- ports/flecs/portfile.cmake | 37 +++++++++++++++++++++++++++ ports/flecs/vcpkg-cmake-wrapper.cmake | 9 +++++++ ports/flecs/vcpkg.json | 18 +++++++++++++ versions/baseline.json | 4 +++ versions/f-/flecs.json | 9 +++++++ 5 files changed, 77 insertions(+) create mode 100644 ports/flecs/portfile.cmake create mode 100644 ports/flecs/vcpkg-cmake-wrapper.cmake create mode 100644 ports/flecs/vcpkg.json create mode 100644 versions/f-/flecs.json diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake new file mode 100644 index 00000000000000..334b359d876a79 --- /dev/null +++ b/ports/flecs/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SanderMertens/flecs + REF v2.4.8 + SHA512 4d4ee41a457f6e13b5913bbc12f66dc9a3bcab3f39ad398da55892bb80649cf416d82255f17bbcef4fee11992028cbb2972d0e9e435435cb58a7b33ec2ebe526 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLECS_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLECS_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFLECS_STATIC_LIBS=${FLECS_STATIC_LIBS} + -DFLECS_SHARED_LIBS=${FLECS_SHARED_LIBS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(FLECS_STATIC_LIBS) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/${PORT}/bake_config.h" + "#ifndef flecs_STATIC" + "#if 0 // #ifndef flecs_STATIC" + ) +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/flecs/vcpkg-cmake-wrapper.cmake b/ports/flecs/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..194a66af4c342e --- /dev/null +++ b/ports/flecs/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET flecs::flecs AND NOT TARGET flecs::flecs_static) + add_library(flecs::flecs_static INTERFACE IMPORTED) + set_target_properties(flecs::flecs_static PROPERTIES INTERFACE_LINK_LIBRARIES flecs::flecs) +elseif(TARGET flecs::flecs_static AND NOT TARGET flecs::flecs) + add_library(flecs::flecs INTERFACE IMPORTED) + set_target_properties(flecs::flecs PROPERTIES INTERFACE_LINK_LIBRARIES flecs::flecs_static) +endif() diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json new file mode 100644 index 00000000000000..1a4caa15038a20 --- /dev/null +++ b/ports/flecs/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "flecs", + "version": "2.4.8", + "description": "A fast entity component system (ECS) for C & C++", + "homepage": "https://github.com/SanderMertens/flecs", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8d235d79de05b3..52f9de24c6fc0e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2252,6 +2252,10 @@ "baseline": "2.0.6", "port-version": 0 }, + "flecs": { + "baseline": "2.4.8", + "port-version": 0 + }, "flint": { "baseline": "2.8.0", "port-version": 1 diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json new file mode 100644 index 00000000000000..11314d32aa0389 --- /dev/null +++ b/versions/f-/flecs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c39673b97267a414e46e47f526b48ca9c6b3b246", + "version": "2.4.8", + "port-version": 0 + } + ] +} From c34f577c4db7f9d309ef59f61fbec0fb77fe4f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 31 May 2022 22:37:43 +0000 Subject: [PATCH 362/383] [rtmidi] Fix cmake usage (#24994) * [rtmidi] Fix cmake usage * version * change to version * version --- ports/rtmidi/fix-cmake-usage.patch | 32 ++++++++++++++++++++++++++++++ ports/rtmidi/portfile.cmake | 1 + ports/rtmidi/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/r-/rtmidi.json | 5 +++++ 5 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 ports/rtmidi/fix-cmake-usage.patch diff --git a/ports/rtmidi/fix-cmake-usage.patch b/ports/rtmidi/fix-cmake-usage.patch new file mode 100644 index 00000000000000..8e6c6efee876c6 --- /dev/null +++ b/ports/rtmidi/fix-cmake-usage.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 616fdaf..e6af930 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,7 +280,7 @@ include(CMakePackageConfigHelpers) + + # Write cmake package version file + write_basic_package_version_file( +- RtMidi-config-version.cmake ++ rtmidi-config-version.cmake + VERSION ${FULL_VER} + COMPATIBILITY SameMajorVersion + ) +@@ -288,15 +288,15 @@ write_basic_package_version_file( + # Write cmake package config file + configure_package_config_file ( + cmake/RtMidi-config.cmake.in +- RtMidi-config.cmake ++ rtmidi-config.cmake + INSTALL_DESTINATION "${RTMIDI_CMAKE_DESTINATION}" + ) + + # Install package files + install ( + FILES +- "${CMAKE_CURRENT_BINARY_DIR}/RtMidi-config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/RtMidi-config-version.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/rtmidi-config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/rtmidi-config-version.cmake" + DESTINATION + "${RTMIDI_CMAKE_DESTINATION}" + ) diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake index 4ba83e243e500f..d14dec4ea6b3f3 100644 --- a/ports/rtmidi/portfile.cmake +++ b/ports/rtmidi/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( REF 84a99422a3faf1ab417fe71c0903a48debb9376a # 5.0.0 SHA512 388e280b7966281e22b0048d6fb2541921df1113d84e49bbc444fff591d2025588edd8d61dbe5ff017afd76c26fd05edc8f9f15d0cce16315ccc15e6aac1d57f HEAD_REF master + PATCHES fix-cmake-usage.patch # Remove this patch in the next update ) vcpkg_cmake_configure( diff --git a/ports/rtmidi/vcpkg.json b/ports/rtmidi/vcpkg.json index 161861d885d4d8..bb43d6611a841c 100644 --- a/ports/rtmidi/vcpkg.json +++ b/ports/rtmidi/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rtmidi", - "version-semver": "5.0.0", + "version": "5.0.0", + "port-version": 1, "description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)", "homepage": "https://github.com/thestk/rtmidi", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 52f9de24c6fc0e..9b3427b97d322d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6298,7 +6298,7 @@ }, "rtmidi": { "baseline": "5.0.0", - "port-version": 0 + "port-version": 1 }, "rttr": { "baseline": "0.9.6", diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json index 50eca9aba0a0f9..667c5a16432698 100644 --- a/versions/r-/rtmidi.json +++ b/versions/r-/rtmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30614a92baff91c2d2790029179dbb37122ca331", + "version": "5.0.0", + "port-version": 1 + }, { "git-tree": "4eb19141251ff7759838e0ab10f35876583d367b", "version-semver": "5.0.0", From 49cfe5e329b72e5c8e5e5a1018a752ae72db9096 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 1 Jun 2022 07:00:00 +0800 Subject: [PATCH 363/383] [imgui] Add supports for features dx*-binding and metal-binding and osx-binding (#24999) * [imgui] Add supports for features dx-binding and metal-binding and metal-binding * x-add-version Co-authored-by: Lily Wang --- ports/imgui/portfile.cmake | 4 ---- ports/imgui/vcpkg.json | 19 +++++++++++++------ versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index c342a637a0a4a7..196b93ad224b7c 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -21,10 +21,6 @@ endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/imgui-config.cmake.in" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -if(("metal-binding" IN_LIST FEATURES OR "osx-binding" IN_LIST FEATURES) AND (NOT VCPKG_TARGET_IS_OSX)) - message(FATAL_ERROR "Feature metal-binding and osx-binding are only supported on osx.") -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES allegro5-binding IMGUI_BUILD_ALLEGRO5_BINDING diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index b5b624befb64da..ba26c5e12c3ba1 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", "version": "1.87", + "port-version": 1, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", @@ -25,16 +26,20 @@ "description": "Build with docking support" }, "dx10-binding": { - "description": "Make available DirectX10 binding" + "description": "Make available DirectX10 binding", + "supports": "windows & !uwp" }, "dx11-binding": { - "description": "Make available DirectX11 binding" + "description": "Make available DirectX11 binding", + "supports": "windows & !uwp" }, "dx12-binding": { - "description": "Make available DirectX12 binding" + "description": "Make available DirectX12 binding", + "supports": "!x86 & windows & !uwp" }, "dx9-binding": { - "description": "Make available DirectX9 binding" + "description": "Make available DirectX9 binding", + "supports": "windows & !uwp" }, "freetype": { "description": "Build font atlases using FreeType instead of stb_truetype", @@ -58,7 +63,8 @@ "description": "Install the libigl-imgui headers" }, "metal-binding": { - "description": "Make available Metal binding" + "description": "Make available Metal binding", + "supports": "osx" }, "opengl2-binding": { "description": "Make available OpenGL (legacy) binding" @@ -67,7 +73,8 @@ "description": "Make available OpenGL3/ES/ES2 (modern) binding" }, "osx-binding": { - "description": "Make available OSX binding" + "description": "Make available OSX binding", + "supports": "osx" }, "sdl2-binding": { "description": "Make available SDL2 binding", diff --git a/versions/baseline.json b/versions/baseline.json index 9b3427b97d322d..7ea605530167c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2934,7 +2934,7 @@ }, "imgui": { "baseline": "1.87", - "port-version": 0 + "port-version": 1 }, "imgui-sfml": { "baseline": "2.5", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 0804d5120f2a80..e6a742cdd4311e 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "647accc743e0af0547fbf8671c170038e202fd1e", + "version": "1.87", + "port-version": 1 + }, { "git-tree": "b9a40068f3905099cc5cb247f1b488d0e27dfd7f", "version": "1.87", From f14179a5d2b367c1a0f5f1a342aa71ca1709a88d Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 1 Jun 2022 07:16:07 +0800 Subject: [PATCH 364/383] [openvpn3] Export cmake target (#24955) * Add Config.cmake.in * export cmake targets * update namespace --- ports/openvpn3/CMakeLists.txt | 8 ++++++++ ports/openvpn3/portfile.cmake | 3 +++ ports/openvpn3/vcpkg.json | 5 +++++ versions/baseline.json | 2 +- versions/o-/openvpn3.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ports/openvpn3/CMakeLists.txt b/ports/openvpn3/CMakeLists.txt index 58514cbb08402e..b4943038c141bd 100644 --- a/ports/openvpn3/CMakeLists.txt +++ b/ports/openvpn3/CMakeLists.txt @@ -20,13 +20,21 @@ endif() add_library(ovpncli client/ovpncli.cpp) target_link_libraries(ovpncli PRIVATE Iphlpapi.lib Wininet.lib Setupapi.lib Cfgmgr32.lib Rpcrt4.lib Fwpuclnt.lib Wtsapi32.lib ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB}) +target_include_directories(ovpncli PUBLIC $ $) + install( TARGETS ovpncli + EXPORT unofficial-openvpnConfig RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) +INSTALL(EXPORT unofficial-openvpnConfig + NAMESPACE unofficial::openvpn3:: + DESTINATION share/unofficial-openvpn +) + if(BUILD_TOOL) add_executable(cli test/ovpncli/cli.cpp) target_compile_definitions(cli PRIVATE -DTAP_WIN_COMPONENT_ID=tap0901) diff --git a/ports/openvpn3/portfile.cmake b/ports/openvpn3/portfile.cmake index 3580f8d875e44b..69fd68ee5ef149 100644 --- a/ports/openvpn3/portfile.cmake +++ b/ports/openvpn3/portfile.cmake @@ -29,6 +29,9 @@ foreach(HEADER IN LISTS HEADERS) file(WRITE "${HEADER}" "${_contents}") endforeach() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-openvpn CONFIG_PATH share/unofficial-openvpn) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYRIGHT.AGPLV3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openvpn3/vcpkg.json b/ports/openvpn3/vcpkg.json index f515b53513ea94..cac8788966ff94 100644 --- a/ports/openvpn3/vcpkg.json +++ b/ports/openvpn3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openvpn3", "version": "3.7.0", + "port-version": 1, "description": "a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.", "homepage": "https://openvpn.net", "license": "AGPL-3.0", @@ -14,6 +15,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 7ea605530167c1..afc0c472231a58 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5222,7 +5222,7 @@ }, "openvpn3": { "baseline": "3.7.0", - "port-version": 0 + "port-version": 1 }, "openvr": { "baseline": "1.16.8", diff --git a/versions/o-/openvpn3.json b/versions/o-/openvpn3.json index 4961868eef3fda..7f9fd3361d4312 100644 --- a/versions/o-/openvpn3.json +++ b/versions/o-/openvpn3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "352f972ff2ff0cfb7305f779253f322ba72e14f5", + "version": "3.7.0", + "port-version": 1 + }, { "git-tree": "901a710e937496a572cdb5b64d2401c18919ffde", "version": "3.7.0", From 145848fb45cd7a6ff19e2b638c47baf302c11dd2 Mon Sep 17 00:00:00 2001 From: Fei Chong Date: Wed, 1 Jun 2022 07:17:00 +0800 Subject: [PATCH 365/383] [qt5-webengine]: fix typo (#25012) --- ports/qt5-webengine/portfile.cmake | 4 ++-- ports/qt5-webengine/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qt5-webengine.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index cab44c7e6bcd95..842b7ae46663c3 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -8,7 +8,7 @@ endif() #set(VCPKG_BUILD_TYPE release) #You probably want to set this to reduce build type and space requirements message(STATUS "${PORT} requires a lot of free disk space (>100GB), ram (>8 GB) and time (>2h per configuration) to be successfully build.\n\ -- As such ${PORT} is currently experimental.\n\ --- If ${PORT} fails post build validation please try manually reducing VCPKG_MAX_CONCURRENY and open up an issue if it still cannot build. \n\ +-- If ${PORT} fails post build validation please try manually reducing VCPKG_MAX_CONCURRENCY and open up an issue if it still cannot build. \n\ -- If it fails due to post validation the successfully installed files can be found in ${CURRENT_PACKAGES_DIR} \n\ -- and just need to be copied into ${CURRENT_INSTALLED_DIR}") if(NOT VCPKG_TARGET_IS_WINDOWS) @@ -45,7 +45,7 @@ vcpkg_add_to_path(PREPEND "${GPERF_DIR}") vcpkg_add_to_path(PREPEND "${NINJA_DIR}") vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") -set(PATCHES common.pri.patch +set(PATCHES common.pri.patch gl.patch build_1.patch build_2.patch diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 64338b1cbf3951..45d6df616bcfae 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-webengine", "version": "5.15.4", - "port-version": 1, + "port-version": 2, "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/versions/baseline.json b/versions/baseline.json index afc0c472231a58..fda507443e3e8a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5842,7 +5842,7 @@ }, "qt5-webengine": { "baseline": "5.15.4", - "port-version": 1 + "port-version": 2 }, "qt5-webglplugin": { "baseline": "5.15.4", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index b5fbc94b2d6b60..07b31f5c564413 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71d241727d07ed646d0f34c1d29d4173c1087233", + "version": "5.15.4", + "port-version": 2 + }, { "git-tree": "ac21a058fe59c5b0272cdfc2cc1791b9b9901a79", "version": "5.15.4", From f78f4440df86358575dea65e748a39fdad41eb85 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 31 May 2022 16:20:33 -0700 Subject: [PATCH 366/383] [python3] Do not ensurepip. Provide venv instructions. (#24906) * [python3] Bootstrap pip with ${CURRENT_INSTALLED_DIR} * [python3] Disable ensurepip -- add venv usage instructions Co-authored-by: Max Khon --- ports/python3/0010-ensurepip.patch | 11 +++++++++++ ports/python3/portfile.cmake | 27 ++++++++++++++------------- ports/python3/usage.unix | 9 +++++++++ ports/python3/usage.win | 8 ++++++++ ports/python3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 7 files changed, 49 insertions(+), 15 deletions(-) create mode 100644 ports/python3/0010-ensurepip.patch create mode 100644 ports/python3/usage.unix create mode 100644 ports/python3/usage.win diff --git a/ports/python3/0010-ensurepip.patch b/ports/python3/0010-ensurepip.patch new file mode 100644 index 00000000000000..ce5b65a3db45b8 --- /dev/null +++ b/ports/python3/0010-ensurepip.patch @@ -0,0 +1,11 @@ +--- a/Lib/ensurepip/__init__.py 2021-10-05 00:40:46.000000000 +0700 ++++ b/Lib/ensurepip/__init__.py 2022-01-11 15:22:54.001498300 +0700 +@@ -86,6 +86,8 @@ + code = f""" + import runpy + import sys ++import os ++sys.executable = os.path.dirname(os.path.realpath(__file__)) + sys.path = {additional_paths or []} + sys.path + sys.argv[1:] = {args} + runpy.run_module("pip", run_name="__main__", alter_sys=True) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index d99a0fd673bf55..144fd4b002835c 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -29,8 +29,9 @@ elseif(VCPKG_TARGET_IS_WINDOWS AND CMAKE_SYSTEM_VERSION EQUAL 6.1) message(FATAL_ERROR "python3 requires the feature deprecated-win7-support when building on Windows 7.") endif() -# The Windows 11 SDK has a problem that causes it to error on the resource files, so we patch that. if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PYTHON_ALLOW_EXTENSIONS) + # The Windows 11 SDK has a problem that causes it to error on the resource files, so we patch that. vcpkg_get_windows_sdk(WINSDK_VERSION) if("${WINSDK_VERSION}" VERSION_GREATER_EQUAL "10.0.22000") list(APPEND PATCHES "0007-workaround-windows-11-sdk-rc-compiler-error.patch") @@ -70,7 +71,6 @@ endfunction() if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) # Due to the way Python handles C extension modules on Windows, a static python core cannot # load extension modules. - string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" PYTHON_ALLOW_EXTENSIONS) if(PYTHON_ALLOW_EXTENSIONS) find_library(BZ2_RELEASE NAMES bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BZ2_DEBUG NAMES bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) @@ -171,15 +171,6 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(GLOB PYTHON_INSTALLERS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wininst-*.exe") file(REMOVE ${PYTHON_LIBS} ${PYTHON_INSTALLERS}) - # The generated python executable must match the host arch - if(PYTHON_ALLOW_EXTENSIONS AND NOT VCPKG_CROSSCOMPILING) - message(STATUS "Bootstrapping pip") - vcpkg_execute_required_process(COMMAND python -m ensurepip - WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}" - LOGNAME "ensurepip-${TARGET_TRIPLET}" - ) - endif() - # pkg-config files if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") make_python_pkgconfig(FILE python.pc INSTALL_ROOT ${CURRENT_PACKAGES_DIR} @@ -215,7 +206,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) else() set(OPTIONS "--with-openssl=${CURRENT_INSTALLED_DIR}" - "--with-ensurepip" + "--without-ensurepip" "--with-suffix=" "--with-system-expat" "--without-readline" @@ -255,7 +246,17 @@ else() vcpkg_fixup_pkgconfig() endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage) +if(VCPKG_TARGET_IS_WINDOWS) + if(PYTHON_ALLOW_EXTENSIONS) + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage.win" usage_extra) + else() + set(usage_extra "") + endif() +else() + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage.unix" usage_extra) +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage}\n${usage_extra}") function(_generate_finder) cmake_parse_arguments(PythonFinder "NO_OVERRIDE" "DIRECTORY;PREFIX" "" ${ARGN}) diff --git a/ports/python3/usage.unix b/ports/python3/usage.unix new file mode 100644 index 00000000000000..614292c2ff7c25 --- /dev/null +++ b/ports/python3/usage.unix @@ -0,0 +1,9 @@ +The package python3 provides a python interpreter that supports virtual environments: + + $ tools/python3/python3.10 -m venv /path/to/venv + $ export VIRTUAL_ENV=/path/to/venv + $ export PATH=/path/to/venv/bin:$PATH + $ export -n PYTHONHOME + $ unset PYTHONHOME + + See https://docs.python.org/3/library/venv.html for more details. diff --git a/ports/python3/usage.win b/ports/python3/usage.win new file mode 100644 index 00000000000000..3fcc343ed8b688 --- /dev/null +++ b/ports/python3/usage.win @@ -0,0 +1,8 @@ +The package python3 provides a python interpreter that supports virtual environments: + + >tools\python3\python3.10 -m venv c:\path\to\venv + >set VIRTUAL_ENV=c:\path\to\venv + >set PATH=c:\path\to\venv\bin;%PATH% + >set PYTHONHOME= + + See https://docs.python.org/3/library/venv.html for more details. diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 1a2ec9110034a3..21ee84f93dc8bd 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.10.2", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index fda507443e3e8a..17f604404b049f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5658,7 +5658,7 @@ }, "python3": { "baseline": "3.10.2", - "port-version": 1 + "port-version": 2 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index a89a02eb10de82..36df2f98ae49d1 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30321893b72abb4b682e3b66f75c54c1df3051c9", + "version": "3.10.2", + "port-version": 2 + }, { "git-tree": "4e348bd50d8c4252bda83903ce22f1e60d34be88", "version": "3.10.2", From c48c0c05bdaa7490585b10c83932b5a58722e463 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 1 Jun 2022 13:42:40 -0700 Subject: [PATCH 367/383] [ci.baseline.txt] Revert #24959 because ICE still exists (#25029) --- scripts/ci.baseline.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f77c6fe1748087..5bdd740ee2945b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1008,6 +1008,10 @@ rsasynccpp:x64-osx=fail rsm-binary-io:x64-linux=fail # Requires g++10 but CI compiler only has g++9 rsm-bsa:x64-linux=fail +# VS2022 17.2 ICE https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1490389 +rsocket:x64-windows=fail +rsocket:x64-windows-static=fail +rsocket:x64-windows-static-md=fail rtlsdr:x64-uwp=fail rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail From a91c2d160fbc44528ba44555779b80d9da5aa571 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Wed, 1 Jun 2022 16:31:46 -0700 Subject: [PATCH 368/383] [google-cloud-cpp] update to latest release (v1.41.0) (#25032) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index fca68939490aec..850ce2aa7bd468 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.40.1 - SHA512 55c33f91cdbf5713fdc85ecd461c99fefb8d2a60e53e67c246370288f85e323c7a3a7915f4313ed3331fc1278ac4b910ce6fe20929378096a237c2fb31863b13 + REF v1.41.0 + SHA512 41bee9fce6d7bbb0cdd201f9902b1bb0b3c94e4e42719332021fdd7ba1e1b1d503cd7e480c6318da658595100d63223f8f11c3d7f5e4965c1c815ab703a9c224 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 4c8421d9e2112b..cb541dd71ccda6 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.40.1", - "port-version": 1, + "version": "1.41.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 17f604404b049f..0ca7a2367be5fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2601,8 +2601,8 @@ "port-version": 0 }, "google-cloud-cpp": { - "baseline": "1.40.1", - "port-version": 1 + "baseline": "1.41.0", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index f15cf1bbf32c59..e3e890aa9f6397 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6fac62fee7c3ad470f81ac87fcdf19d5a85f8b8", + "version": "1.41.0", + "port-version": 0 + }, { "git-tree": "506bdfbf9040c856f8f3a4a2c183da38f9030817", "version": "1.40.1", From a2d8a7cbb15cac91d6c59cd967ef9d85105832c3 Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 2 Jun 2022 03:13:53 +0300 Subject: [PATCH 369/383] [fontconfig][freetds][qtwebengine] Take gperf from vcpkg (#24677) * Take gperf from vcpkg tool if possible * [gperf] Install binary into tools/gperf/ * Fix kf5codecs gperf bug * Add PREPEND to freetds port * fix gperf for qtwebengine * make gperf modern port Co-authored-by: Robert Schumacher --- ports/fontconfig/portfile.cmake | 4 +--- ports/fontconfig/vcpkg.json | 6 +++++- ports/freetds/portfile.cmake | 10 +--------- ports/freetds/vcpkg.json | 5 +++++ ports/gperf/portfile.cmake | 6 +++--- ports/gperf/vcpkg.json | 14 ++++++++++++-- ports/kf5codecs/portfile.cmake | 4 +--- ports/kf5codecs/vcpkg.json | 1 + ports/proxygen/portfile.cmake | 11 +---------- ports/proxygen/vcpkg.json | 6 +++++- ports/qtwebengine/portfile.cmake | 6 +++--- ports/qtwebengine/vcpkg.json | 6 +++++- versions/baseline.json | 12 ++++++------ versions/f-/fontconfig.json | 5 +++++ versions/f-/freetds.json | 5 +++++ versions/g-/gperf.json | 5 +++++ versions/k-/kf5codecs.json | 5 +++++ versions/p-/proxygen.json | 5 +++++ versions/q-/qtwebengine.json | 5 +++++ 19 files changed, 79 insertions(+), 42 deletions(-) diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index f8f1d1f1c541df..da4002236c3d67 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -12,9 +12,7 @@ vcpkg_from_gitlab( libgetopt.patch ) -vcpkg_find_acquire_program(GPERF) -get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) -vcpkg_add_to_path(${GPERF_PATH}) +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 28a77f62e1ef20..7631fae57394c0 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fontconfig", "version": "2.14.0", - "port-version": 1, + "port-version": 2, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "license": "MIT", @@ -11,6 +11,10 @@ "freetype", "getopt", "gettext", + { + "name": "gperf", + "host": true + }, "libiconv", { "name": "libuuid", diff --git a/ports/freetds/portfile.cmake b/ports/freetds/portfile.cmake index b2cc9db38b47ea..288f2de314677e 100644 --- a/ports/freetds/portfile.cmake +++ b/ports/freetds/portfile.cmake @@ -18,15 +18,7 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) vcpkg_add_to_path("${PERL_PATH}") -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_find_acquire_program(GPERF) - get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) - vcpkg_add_to_path(${GPERF_PATH}) -else() - if (NOT EXISTS /usr/bin/gperf) - message(FATAL_ERROR "freetds requires gperf, these can be installed on Ubuntu systems via apt-get install gperf.") - endif() -endif() +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") set(_WCHAR_SUPPORT ON) if(NOT VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/freetds/vcpkg.json b/ports/freetds/vcpkg.json index 73b7bffb24fa97..5483fdf9947013 100644 --- a/ports/freetds/vcpkg.json +++ b/ports/freetds/vcpkg.json @@ -1,11 +1,16 @@ { "name": "freetds", "version": "1.3.10", + "port-version": 1, "description": "Implementation of the Tabular Data Stream protocol", "homepage": "https://www.freetds.org", "license": "GPL-2.0-only", "supports": "windows & !uwp", "dependencies": [ + { + "name": "gperf", + "host": true + }, { "name": "libmysql", "platform": "windows" diff --git a/ports/gperf/portfile.cmake b/ports/gperf/portfile.cmake index 1e589d7c937189..34644af1b936d4 100644 --- a/ports/gperf/portfile.cmake +++ b/ports/gperf/portfile.cmake @@ -14,12 +14,12 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - OPTIONS_RELEASE -DCMAKE_INSTALL_BINDIR=tools + OPTIONS_RELEASE -DCMAKE_INSTALL_BINDIR=tools/gperf ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) diff --git a/ports/gperf/vcpkg.json b/ports/gperf/vcpkg.json index da0d637c4eee9e..02f6116f1ff0b2 100644 --- a/ports/gperf/vcpkg.json +++ b/ports/gperf/vcpkg.json @@ -1,7 +1,17 @@ { "name": "gperf", "version": "3.1", - "port-version": 3, + "port-version": 4, "description": "GNU perfect hash function generator", - "homepage": "https://www.gnu.org/software/gperf/" + "homepage": "https://www.gnu.org/software/gperf/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake index 538664fa9ec6e6..26713a368e4fe2 100644 --- a/ports/kf5codecs/portfile.cmake +++ b/ports/kf5codecs/portfile.cmake @@ -9,13 +9,11 @@ vcpkg_from_github( # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") -find_program(GPERF_EXE NAMES gperf PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF - "-DGperf_EXECUTABLE=${GPERF_EXE}" + "-DGperf_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}" ) vcpkg_cmake_install() diff --git a/ports/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json index 3e53561c2509bc..7ffe07cc435d5f 100644 --- a/ports/kf5codecs/vcpkg.json +++ b/ports/kf5codecs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5codecs", "version": "5.89.0", + "port-version": 1, "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index 524f98d401cdbe..d9767e7515b5b5 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -13,16 +13,7 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY) vcpkg_add_to_path(${PYTHON3_PATH}) -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_find_acquire_program(GPERF) - get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) - vcpkg_add_to_path(${GPERF_PATH}) -else() - # gperf only have windows package in vcpkg now. - if (NOT EXISTS /usr/bin/gperf) - message(FATAL_ERROR "proxygen requires gperf, these can be installed on Ubuntu systems via apt-get install gperf.") - endif() -endif() +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index a0f89963a6353f..223c1775b04009 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,7 +1,7 @@ { "name": "proxygen", "version-string": "2022.03.21.00", - "port-version": 1, + "port-version": 2, "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "supports": "!windows", @@ -16,6 +16,10 @@ "boost-thread", "fizz", "folly", + { + "name": "gperf", + "host": true + }, "openssl", { "name": "vcpkg-cmake", diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index 469852f8324e5e..f228d620affe73 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -44,7 +44,6 @@ endif() vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) -vcpkg_find_acquire_program(GPERF) #vcpkg_find_acquire_program(GN) # Qt builds its own internal version @@ -54,8 +53,6 @@ if(NOT NODEJS) message(FATAL_ERROR "node not found! Please install it via your system package manager!") endif() -get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${GPERF_DIR}") get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) @@ -73,6 +70,9 @@ else() x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES html5lib) endif() +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") +set(GPERF "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(WIN32) # WIN32 HOST probably has win_flex and win_bison! if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 0c84aa2301e438..9198d677d58fc3 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", "version": "6.3.0", - "port-version": 1, + "port-version": 2, "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, @@ -24,6 +24,10 @@ "name": "glib", "platform": "!windows" }, + { + "name": "gperf", + "host": true + }, { "name": "harfbuzz", "platform": "!windows" diff --git a/versions/baseline.json b/versions/baseline.json index 0ca7a2367be5fe..78c07220b9878f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2298,7 +2298,7 @@ }, "fontconfig": { "baseline": "2.14.0", - "port-version": 1 + "port-version": 2 }, "foonathan-memory": { "baseline": "2019-07-21", @@ -2346,7 +2346,7 @@ }, "freetds": { "baseline": "1.3.10", - "port-version": 0 + "port-version": 1 }, "freetype": { "baseline": "2.12.1", @@ -2618,7 +2618,7 @@ }, "gperf": { "baseline": "3.1", - "port-version": 3 + "port-version": 4 }, "gperftools": { "baseline": "2019-09-02", @@ -3154,7 +3154,7 @@ }, "kf5codecs": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5completion": { "baseline": "5.89.0", @@ -5614,7 +5614,7 @@ }, "proxygen": { "baseline": "2022.03.21.00", - "port-version": 1 + "port-version": 2 }, "psimd": { "baseline": "2021-02-21", @@ -6022,7 +6022,7 @@ }, "qtwebengine": { "baseline": "6.3.0", - "port-version": 1 + "port-version": 2 }, "qtwebsockets": { "baseline": "6.3.0", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 068c6f259ab263..7b747ad2ed8a11 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c02d2ba027c9f390729a7e0899e63c853450dfb", + "version": "2.14.0", + "port-version": 2 + }, { "git-tree": "b1b1de99dba230f78c88bb9d73329bed77227ad4", "version": "2.14.0", diff --git a/versions/f-/freetds.json b/versions/f-/freetds.json index 64d7d576e5c420..0deb3189ea14f7 100644 --- a/versions/f-/freetds.json +++ b/versions/f-/freetds.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d2a8c09978586d81a52529c94a96dd2f1208ebe", + "version": "1.3.10", + "port-version": 1 + }, { "git-tree": "c388be84a1c4bb7156aaf173f1ee348d500db8ad", "version": "1.3.10", diff --git a/versions/g-/gperf.json b/versions/g-/gperf.json index addff5181f260b..9421e9188f6486 100644 --- a/versions/g-/gperf.json +++ b/versions/g-/gperf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fd0763af6d1af5d123d81c77fe9062d33b3e918", + "version": "3.1", + "port-version": 4 + }, { "git-tree": "15455ef99f1ce92d079d047e90fc486c098c6b18", "version": "3.1", diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json index 05b772b73895fa..b4d9a4b4deaa35 100644 --- a/versions/k-/kf5codecs.json +++ b/versions/k-/kf5codecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f089e2bf752a07b60871e0cbc1bcdf085b3e7fd", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "689fa05db3db3ea404ccec181b0a8bba8e614562", "version": "5.89.0", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 3b9e342522e8b5..51842ba59d5b8e 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27f0950fcf11ac8f561591363715ddf581146325", + "version-string": "2022.03.21.00", + "port-version": 2 + }, { "git-tree": "fb9493259e80636642c06b40479c36b6b4c9cba2", "version-string": "2022.03.21.00", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index afcecd55057c15..842e438b99cd35 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb2bc02591f25285ed7e085bce22001d42ec5d87", + "version": "6.3.0", + "port-version": 2 + }, { "git-tree": "6562d0a0294290afd20da039ff60602c1f3f4701", "version": "6.3.0", From 8d41d43e1f7f5933622b02e16430312da649361e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 2 Jun 2022 19:56:30 +0200 Subject: [PATCH 370/383] [cgal] Add boost-multi-array to deps (#24803) * Add boost-multi-array to deps of cgal port * Fix version and formatting of manifest * ./vcpkg x-add-version --all --- ports/cgal/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/c-/cgal.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json index 83dae13a90b1e8..bc07d0a8647c02 100644 --- a/ports/cgal/vcpkg.json +++ b/ports/cgal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cgal", "version": "5.4", + "port-version": 1, "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.", "homepage": "https://github.com/CGAL/cgal", "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0", @@ -26,6 +27,7 @@ "boost-logic", "boost-math", "boost-mpl", + "boost-multi-array", "boost-multi-index", "boost-multiprecision", "boost-numeric-conversion", diff --git a/versions/baseline.json b/versions/baseline.json index 78c07220b9878f..8a3c3a6ecfcb53 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1322,7 +1322,7 @@ }, "cgal": { "baseline": "5.4", - "port-version": 0 + "port-version": 1 }, "cgicc": { "baseline": "3.2.19", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index 13b6b7272217a3..d8196a82146996 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b768fd944908a816ec83a1ff7cb37249aea808e", + "version": "5.4", + "port-version": 1 + }, { "git-tree": "0acdd574cd028b7ca4acd762f01938492c6d4719", "version": "5.4", From 819a76824996c38ff8f68b3143e5184664c493ab Mon Sep 17 00:00:00 2001 From: day253 <9634619+day253@users.noreply.github.com> Date: Fri, 3 Jun 2022 03:53:28 +0800 Subject: [PATCH 371/383] [brpc] Updata to 1.1.0 (#24975) Co-authored-by: daijunkai --- ...ix_boost_ptr.patch => fix-boost-ptr.patch} | 2 +- ports/brpc/fix-build.patch | 202 ++++++++++++++++++ ports/brpc/fix_thrift.patch | 28 --- ports/brpc/portfile.cmake | 18 +- ports/brpc/vcpkg.json | 7 +- versions/b-/brpc.json | 5 + versions/baseline.json | 4 +- 7 files changed, 221 insertions(+), 45 deletions(-) rename ports/brpc/{fix_boost_ptr.patch => fix-boost-ptr.patch} (92%) create mode 100644 ports/brpc/fix-build.patch delete mode 100644 ports/brpc/fix_thrift.patch diff --git a/ports/brpc/fix_boost_ptr.patch b/ports/brpc/fix-boost-ptr.patch similarity index 92% rename from ports/brpc/fix_boost_ptr.patch rename to ports/brpc/fix-boost-ptr.patch index 4ced79422bc7ce..2650a23dace80d 100644 --- a/ports/brpc/fix_boost_ptr.patch +++ b/ports/brpc/fix-boost-ptr.patch @@ -1,5 +1,5 @@ diff --git a/src/brpc/policy/thrift_protocol.cpp b/src/brpc/policy/thrift_protocol.cpp -index eae081a0..39c92338 100755 +index 634f8f37..21b118b1 100755 --- a/src/brpc/policy/thrift_protocol.cpp +++ b/src/brpc/policy/thrift_protocol.cpp @@ -45,8 +45,7 @@ diff --git a/ports/brpc/fix-build.patch b/ports/brpc/fix-build.patch new file mode 100644 index 00000000000000..a39f8030b9ebe7 --- /dev/null +++ b/ports/brpc/fix-build.patch @@ -0,0 +1,202 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 057695af..ed4979f6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,7 +63,8 @@ endif() + + if(WITH_THRIFT) + set(THRIFT_CPP_FLAG "-DENABLE_THRIFT_FRAMED_PROTOCOL") +- set(THRIFT_LIB "thrift") ++ find_package(Thrift CONFIG REQUIRED) ++ set(THRIFT_LIB "thrift::thrift") + endif() + + include(GNUInstallDirs) +@@ -142,18 +143,21 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + endif() + endif() + +-find_package(Protobuf REQUIRED) ++find_package(protobuf CONFIG REQUIRED) ++get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES) ++set(PROTOBUF_LIBRARIES protobuf::libprotobuf) + find_package(Threads REQUIRED) +- +-find_path(LEVELDB_INCLUDE_PATH NAMES leveldb/db.h) +-find_library(LEVELDB_LIB NAMES leveldb) ++find_package(leveldb CONFIG REQUIRED) ++set(LEVELDB_INCLUDE_PATH ${PROTOBUF_INCLUDE_DIR}) ++set(LEVELDB_LIB leveldb::leveldb) + if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB)) + message(FATAL_ERROR "Fail to find leveldb") + endif() + + if(WITH_GLOG) +- find_path(GLOG_INCLUDE_PATH NAMES glog/logging.h) +- find_library(GLOG_LIB NAMES glog) ++ find_package(glog CONFIG REQUIRED) ++ get_target_property(GLOG_INCLUDE_PATH glog::glog INTERFACE_INCLUDE_DIRECTORIES) ++ set(GLOG_LIB glog::glog) + if((NOT GLOG_INCLUDE_PATH) OR (NOT GLOG_LIB)) + message(FATAL_ERROR "Fail to find glog") + endif() +@@ -171,7 +175,7 @@ if(WITH_MESALINK) + include_directories(${MESALINK_INCLUDE_PATH}) + endif() + +-find_library(PROTOC_LIB NAMES protoc) ++set(PROTOC_LIB "protobuf::libprotoc") + if(NOT PROTOC_LIB) + message(FATAL_ERROR "Fail to find protoc lib") + endif() +@@ -182,7 +186,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + ) + endif() + +-find_package(OpenSSL) ++find_package(OpenSSL REQUIRED) + + include_directories( + ${GFLAGS_INCLUDE_PATH} +@@ -197,9 +201,9 @@ set(DYNAMIC_LIB + ${LEVELDB_LIB} + ${PROTOC_LIB} + ${CMAKE_THREAD_LIBS_INIT} +- ${THRIFT_LIB} +- ${THRIFTNB_LIB} + ${OPENSSL_CRYPTO_LIBRARY} ++ ${OPENSSL_SSL_LIBRARY} ++ ${THRIFT_LIB} + dl + z) + +@@ -434,7 +438,9 @@ if(BUILD_UNIT_TESTS) + enable_testing() + add_subdirectory(test) + endif() ++if(BUILD_TOOLS) + add_subdirectory(tools) ++endif() + + file(COPY ${CMAKE_CURRENT_BINARY_DIR}/brpc/ + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/output/include/brpc/ +diff --git a/cmake/FindGFLAGS.cmake b/cmake/FindGFLAGS.cmake +index dfad5fd8..83a167f0 100644 +--- a/cmake/FindGFLAGS.cmake ++++ b/cmake/FindGFLAGS.cmake +@@ -15,7 +15,8 @@ + + set(_gflags_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + +-find_path(GFLAGS_INCLUDE_PATH gflags/gflags.h) ++find_package(gflags CONFIG REQUIRED) ++get_target_property(GFLAGS_INCLUDE_PATH gflags::gflags INTERFACE_INCLUDE_DIRECTORIES) + + if (GFLAGS_STATIC) + if (WIN32) +@@ -24,7 +25,7 @@ if (GFLAGS_STATIC) + set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) + endif (WIN32) + endif (GFLAGS_STATIC) +-find_library(GFLAGS_LIBRARY NAMES gflags libgflags) ++set(GFLAGS_LIBRARY gflags::gflags) + if(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY) + set(GFLAGS_FOUND TRUE) + endif(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ee616eb1..35a5b48e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,45 +31,77 @@ add_dependencies(SOURCES_LIB PROTO_LIB) + set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) + set_property(TARGET ${BUTIL_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) + +-add_library(brpc-shared SHARED $ ++if (BUILD_SHARED_LIBS) ++add_library(brpc-shared SHARED $ + $ + $) ++else() + add_library(brpc-static STATIC $ + $ + $) +- +-target_link_libraries(brpc-shared ${DYNAMIC_LIB}) ++endif() ++if (BUILD_SHARED_LIBS) ++target_include_directories(brpc-shared PUBLIC $) ++target_link_libraries(brpc-shared PUBLIC ${DYNAMIC_LIB}) ++else() ++target_include_directories(brpc-static PUBLIC $) ++target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB}) ++endif() + + if(BRPC_WITH_GLOG) ++ if (BUILD_SHARED_LIBS) + target_link_libraries(brpc-shared ${GLOG_LIB}) ++ else() ++ target_link_libraries(brpc-static ${GLOG_LIB}) ++ endif() + endif() + + if(BRPC_WITH_THRIFT) ++ if (BUILD_SHARED_LIBS) + target_link_libraries(brpc-shared thrift) ++ else() + target_link_libraries(brpc-static thrift) ++ endif() + endif() + ++if (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) ++else() + SET_TARGET_PROPERTIES(brpc-shared PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) ++endif() + +-# for protoc-gen-mcpack +-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin) +- +-set(protoc_gen_mcpack_SOURCES +- ${PROJECT_SOURCE_DIR}/src/mcpack2pb/generator.cpp +- ) +-add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES}) +-target_link_libraries(protoc-gen-mcpack brpc-shared) +- + #install directory +-install(TARGETS brpc-shared ++if (BUILD_SHARED_LIBS) ++install(TARGETS brpc-shared EXPORT unofficial-brpcTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) +- +-install(TARGETS brpc-static ++else() ++install(TARGETS brpc-static EXPORT unofficial-brpcTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++endif() ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-brpc-config.cmake" ++[[include(CMakeFindDependencyMacro) ++find_dependency(OpenSSL) ++find_dependency(Threads) ++find_dependency(gflags CONFIG) ++find_dependency(protobuf CONFIG) ++find_dependency(leveldb CONFIG) ++find_dependency(Thrift CONFIG) ++find_dependency(glog CONFIG) ++file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/unofficial-brpcTargets.cmake") ++foreach (TARGET_FILE ${TARGET_FILES}) ++ include("${TARGET_FILE}") ++endforeach() ++]]) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-brpc-config.cmake" DESTINATION share/unofficial-brpc) ++ ++install(EXPORT unofficial-brpcTargets ++ NAMESPACE unofficial::brpc:: ++ DESTINATION share/unofficial-brpc ++) diff --git a/ports/brpc/fix_thrift.patch b/ports/brpc/fix_thrift.patch deleted file mode 100644 index 699f42fb0aa0b9..00000000000000 --- a/ports/brpc/fix_thrift.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3deb7342..737f6a70 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,8 +62,10 @@ if(WITH_DEBUG_SYMBOLS) - endif() - - if(WITH_THRIFT) -+ find_package(Thrift CONFIG REQUIRED) -+ # target_link_libraries(main PRIVATE thrift::thrift thriftz::thriftz thriftnb::thriftnb) - set(THRIFT_CPP_FLAG "-DENABLE_THRIFT_FRAMED_PROTOCOL") -- set(THRIFT_LIB "thrift") -+ set(THRIFT_LIB "thrift::thrift") - endif() - - include(GNUInstallDirs) -@@ -196,9 +198,10 @@ set(DYNAMIC_LIB - ${LEVELDB_LIB} - ${PROTOC_LIB} - ${CMAKE_THREAD_LIBS_INIT} -+ ${OPENSSL_CRYPTO_LIBRARY} -+ ${OPENSSL_SSL_LIBRARY} - ${THRIFT_LIB} - ${THRIFTNB_LIB} -- ${OPENSSL_CRYPTO_LIBRARY} - dl - z) - diff --git a/ports/brpc/portfile.cmake b/ports/brpc/portfile.cmake index ed0ff3acfabe6a..8aa32069fa6fcf 100644 --- a/ports/brpc/portfile.cmake +++ b/ports/brpc/portfile.cmake @@ -1,19 +1,12 @@ -vcpkg_download_distfile(patch1679 - URLS "https://patch-diff.githubusercontent.com/raw/apache/incubator-brpc/pull/1679.diff" - FILENAME "apache-incubator-brpc-1679.diff" - SHA512 4b1e5717b44aa6a741ddd49b1408e3e556f6d845d5e8a5cfccf2f2d7ebe39aed19c3dad703db7a9ebd0446ac1f225e7dbdd2ff1f23f34fd60c3ef59aaa07b789 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/incubator-brpc - REF 1d6510aa50075cade5ed539ee09a11a1b8d7f990 # 0.9.7 - SHA512 9c9dbe2a202e58586010c56634bd371f6a9e3ff0d8c5341abbabd1f1dd204a3aec5e89061fa326b4fc8ae7202f9fc33f93a5acd845d18dab3915a3e2b81cbaf3 + REF 06247c18ed6307613f04c0d2357cb91d0c14131b + SHA512 f31b1ce3bd99dd585686ec540c9713d5d5936b2d58aadfb3f0ef48faeaab1797f2373e14b73578c2f9f8355d1e9d03661e2ed9ed8c4349b4e43e510d2214b5ae HEAD_REF master PATCHES - fix_boost_ptr.patch - fix_thrift.patch - ${patch1679} + fix-build.patch + fix-boost-ptr.patch ) vcpkg_cmake_configure( @@ -22,12 +15,13 @@ vcpkg_cmake_configure( -DWITH_THRIFT=ON -DWITH_MESALINK=OFF -DWITH_GLOG=ON + -DDOWNLOAD_GTEST=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-brpc CONFIG_PATH share/unofficial-brpc) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/butil/third_party/superfasthash") vcpkg_copy_pdbs() diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json index 67c0e3119786c3..7547db6dadcce9 100644 --- a/ports/brpc/vcpkg.json +++ b/ports/brpc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "brpc", - "version": "0.9.7", - "port-version": 7, + "version": "1.1.0", "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", "homepage": "https://github.com/apache/incubator-brpc", "license": "Apache-2.0", @@ -24,6 +23,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json index a7a9687b5a7965..f2a2c41760e8ba 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c88bb19658430803981fbfa4ec45432bed88310b", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "bcff3231352f577720f51a99dbf9ecf0132ebcba", "version": "0.9.7", diff --git a/versions/baseline.json b/versions/baseline.json index 8a3c3a6ecfcb53..f9d5e77ad8e340 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1157,8 +1157,8 @@ "port-version": 2 }, "brpc": { - "baseline": "0.9.7", - "port-version": 7 + "baseline": "1.1.0", + "port-version": 0 }, "brunocodutra-metal": { "baseline": "2.1.4", From 850ba1ac73b159b3d29d54311bc0d672fd19659c Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Thu, 2 Jun 2022 15:55:46 -0400 Subject: [PATCH 372/383] [boringssl] Remove -WX and -Werror (#24899) * boringssl: Add a patch to disable another warning breaking build for VS2022. Filed upstream as https://bugs.chromium.org/p/boringssl/issues/detail?id=495 * Update versions * format portfile.cmake * x-add-version * Update patch, remove -WX and -Werror * x-add-version * update patch's name * x-add-version Co-authored-by: Lily Wang --- .../boringssl/0002-disable-waring-4065.patch | 15 ------------ ports/boringssl/0002-remove-WX-Werror.patch | 24 +++++++++++++++++++ ports/boringssl/portfile.cmake | 11 ++++----- ports/boringssl/vcpkg.json | 8 ++++++- versions/b-/boringssl.json | 5 ++++ versions/baseline.json | 2 +- 6 files changed, 42 insertions(+), 23 deletions(-) delete mode 100644 ports/boringssl/0002-disable-waring-4065.patch create mode 100644 ports/boringssl/0002-remove-WX-Werror.patch diff --git a/ports/boringssl/0002-disable-waring-4065.patch b/ports/boringssl/0002-disable-waring-4065.patch deleted file mode 100644 index 88ffffaf0bdaea..00000000000000 --- a/ports/boringssl/0002-disable-waring-4065.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt -index ef95a6b..0b52c05 100644 ---- a/decrepit/CMakeLists.txt -+++ b/decrepit/CMakeLists.txt -@@ -40,6 +40,10 @@ add_executable( - - add_dependencies(decrepit_test global_target) - -+if(MSVC) -+ target_compile_options(decrepit PRIVATE /wd4065) -+endif() -+ - target_link_libraries(decrepit_test test_support_lib boringssl_gtest decrepit - crypto) - if(WIN32) diff --git a/ports/boringssl/0002-remove-WX-Werror.patch b/ports/boringssl/0002-remove-WX-Werror.patch new file mode 100644 index 00000000000000..c037b273acf2d0 --- /dev/null +++ b/ports/boringssl/0002-remove-WX-Werror.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 83ff477..3008c2a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ endif() + if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) + # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration + # primarily on our normal Clang one. +- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla") ++ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla") + if(MSVC) + # clang-cl sets different default warnings than clang. It also treats -Wall + # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall. +@@ -238,8 +238,8 @@ elseif(MSVC) + ${MSVC_DISABLED_WARNINGS_LIST}) + string(REPLACE "C" " -w4" MSVC_LEVEL4_WARNINGS_STR + ${MSVC_LEVEL4_WARNINGS_LIST}) +- set(CMAKE_C_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") +- set(CMAKE_CXX_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") ++ set(CMAKE_C_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") ++ set(CMAKE_CXX_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") + endif() + + if(WIN32) diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index e604c6a34a4ed9..be9ed1ee86478b 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -27,12 +27,11 @@ vcpkg_from_github( HEAD_REF master PATCHES 0001-vcpkg.patch - 0002-disable-waring-4065.patch + 0002-remove-WX-Werror.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG @@ -40,10 +39,10 @@ vcpkg_configure_cmake( -DINSTALL_TOOLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boringssl) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json index d8d9f7ac2d8fb8..9d0affcbbaaa9c 100644 --- a/ports/boringssl/vcpkg.json +++ b/ports/boringssl/vcpkg.json @@ -1,10 +1,16 @@ { "name": "boringssl", "version-date": "2021-06-23", - "port-version": 1, + "port-version": 2, "description": "BoringSSl is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "tools": { "description": "Build bssl executable" diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json index 5700899dcb9552..4f560eae8d2719 100644 --- a/versions/b-/boringssl.json +++ b/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d28c72d322cf2245e69075deef73c5edefee0b5", + "version-date": "2021-06-23", + "port-version": 2 + }, { "git-tree": "ca35c06a32c83f385f840831a435c69231a7852a", "version-date": "2021-06-23", diff --git a/versions/baseline.json b/versions/baseline.json index f9d5e77ad8e340..c7482f9b6b1ba9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1130,7 +1130,7 @@ }, "boringssl": { "baseline": "2021-06-23", - "port-version": 1 + "port-version": 2 }, "botan": { "baseline": "2.19.1", From 3c0366e1610e62f4485d327214b57e117b76afdb Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 3 Jun 2022 04:37:58 +0800 Subject: [PATCH 373/383] [angle] Enable angle test in CI (#24997) Co-authored-by: Cheney-Wang --- scripts/ci.baseline.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5bdd740ee2945b..7a349dc6572fdb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1288,10 +1288,10 @@ zeroc-ice:x64-uwp=fail # ANGLE triggers an intermittent ice in C1XX # https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1472813 -angle:x86-windows=skip -angle:x64-windows=skip -angle:x64-windows-static=skip -angle:x64-windows-static-md=skip -angle:x64-uwp=skip -angle:arm64-windows=skip -angle:arm-uwp=skip +angle:x86-windows=fail +angle:x64-windows=fail +angle:x64-windows-static=fail +angle:x64-windows-static-md=fail +angle:x64-uwp=fail +angle:arm64-windows=fail +angle:arm-uwp=fail From 9835eb1dfd117536dad86289e6d525d8ab40bbda Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 3 Jun 2022 06:13:27 +0800 Subject: [PATCH 374/383] [b64] Add target include directories and export config.cmake (#25037) * [b64] Add target include directories and export config.cmake * Use unofficial-b64 Co-authored-by: Cheney-Wang --- ports/b64/CMakeLists.txt | 15 ++++++++++----- ports/b64/portfile.cmake | 2 +- ports/b64/vcpkg.json | 2 ++ versions/b-/b64.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ports/b64/CMakeLists.txt b/ports/b64/CMakeLists.txt index 274fc0788b3048..e40d14ef387116 100644 --- a/ports/b64/CMakeLists.txt +++ b/ports/b64/CMakeLists.txt @@ -18,18 +18,23 @@ if (BUILD_SHARED_LIBS) target_compile_definitions(b64 PRIVATE LIBB64_EXPORTS=1) endif() -target_include_directories(b64 PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(b64 + PRIVATE include ${CMAKE_CURRENT_BINARY_DIR} + INTERFACE $ +) set_property(TARGET b64 PROPERTY PUBLIC_HEADER ${HEADER_FILES}) install(TARGETS b64 - EXPORT b64-targets + EXPORT unofficial-b64-config LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include/b64 ) -install(EXPORT b64-targets - FILE b64-targets.cmake - DESTINATION lib/cmake/b64) +install(EXPORT unofficial-b64-config + FILE unofficial-b64-config.cmake + NAMESPACE unofficial::b64:: + DESTINATION share/unofficial-b64 +) diff --git a/ports/b64/portfile.cmake b/ports/b64/portfile.cmake index dbe41a9372cf20..51ba61141fd286 100644 --- a/ports/b64/portfile.cmake +++ b/ports/b64/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-b64) vcpkg_copy_pdbs() diff --git a/ports/b64/vcpkg.json b/ports/b64/vcpkg.json index ba4dba7a21fd0d..6c9d51104f9b97 100644 --- a/ports/b64/vcpkg.json +++ b/ports/b64/vcpkg.json @@ -2,7 +2,9 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "b64", "version": "2.0.0.1", + "port-version": 1, "description": "libb64 is a library of ANSI C routines for fast encoding/decoding data into and from a base64-encoded format", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/b-/b64.json b/versions/b-/b64.json index 36e172140ed18c..590f69c2b62ee0 100644 --- a/versions/b-/b64.json +++ b/versions/b-/b64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeaf7d2076e25b321032c4fc88c22cbb46002a90", + "version": "2.0.0.1", + "port-version": 1 + }, { "git-tree": "9f1b6b36747fb6349483bf78531123d4b1ec5d7d", "version": "2.0.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index c7482f9b6b1ba9..98ae4410fbbfd7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -394,7 +394,7 @@ }, "b64": { "baseline": "2.0.0.1", - "port-version": 0 + "port-version": 1 }, "basisu": { "baseline": "1.11", From a137bd04ce6b93b691ab4cd4078ce2303ac93dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 2 Jun 2022 22:14:37 +0000 Subject: [PATCH 375/383] [hdf5] Fix feature parallel on Linux (#25036) * [hdf5] Fix feature parallel on Linux * version * Apply suggestions * version --- ports/hdf5/fix-parallel.patch | 22 ++++++++++++++++++++++ ports/hdf5/portfile.cmake | 1 + ports/hdf5/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/h-/hdf5.json | 5 +++++ 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 ports/hdf5/fix-parallel.patch diff --git a/ports/hdf5/fix-parallel.patch b/ports/hdf5/fix-parallel.patch new file mode 100644 index 00000000000000..c21527ed643f0f --- /dev/null +++ b/ports/hdf5/fix-parallel.patch @@ -0,0 +1,22 @@ +diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake +index 902ddd3..c333590 100644 +--- a/config/cmake/ConfigureChecks.cmake ++++ b/config/cmake/ConfigureChecks.cmake +@@ -283,7 +283,7 @@ macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR) + + if (${COMPILE_RESULT_VAR}) + if (${RUN_RESULT_VAR} MATCHES 0) +- set (${RUN_RESULT_VAR} 1 CACHE INTERNAL "Have C function ${FUNCTION_NAME}") ++ set (${RETURN_VAR} 1 CACHE INTERNAL "Have C function ${FUNCTION_NAME}") + if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0") + message (VERBOSE "Testing C ${FUNCTION_NAME} - OK") + endif () +@@ -295,7 +295,7 @@ macro (C_RUN FUNCTION_NAME SOURCE_CODE RETURN_VAR) + if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0") + message (VERBOSE "Testing C ${FUNCTION_NAME} - Fail") + endif () +- set (${RUN_RESULT_VAR} 0 CACHE INTERNAL "Have C function ${FUNCTION_NAME}") ++ set (${RETURN_VAR} 0 CACHE INTERNAL "Have C function ${FUNCTION_NAME}") + file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if the C ${FUNCTION_NAME} exists failed with the following output:\n" + "${OUTPUT_VAR}\n\n") diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index 6383a4826f02e2..d974aa65e8df1a 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( szip.patch pkgconfig-requires.patch pkgconfig-link-order.patch + fix-parallel.patch # Remove this patch in the next update, see https://github.com/HDFGroup/hdf5/pull/860 ) set(ALLOW_UNSUPPORTED OFF) diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index d535ebfa54f279..4fd14077d29428 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,9 +1,10 @@ { "name": "hdf5", "version": "1.12.1", - "port-version": 4, + "port-version": 5, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 98ae4410fbbfd7..db169028b80f4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2754,7 +2754,7 @@ }, "hdf5": { "baseline": "1.12.1", - "port-version": 4 + "port-version": 5 }, "healpix": { "baseline": "1.12.10", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index a82c072f61ac9c..9d7dc7220b5556 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6491dde27884b1326e6f74f3862c1ae63a122ca", + "version": "1.12.1", + "port-version": 5 + }, { "git-tree": "1000a70aefebfdd856715d265c3421c80157b773", "version": "1.12.1", From 43c85d7a8f1b9e4a0e50ef9d2919d7de55034b10 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Fri, 3 Jun 2022 07:15:09 +0900 Subject: [PATCH 376/383] [xsimd] Update to 8.1.0 (#25030) * [xsimd] Update to 8.1.0 * Add missing license information * Update version --- ports/xsimd/portfile.cmake | 4 ++-- ports/xsimd/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/x-/xsimd.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake index 32e59e3553cc30..7d10527a946d90 100644 --- a/ports/xsimd/portfile.cmake +++ b/ports/xsimd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xsimd - REF 8.0.3 - SHA512 4c93eea5c5ba7c72f718d7d404b9630850e0805d2698d472b964e4de765678801b369ce1da5e53372f28944f5f647a7ac162995f92535a820c6f4fc9defa7e5f + REF 8.1.0 + SHA512 539f7b565b45e8225c6476ca1becc8243a84ae7fb51b45a584231e7d36aee10a09d7d30fb87d89cb77813fb063a7b7617bcf01fdf996f59d99e8d474d2a044ee HEAD_REF master ) diff --git a/ports/xsimd/vcpkg.json b/ports/xsimd/vcpkg.json index a110b191883ef7..bfcc3f98b69fce 100644 --- a/ports/xsimd/vcpkg.json +++ b/ports/xsimd/vcpkg.json @@ -1,8 +1,9 @@ { "name": "xsimd", - "version": "8.0.3", + "version": "8.1.0", "description": "Modern, portable C++ wrappers for SIMD intrinsics", "homepage": "https://github.com/xtensor-stack/xsimd", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index db169028b80f4a..e1d0f9dd7688d2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7649,7 +7649,7 @@ "port-version": 1 }, "xsimd": { - "baseline": "8.0.3", + "baseline": "8.1.0", "port-version": 0 }, "xtensor": { diff --git a/versions/x-/xsimd.json b/versions/x-/xsimd.json index 70416122909596..82d262ad159a75 100644 --- a/versions/x-/xsimd.json +++ b/versions/x-/xsimd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d7f059f0f9d91da33b87a09615ef7f7f84cc76a", + "version": "8.1.0", + "port-version": 0 + }, { "git-tree": "e7b050635a31da5fce9834a6e8e859eb160b3916", "version": "8.0.3", From abb073fc56e4f663f08d02c6ee44b56e327aee5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 3 Jun 2022 00:18:27 +0200 Subject: [PATCH 377/383] [qtkeychain] Fix the CMake export target on windows (#25018) * [qtkeychain] Fix the CMake export target on windows * [qtkeychain-qt6] Fix the CMake export target on windows --- ports/qtkeychain-qt6/portfile.cmake | 5 +++-- ports/qtkeychain-qt6/vcpkg.json | 1 + ports/qtkeychain/portfile.cmake | 6 +++--- ports/qtkeychain/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/q-/qtkeychain-qt6.json | 5 +++++ versions/q-/qtkeychain.json | 5 +++++ 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ports/qtkeychain-qt6/portfile.cmake b/ports/qtkeychain-qt6/portfile.cmake index 674d0268555440..875ae642a81301 100644 --- a/ports/qtkeychain-qt6/portfile.cmake +++ b/ports/qtkeychain-qt6/portfile.cmake @@ -3,8 +3,9 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO frankosterfeld/qtkeychain - REF v0.13.2 - SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb + # 0.13.2 plus three commits, for a CMake export target fix + REF cd4d73299b144d11c310f6ca9a6ab1ef50c45431 + SHA512 a1af668bec23df5d696ad49129ec2aa6d332f043b43bb9875c2b025007452571bfd9431fd37c72189e957329491c04703e8c6d1104c7a117ebf28cb91249b639 HEAD_REF master ) diff --git a/ports/qtkeychain-qt6/vcpkg.json b/ports/qtkeychain-qt6/vcpkg.json index df4c0591cbaeba..3df8b0829f1457 100644 --- a/ports/qtkeychain-qt6/vcpkg.json +++ b/ports/qtkeychain-qt6/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtkeychain-qt6", "version": "0.13.2", + "port-version": 1, "description": "(Unaffiliated with Qt) Platform-independent Qt6 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", "license": "BSD-3-Clause", diff --git a/ports/qtkeychain/portfile.cmake b/ports/qtkeychain/portfile.cmake index 612ad8151b67ae..53b7683d8a936f 100644 --- a/ports/qtkeychain/portfile.cmake +++ b/ports/qtkeychain/portfile.cmake @@ -3,9 +3,9 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO frankosterfeld/qtkeychain - # 0.13.2 plus two commits, for a CMake export target fix - REF e5eeb1763e295f6b05a3f008ee7ae192fd74ed0c - SHA512 c6f216c8acdd89607d16582305bff962a0049512565f8ead7bebf06bce1540cdf41cc8b6dc31b45396befd90a3bd65a2f8a969242f302cbb61438ff7a48aab1c + # 0.13.2 plus three commits, for a CMake export target fix + REF cd4d73299b144d11c310f6ca9a6ab1ef50c45431 + SHA512 a1af668bec23df5d696ad49129ec2aa6d332f043b43bb9875c2b025007452571bfd9431fd37c72189e957329491c04703e8c6d1104c7a117ebf28cb91249b639 HEAD_REF master ) diff --git a/ports/qtkeychain/vcpkg.json b/ports/qtkeychain/vcpkg.json index ad96e2c068d429..6f1e1e257f2ffc 100644 --- a/ports/qtkeychain/vcpkg.json +++ b/ports/qtkeychain/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtkeychain", "version": "0.13.2", - "port-version": 2, + "port-version": 3, "description": "(Unaffiliated with Qt) Platform-independent Qt5 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index e1d0f9dd7688d2..926b841d4526d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5926,11 +5926,11 @@ }, "qtkeychain": { "baseline": "0.13.2", - "port-version": 2 + "port-version": 3 }, "qtkeychain-qt6": { "baseline": "0.13.2", - "port-version": 0 + "port-version": 1 }, "qtlocation": { "baseline": "6.3.0", diff --git a/versions/q-/qtkeychain-qt6.json b/versions/q-/qtkeychain-qt6.json index 685b1083d91113..aa49b7faff34de 100644 --- a/versions/q-/qtkeychain-qt6.json +++ b/versions/q-/qtkeychain-qt6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3733fba48696a40e64b18c2d52d4adc04e6eb22d", + "version": "0.13.2", + "port-version": 1 + }, { "git-tree": "b3df36df3c274f528e53cd1f8366811231b15151", "version": "0.13.2", diff --git a/versions/q-/qtkeychain.json b/versions/q-/qtkeychain.json index 8d761565e1c059..f949e3cad510c3 100644 --- a/versions/q-/qtkeychain.json +++ b/versions/q-/qtkeychain.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eda48d2b83676b8209a40d68b286c570aeed785e", + "version": "0.13.2", + "port-version": 3 + }, { "git-tree": "6311d9dd13b97c8a01a980d7b42ea6cfecc4f765", "version": "0.13.2", From 2aed520ed7ef41527e94e81ded99b4cb3c771d67 Mon Sep 17 00:00:00 2001 From: Lanyi Date: Fri, 3 Jun 2022 00:20:55 +0200 Subject: [PATCH 378/383] [nethost] Update nethost (#25004) * update nethost * bump nethost version * Add CMake exports in an unofficial- namespace https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md#add-cmake-exports-in-an-unofficial--namespace * fix port version and deprecated functions * change nethost version date to version * update usage * add quotes to paths and export targets directly * bump nethost version * [nethost] Only build one flavor * fix build error * bump nethost version Co-authored-by: Robert Schumacher --- ports/nethost/0001-nethost-cmakelists.patch | 83 ++++++++++++--------- ports/nethost/0002-settings-cmake.patch | 13 ---- ports/nethost/portfile.cmake | 37 +++++---- ports/nethost/usage | 6 +- ports/nethost/vcpkg.json | 15 +++- versions/baseline.json | 4 +- versions/n-/nethost.json | 5 ++ 7 files changed, 94 insertions(+), 69 deletions(-) delete mode 100644 ports/nethost/0002-settings-cmake.patch diff --git a/ports/nethost/0001-nethost-cmakelists.patch b/ports/nethost/0001-nethost-cmakelists.patch index 93d49b95e16439..c45f3b4749e75a 100644 --- a/ports/nethost/0001-nethost-cmakelists.patch +++ b/ports/nethost/0001-nethost-cmakelists.patch @@ -1,58 +1,73 @@ -diff --git a/src/installer/corehost/cli/common.cmake b/src/installer/corehost/cli/common.cmake -index 63e7306..639c90e 100644 ---- a/src/installer/corehost/cli/common.cmake -+++ b/src/installer/corehost/cli/common.cmake -@@ -5,9 +5,6 @@ - project(${DOTNET_PROJECT_NAME}) - - if(WIN32) -- add_compile_options($<$:/MT>) -- add_compile_options($<$:/MT>) -- add_compile_options($<$:/MTd>) - else() - add_compile_options(-fvisibility=hidden) - endif() -diff --git a/src/installer/corehost/cli/nethost/CMakeLists.txt b/src/installer/corehost/cli/nethost/CMakeLists.txt -index 7473958..49c664f 100644 ---- a/src/installer/corehost/cli/nethost/CMakeLists.txt -+++ b/src/installer/corehost/cli/nethost/CMakeLists.txt -@@ -2,12 +2,14 @@ +diff --git a/src/native/corehost/nethost/CMakeLists.txt b/src/native/corehost/nethost/CMakeLists.txt +index a9f44e720..0f24d4458 100644 +--- a/src/native/corehost/nethost/CMakeLists.txt ++++ b/src/native/corehost/nethost/CMakeLists.txt +@@ -1,11 +1,14 @@ + # Licensed to the .NET Foundation under one or more agreements. # The .NET Foundation licenses this file to you under the MIT license. - # See the LICENSE file in the project root for more information. --cmake_minimum_required (VERSION 2.6) -+cmake_minimum_required (VERSION 3.14) ++cmake_minimum_required (VERSION 3.14.5) project(nethost) set(DOTNET_PROJECT_NAME "nethost") # Include directories -+include(../../../settings.cmake) -+include(../../../functions.cmake) ++include(../../../../eng/native/configurepaths.cmake) ++include("${CLR_ENG_NATIVE_DIR}/configurecompiler.cmake") include_directories(../fxr) # CMake does not recommend using globbing since it messes with the freshness checks -@@ -22,13 +24,18 @@ if(WIN32) +@@ -19,12 +22,23 @@ if(CLR_CMAKE_TARGET_WIN32) Exports.def) endif() +if(BUILD_SHARED_LIBS) include(../lib.cmake) ++set(targets nethost) +else() ++include(../hostmisc/hostmisc.cmake) include(../lib_static.cmake) ++add_library(nethost INTERFACE) ++target_link_libraries(nethost INTERFACE libnethost) ++set(targets libnethost nethost) ++target_include_directories(libnethost INTERFACE $) +endif() ++target_include_directories(nethost INTERFACE $) add_definitions(-DFEATURE_LIBHOST=1) add_definitions(-DNETHOST_EXPORT) ++if(NOT BUILD_SHARED_LIBS) + # Copy static lib PDB to the project output directory + if (WIN32) + set_target_properties(libnethost PROPERTIES +@@ -32,15 +46,18 @@ if (WIN32) + COMPILE_PDB_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}" + ) + endif(WIN32) ++endif() + +-install(FILES ../coreclr_delegates.h DESTINATION corehost) +-install(FILES ../hostfxr.h DESTINATION corehost) -install(FILES nethost.h DESTINATION corehost) --install(TARGETS nethost DESTINATION corehost) --install(TARGETS libnethost DESTINATION corehost) --install_symbols(nethost corehost) +-install_with_stripped_symbols(nethost TARGETS corehost) ++set(NETHOST_HEADERS nethost.h ../coreclr_delegates.h ../hostfxr.h) ++install(FILES ${NETHOST_HEADERS} DESTINATION include) ++install(TARGETS ${targets} EXPORT unofficial-nethost-config ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin ++) + +-# Only Windows creates a symbols file for static libs. +-if (WIN32) +- install_with_stripped_symbols(libnethost TARGETS corehost) +-else() +- install(TARGETS libnethost DESTINATION corehost) +-endif(WIN32) \ No newline at end of file -+install(FILES nethost.h ../coreclr_delegates.h ../hostfxr.h DESTINATION include) -+if(BUILD_SHARED_LIBS) -+install(TARGETS nethost) -+else() -+install(TARGETS libnethost) -+endif() ++install(EXPORT unofficial-nethost-config ++ DESTINATION share/unofficial-nethost ++ FILE unofficial-nethost-config.cmake ++ NAMESPACE unofficial::nethost:: ++) diff --git a/ports/nethost/0002-settings-cmake.patch b/ports/nethost/0002-settings-cmake.patch deleted file mode 100644 index 7143b942a9b405..00000000000000 --- a/ports/nethost/0002-settings-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/installer/settings.cmake b/src/installer/settings.cmake -index 29d57b44..6ea63902 100644 ---- a/src/installer/settings.cmake -+++ b/src/installer/settings.cmake -@@ -114,7 +114,7 @@ endfunction() - - function(install_symbols targetName destination_path) - if(WIN32) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$/${targetName}.pdb DESTINATION ${destination_path}) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${targetName}.pdb DESTINATION ${destination_path}) - else() - strip_symbols(${targetName} strip_destination_file) - install(FILES ${strip_destination_file} DESTINATION ${destination_path}) diff --git a/ports/nethost/portfile.cmake b/ports/nethost/portfile.cmake index c7d4aae3b89ede..79c4ed49f3f426 100644 --- a/ports/nethost/portfile.cmake +++ b/ports/nethost/portfile.cmake @@ -1,17 +1,16 @@ -set(COMMIT_HASH 188427d7e18102c45fc6d0e20c135e226f215992) +set(COMMIT_HASH v6.0.5) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dotnet/runtime REF ${COMMIT_HASH} - SHA512 5a93c66c87e2113f733702d938efd39456c99fb74b383097b8d877df21536fcbcba901606aa70db6c8f1a16421ea8f06822c5b0ab1d882631b6daecbed8d03cc + SHA512 ccf4865bd9ea63c525fc11b0008774052d51f9247427fc28a91e3836e8e8d157569565bdac17326fe44a446d98a3e4b74a55779d01bede596f2458f4ec86f3aa HEAD_REF master PATCHES 0001-nethost-cmakelists.patch - 0002-settings-cmake.patch ) -set(PRODUCT_VERSION "5.0.0") +set(PRODUCT_VERSION "6.0.5") if(VCPKG_TARGET_IS_WINDOWS) set(RID_PLAT "win") @@ -41,9 +40,10 @@ endif() set(BASE_RID "${RID_PLAT}-${RID_ARCH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src/installer/corehost/cli/nethost - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src/native/corehost/nethost/" + # vcpkg's /utf-8 is incompatible with dotnet's own /source-charset:utf-8 + NO_CHARSET_FLAG OPTIONS "-DSKIP_VERSIONING=1" "-DCLI_CMAKE_HOST_POLICY_VER:STRING=${PRODUCT_VERSION}" @@ -52,15 +52,26 @@ vcpkg_configure_cmake( "-DCLI_CMAKE_COMMON_HOST_VER:STRING=${PRODUCT_VERSION}" "-DCLI_CMAKE_PKG_RID:STRING=${BASE_RID}" "-DCLI_CMAKE_COMMIT_HASH:STRING=${COMMIT_HASH}" - "-DCLI_CMAKE_PLATFORM_ARCH_${ARCH_NAME}=1" - "-DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=10.0" + "-DCLR_CMAKE_TARGET_ARCH_${ARCH_NAME}=1" + "-DCLR_CMAKE_TARGET_ARCH=${RID_ARCH}" + "-DCLR_CMAKE_HOST_ARCH=${RID_ARCH}" + MAYBE_UNUSED_VARIABLES + SKIP_VERSIONING # only used on WIN32 ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nethost) -file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nethost.h" "#ifdef NETHOST_USE_AS_STATIC" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nethost.h" "#ifdef NETHOST_USE_AS_STATIC" "#if 0") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/nethost/usage b/ports/nethost/usage index 6e6d860d1fb27c..26a41d92f21202 100644 --- a/ports/nethost/usage +++ b/ports/nethost/usage @@ -1,6 +1,4 @@ The package nethost can be used via CMake: - find_path(NETHOST_INCLUDE_DIRS nethost.h) - find_library(NETHOST_LIBRARY NAMES libnethost nethost) - target_include_directories(main PRIVATE ${NETHOST_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${NETHOST_LIBRARY}) + find_package(unofficial-nethost CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::nethost::nethost) diff --git a/ports/nethost/vcpkg.json b/ports/nethost/vcpkg.json index 0f65e50da87bbe..b5cf0998984dad 100644 --- a/ports/nethost/vcpkg.json +++ b/ports/nethost/vcpkg.json @@ -1,8 +1,17 @@ { "name": "nethost", - "version-date": "2019-12-21", - "port-version": 2, + "version": "6.0.5", "description": "Provides a set of APIs that can be used to host .NET Core (dotnet)", "homepage": "https://github.com/dotnet/runtime/tree/master/src/installer/corehost/cli/nethost", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 926b841d4526d9..df149920bcae18 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4837,8 +4837,8 @@ "port-version": 3 }, "nethost": { - "baseline": "2019-12-21", - "port-version": 2 + "baseline": "6.0.5", + "port-version": 0 }, "nettle": { "baseline": "3.7.3", diff --git a/versions/n-/nethost.json b/versions/n-/nethost.json index 0181e8cdef56e8..979f1d08540bc1 100644 --- a/versions/n-/nethost.json +++ b/versions/n-/nethost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "267a7f140709e65c5d692a7f3add885021764c25", + "version": "6.0.5", + "port-version": 0 + }, { "git-tree": "5b1a7d98ce2c1520bbb370dfc2fcb8c3d704c300", "version-date": "2019-12-21", From d9e6139cd499cb267699efeafd3efd561e3eb1e7 Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Fri, 3 Jun 2022 00:21:56 +0200 Subject: [PATCH 379/383] [hidapi] Update to 0.12.0 (#25008) * Updated to latest release: https://github.com/libusb/hidapi/releases/tag/hidapi-0.12.0 * Update SHA * SHA = 0 * Overwrite version * SHA512 * version * Removed failing line introduced in #22320 * version * Added vcpkg_replace_string again, now for libhidapi.cmake instead of hidapi.cmake * x-add-version --- ports/hidapi/portfile.cmake | 6 +++--- ports/hidapi/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/h-/hidapi.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index 57dfd339bf3e8f..b83a4d4167843d 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi - REF hidapi-0.11.2 - SHA512 c4d04bf570aa98dd88d7ce08ef1abb0675d500c9aa2c22f0437fa30b700a94446779f77e1170267926d5f6f0d9cdb2bb81ad1fe20d158c18587fddbca59e9517 + REF hidapi-0.12.0 + SHA512 866268927698db6fa553e000ead3c0c4b8df67ea768d36acac9c71f06f0bd8283778e90eee03f81aaa930f38dbb5719391906c7d2742b74479ffa436104f5fa4 HEAD_REF master ) @@ -16,7 +16,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/hidapi/hidapi.cmake" "\"/hidapi\"" "\"\${_IMPORT_PREFIX}/include\"") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/hidapi/libhidapi.cmake" "\"/hidapi\"" "\"\${_IMPORT_PREFIX}/include\"") file(INSTALL "${SOURCE_PATH}/LICENSE-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/hidapi/vcpkg.json b/ports/hidapi/vcpkg.json index 673384492db5fa..4d60e3dc4a1489 100644 --- a/ports/hidapi/vcpkg.json +++ b/ports/hidapi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hidapi", - "version-semver": "0.11.2", - "port-version": 1, + "version-semver": "0.12.0", "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.", "homepage": "https://github.com/libusb/hidapi", "license": "BSD-3-Clause-Clear", diff --git a/versions/baseline.json b/versions/baseline.json index df149920bcae18..ce0f36ba033445 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2777,8 +2777,8 @@ "port-version": 0 }, "hidapi": { - "baseline": "0.11.2", - "port-version": 1 + "baseline": "0.12.0", + "port-version": 0 }, "highfive": { "baseline": "2.3", diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index 51df67bed981c3..e1c4608a3a9b4d 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "803a911247de97c28264c5dee2102b368137562d", + "version-semver": "0.12.0", + "port-version": 0 + }, { "git-tree": "145fcc6e2c3aa564666793d494a6b90c1323e0ac", "version-semver": "0.11.2", From 38bb87c5571555f1a4f64cb4ed9d2be0017f9fc1 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 3 Jun 2022 06:31:59 +0800 Subject: [PATCH 380/383] [SDL] enable hidapi (#25022) * [SDL] enable hidapi * update version Co-authored-by: FrankXie --- ports/sdl2/portfile.cmake | 1 + ports/sdl2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 3eaca1dec0453c..489ee17b14aa61 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -38,6 +38,7 @@ vcpkg_cmake_configure( -DSDL_SHARED=${SDL_SHARED} -DSDL_FORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} -DSDL_LIBC=ON + -DSDL_HIDAPI_JOYSTICK=ON ) vcpkg_cmake_install() diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 3e7fce247a30b5..660cbe9e1714c7 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2", "version": "2.0.22", + "port-version": 1, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index ce0f36ba033445..df8f9b99b4c61b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6406,7 +6406,7 @@ }, "sdl2": { "baseline": "2.0.22", - "port-version": 0 + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 17383fd1719fc1..2d5eb6aa4acf46 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "879012d1bbd3ae67fc697109eedbe6ff713c2c34", + "version": "2.0.22", + "port-version": 1 + }, { "git-tree": "6d875fe2feac0480f61fcf890136e045c12429f1", "version": "2.0.22", From ae1f64f7016e9b752eb9214923a38592a96822e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 5 May 2022 08:37:23 +0200 Subject: [PATCH 381/383] [rubberband] don't require libsndfile default features --- overlay/ports/rubberband/vcpkg.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/overlay/ports/rubberband/vcpkg.json b/overlay/ports/rubberband/vcpkg.json index 25092162e2e6c0..b0c6dcc3b9ce8f 100644 --- a/overlay/ports/rubberband/vcpkg.json +++ b/overlay/ports/rubberband/vcpkg.json @@ -1,12 +1,15 @@ { "name": "rubberband", "version-string": "1.9.0", - "port-version": 1, + "port-version": 2, "description": "A high quality software library for audio time-stretching and pitch-shifting", "homepage": "https://breakfastquay.com/rubberband/", "dependencies": [ "fftw3", "libsamplerate", - "libsndfile" + { + "name": "libsndfile", + "default-features": false + } ] } From db2ab56c4bfaf3378adc4cfd5b100ab32b5eda73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 5 May 2022 07:51:30 +0200 Subject: [PATCH 382/383] Remove outdated packages instead of updating them. They will be reinstalled anyway if they are still required in a later step. --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bd96a54cf10dc..cc65dcdd90e042 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,9 +104,9 @@ jobs: - name: Check available disk space run: ${{ matrix.check_disk_space }} - - - name: Upgrade packages in cache - run: ./vcpkg upgrade --no-dry-run + + - name: Remove outdated packages from cache + run: ./vcpkg remove --outdated --recurse working-directory: ${{ matrix.vcpkg_path }} - name: Build packages From 0351a9153fb350e6a8ed94b9a0753c6138544545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 5 May 2022 14:22:35 +0200 Subject: [PATCH 383/383] Require libsndfile[core] only --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc65dcdd90e042..9517b026220a10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: libmodplug libogg libopusenc - libsndfile + libsndfile[core] libusb libvorbis lilv